From 941ef546e5e9d6cb358644d8d2f85d1c0e79c22f Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 3 Apr 2024 23:09:28 -0400
Subject: [PATCH] meta: Merge fonts module with hyprland

This makes sense since fonts are part of the desktop and should be
included at the same time when using the hyprland module.
---
 modules/fonts.nix    | 29 -----------------------------
 modules/hyprland.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 modules/fonts.nix

diff --git a/modules/fonts.nix b/modules/fonts.nix
deleted file mode 100644
index f40bbc39..00000000
--- a/modules/fonts.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-
-{
-  fonts = {
-    enableDefaultPackages = false;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      noto-fonts-emoji
-      maple-mono
-      font-awesome
-      nerdfonts
-      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/hyprland.nix b/modules/hyprland.nix
index ae13bdf6..432d603a 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -53,4 +53,30 @@
       };
     };
   };
+
+  fonts = {
+    enableDefaultPackages = false;
+
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+      noto-fonts-emoji
+      maple-mono
+      font-awesome
+      nerdfonts
+      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;
+    };
+  };
 }