From c23d476f78c63eebc9cb7b68163f5038a50e7ef7 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 10 Sep 2024 12:25:54 -0400
Subject: [PATCH] meta: Move fonts out of desktop

---
 modules/desktop.nix | 43 -----------------------------------------
 modules/fonts.nix   | 47 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 43 deletions(-)
 create mode 100644 modules/fonts.nix

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 225dcad3..e304ec23 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,5 +1,4 @@
 {
-  nix-config,
   pkgs,
   config,
   lib,
@@ -9,7 +8,6 @@
 let
   inherit (config.modules.system) username;
   inherit (config.boot) isContainer;
-  inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
 
   inherit (lib)
     mkEnableOption
@@ -142,46 +140,5 @@ in
         wl-clipboard-rs
       ])
     ];
-
-    fonts = {
-      enableDefaultPackages = false;
-
-      packages =
-        [
-          aleo-fonts
-        ]
-        ++ (with pkgs; [
-          noto-fonts
-          noto-fonts-cjk-serif
-          noto-fonts-cjk-sans
-          noto-fonts-emoji
-          maple-mono
-          font-awesome
-          (nerdfonts.override { fonts = [ "Noto" ]; })
-          kanji-stroke-order-font
-          liberation_ttf
-        ]);
-
-      fontconfig = {
-        defaultFonts = {
-          serif = [
-            "Noto Serif CJK JP"
-            "Noto Serif"
-          ];
-
-          sansSerif = [
-            "Noto Sans CJK JP"
-            "Noto Sans"
-          ];
-
-          monospace = [
-            "Noto Sans Mono CJK JP"
-            "Noto Sans Mono"
-          ];
-        };
-
-        allowBitmaps = false;
-      };
-    };
   };
 }
diff --git a/modules/fonts.nix b/modules/fonts.nix
new file mode 100644
index 00000000..a9eb5006
--- /dev/null
+++ b/modules/fonts.nix
@@ -0,0 +1,47 @@
+{ nix-config, pkgs, ... }:
+
+let
+  inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
+in
+{
+  fonts = {
+    enableDefaultPackages = false;
+
+    packages =
+      [
+        aleo-fonts
+      ]
+      ++ (with pkgs; [
+        noto-fonts
+        noto-fonts-cjk-serif
+        noto-fonts-cjk-sans
+        noto-fonts-emoji
+        maple-mono
+        font-awesome
+        (nerdfonts.override { fonts = [ "Noto" ]; })
+        kanji-stroke-order-font
+        liberation_ttf
+      ]);
+
+    fontconfig = {
+      defaultFonts = {
+        serif = [
+          "Noto Serif CJK JP"
+          "Noto Serif"
+        ];
+
+        sansSerif = [
+          "Noto Sans CJK JP"
+          "Noto Sans"
+        ];
+
+        monospace = [
+          "Noto Sans Mono CJK JP"
+          "Noto Sans Mono"
+        ];
+      };
+
+      allowBitmaps = false;
+    };
+  };
+}