Updated font config

modules/features/fonts.nix

@@ -0,0 +1,36 @@
+{
+  flake.modules.nixos.fonts =
+    { pkgs, ... }:
+    {
+      fonts = {
+        packages = with pkgs; [
+          # Maple Mono
+          maple-mono.truetype
+          maple-mono.NF-unhinted
+          maple-mono.NF-CN-unhinted
+
+          # JetBrains Mono
+          nerd-fonts.jetbrains-mono
+
+          # Noto
+          noto-fonts
+          noto-fonts-cjk-sans
+          noto-fonts-color-emoji
+        ];
+      };
+    };
+
+  flake.modules.homeManager.fonts = {
+    fonts.fontconfig = {
+      enable = true;
+      defaultFonts = {
+        sansSerif = [ "Noto Sans" ];
+        monospace = [
+          "Maple Mono"
+          "JetBrainsMono Nerd Font"
+        ];
+        emoji = [ "Noto Color Emoji" ];
+      };
+    };
+  };
+}

modules/features/foot.nix

@@ -10,7 +10,8 @@
             term = "xterm-256color";
             include = "${config.xdg.configHome}/foot/themes/noctalia";
             dpi-aware = "no";
-            font = "JetBrainsMono Nerd Font:size=12";
+            font = "${builtins.head config.fonts.fontconfig.defaultFonts.monospace}:size=12";
+            pad = "10x10";
           };
           mouse = {
             hide-when-typing = "yes";

modules/features/starship.nix

@@ -35,7 +35,7 @@
             truncation_length = 5;
           };
           git_branch = {
-            symbol = "";
+            symbol = "";
             style = "bright-black";
             format = "[$symbol $branch]($style)";
           };

modules/features/styling.nix

@@ -14,21 +14,6 @@
           x11.enable = true;
           gtk.enable = true;
         };
-        packages = with pkgs; [
-          nerd-fonts.jetbrains-mono
-          noto-fonts
-          noto-fonts-cjk-sans
-          noto-fonts-color-emoji
-        ];
-      };
-
-      fonts.fontconfig = {
-        enable = true;
-        defaultFonts = {
-          sansSerif = [ "Noto Sans" ];
-          monospace = [ "JetBrainsMono Nerd Font" ];
-          emoji = [ "Noto Color Emoji" ];
-        };
       };
 
       gtk = {
@@ -56,8 +41,8 @@
               style = "Breeze";
             };
             Fonts = {
-              fixed = "\"JetBrainsMono Nerd Font,12\"";
+              fixed = "\"${builtins.head config.fonts.fontconfig.defaultFonts.monospace},12\"";
-              general = "\"Noto Sans,12\"";
+              general = "\"${builtins.head config.fonts.fontconfig.defaultFonts.sansSerif},12\"";
             };
           };
         in

modules/system/base.nix

@@ -11,6 +11,7 @@
         bluetooth
         boot
         firmware
+        fonts
         network
         nix
         pipewire

modules/users/eclypse.nix

@@ -42,6 +42,7 @@ in
         direnv
         fastfetch
         firefox
+        fonts
         foot
         fzf
         git