Move fonts config into home-manager

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;

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

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

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

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" ];
+    };
+  };
+}

system/desktop/fonts.nix

@@ -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"];
-  };
-}

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

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

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