From f9e32c519823376e13d766955bf168e3382845a2 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Tue, 23 Jan 2024 16:29:47 -0600
Subject: [PATCH] generalize fonts

---
 modules/fonts.nix         | 6 ++++++
 modules/hyprland.nix      | 5 -----
 modules/qtile.nix         | 4 ----
 modules/roles/common.nix  | 1 +
 modules/roles/desktop.nix | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 modules/fonts.nix

diff --git a/modules/fonts.nix b/modules/fonts.nix
new file mode 100644
index 0000000..ed988bc
--- /dev/null
+++ b/modules/fonts.nix
@@ -0,0 +1,6 @@
+{pkgs,...}:{
+fonts.fontconfig.enable = true;
+  fonts.packages = with pkgs; [
+    (nerdfonts.override {fonts = ["FiraCode"];})
+  ];
+}
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 00566aa..919327d 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -12,11 +12,6 @@ in
 {
   config = mkIf cfg.enable {
 
-  fonts.fontconfig.enable = true;
-  fonts.packages = with pkgs; [
-    (nerdfonts.override {fonts = ["FiraCode"];})
-  ];
-
   security.pam.services.swaylock = {};
   programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.default;
   # Optional, hint electron apps to use wayland:
diff --git a/modules/qtile.nix b/modules/qtile.nix
index 45168bc..0de5f2c 100644
--- a/modules/qtile.nix
+++ b/modules/qtile.nix
@@ -7,10 +7,6 @@
     ./lock
   ];
 
-  fonts.fontconfig.enable = true;
-  fonts.packages = with pkgs; [
-    (nerdfonts.override {fonts = ["FiraCode"];})
-  ];
 
   # Enable the X11 windowing system.
   services.xserver = {
diff --git a/modules/roles/common.nix b/modules/roles/common.nix
index bcc6c3d..9212672 100644
--- a/modules/roles/common.nix
+++ b/modules/roles/common.nix
@@ -4,6 +4,7 @@
     cli
     dev
     nvim
+    vpn
 
     # langs
     python
diff --git a/modules/roles/desktop.nix b/modules/roles/desktop.nix
index 6abcd02..9b3b153 100644
--- a/modules/roles/desktop.nix
+++ b/modules/roles/desktop.nix
@@ -5,9 +5,9 @@
   ...
 }: {
   imports = with inputs.self.nixosModules; [
+    fonts
     gui
     vscode
-    vpn
     hyprland
   ];
 }