From c380052b0cc21eada534f8d2d71da4915ca18fe2 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@jimbosfiles.com>
Date: Sat, 12 Oct 2024 17:35:29 -0400
Subject: [PATCH] Move fonts config into home-manager

---
 flake.nix                                 |  2 +-
 home/hosts/JimDesktop/home.nix            |  1 +
 home/hosts/JimLenovo/home.nix             |  1 +
 home/hosts/JimPine/home.nix               |  1 +
 home/misc/fonts.nix                       | 19 +++++++++++++++++++
 system/desktop/fonts.nix                  | 14 --------------
 system/hosts/JimDesktop/configuration.nix |  1 -
 system/hosts/JimLenovo/configuration.nix  |  1 -
 system/hosts/JimPine/configuration.nix    |  1 -
 9 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 home/misc/fonts.nix
 delete mode 100644 system/desktop/fonts.nix

diff --git a/flake.nix b/flake.nix
index e313862..6ac9fbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
     packages = forAllSystems (system: import ./extras/pkgs nixpkgs.legacyPackages.${system});
 
     # Your custom packages and modifications, exported as overlays
-    overlays = import ./extras/overlays.nix {inherit inputs;};
+    overlays = import ./extras/overlays.nix { inherit inputs; };
 
     # Variables defined so they can be accessed globally
     secrets = import ./extras/secrets.nix;
diff --git a/home/hosts/JimDesktop/home.nix b/home/hosts/JimDesktop/home.nix
index 3055040..8f213a9 100644
--- a/home/hosts/JimDesktop/home.nix
+++ b/home/hosts/JimDesktop/home.nix
@@ -7,6 +7,7 @@
 
     # GUI Apps
     ./../../misc/guifiles.nix
+    ./../../misc/fonts.nix
     ./../../sway/sway.nix
     ./../../sway/swaylock.nix
     ./../../programs/gtk.nix
diff --git a/home/hosts/JimLenovo/home.nix b/home/hosts/JimLenovo/home.nix
index 007f786..a2090db 100644
--- a/home/hosts/JimLenovo/home.nix
+++ b/home/hosts/JimLenovo/home.nix
@@ -7,6 +7,7 @@
 
     # GUI Apps
     ./../../misc/guifiles.nix
+    ./../../misc/fonts.nix
     ./../../sway/sway.nix
     ./../../sway/swaylock.nix
     ./../../programs/gtk.nix
diff --git a/home/hosts/JimPine/home.nix b/home/hosts/JimPine/home.nix
index ba5e93b..809906c 100644
--- a/home/hosts/JimPine/home.nix
+++ b/home/hosts/JimPine/home.nix
@@ -7,6 +7,7 @@
 
     # GUI Apps
     ./../../misc/guifiles.nix
+    ./../../misc/fonts.nix
     ./../../sway/sway.nix
     ./../../sway/swaylock.nix
     ./../../programs/gtk.nix
diff --git a/home/misc/fonts.nix b/home/misc/fonts.nix
new file mode 100644
index 0000000..d6ef4f7
--- /dev/null
+++ b/home/misc/fonts.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    liberation_ttf
+    twitter-color-emoji
+    noto-fonts
+    sarasa-gothic
+    ubuntu_font_family
+    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
+  ];
+
+  fonts.fontconfig = {
+    enable = true;
+    defaultFonts = {
+      sansSerif = [ "Ubuntu" ];
+      monospace = [ "UbuntuMono Nerd Font Mono" ];
+      emoji = [ "Twitter Color Emoji" ];
+    };
+  };
+}
diff --git a/system/desktop/fonts.nix b/system/desktop/fonts.nix
deleted file mode 100644
index e38a909..0000000
--- a/system/desktop/fonts.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  # Fonts
-  fonts = {
-    packages = with pkgs; [
-      liberation_ttf
-      twitter-color-emoji
-      noto-fonts
-      sarasa-gothic
-      ubuntu_font_family
-      (nerdfonts.override {fonts = ["UbuntuMono"];})
-    ];
-    fontconfig.defaultFonts.emoji = ["Twitter Color Emoji"];
-  };
-}
diff --git a/system/hosts/JimDesktop/configuration.nix b/system/hosts/JimDesktop/configuration.nix
index ce9c0e9..1308fdc 100644
--- a/system/hosts/JimDesktop/configuration.nix
+++ b/system/hosts/JimDesktop/configuration.nix
@@ -16,7 +16,6 @@
     ./../../desktop/pipewire.nix
     ./../../desktop/bluetooth.nix
     ./../../desktop/firewall.nix
-    ./../../desktop/fonts.nix
     ./../../desktop/qt.nix
 
     # Modules
diff --git a/system/hosts/JimLenovo/configuration.nix b/system/hosts/JimLenovo/configuration.nix
index a543934..4b975b4 100644
--- a/system/hosts/JimLenovo/configuration.nix
+++ b/system/hosts/JimLenovo/configuration.nix
@@ -16,7 +16,6 @@
     ./../../desktop/pipewire.nix
     ./../../desktop/bluetooth.nix
     ./../../desktop/firewall.nix
-    ./../../desktop/fonts.nix
     ./../../desktop/qt.nix
 
     # Laptop/Portable only
diff --git a/system/hosts/JimPine/configuration.nix b/system/hosts/JimPine/configuration.nix
index 797a8f0..c7df43b 100644
--- a/system/hosts/JimPine/configuration.nix
+++ b/system/hosts/JimPine/configuration.nix
@@ -15,7 +15,6 @@
     ./../../desktop/pipewire.nix
     ./../../desktop/bluetooth.nix
     ./../../desktop/firewall.nix
-    ./../../desktop/fonts.nix
     ./../../desktop/qt.nix
     ./../../desktop/wireguard.nix