From 01bb54f67c8c2908013c98c38e13334be5d4ebd9 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Mon, 2 Jan 2023 00:12:13 -0800
Subject: [PATCH] move fonts to xorg file

---
 common/desktop/fonts.nix | 8 --------
 common/desktop/xorg.nix  | 7 +++++++
 flake.nix                | 1 -
 3 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 common/desktop/fonts.nix

diff --git a/common/desktop/fonts.nix b/common/desktop/fonts.nix
deleted file mode 100644
index 78db2f4..0000000
--- a/common/desktop/fonts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  fonts = {
-    enableDefaultFonts = true;
-    enableGhostscriptFonts = true;
-    fontDir.enable = true;
-    fonts = [pkgs.nerdfonts];
-  };
-}
diff --git a/common/desktop/xorg.nix b/common/desktop/xorg.nix
index 70aa688..5415d95 100644
--- a/common/desktop/xorg.nix
+++ b/common/desktop/xorg.nix
@@ -4,4 +4,11 @@
     autorun = true;
     excludePackages = [pkgs.xterm];
   };
+
+  fonts = {
+    enableDefaultFonts = true;
+    enableGhostscriptFonts = true;
+    fontDir.enable = true;
+    fonts = [pkgs.nerdfonts pkgs.noto-fonts-cjk-sans];
+  };
 }
diff --git a/flake.nix b/flake.nix
index f0e6494..04f4e41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,6 @@
         desktops = {
           common = [
             ./common/desktop/apps.nix
-            ./common/desktop/fonts.nix
             ./common/desktop/media.nix
             ./common/desktop/xorg.nix
           ];