From 5cb1858b259e8feea1eb2133e5f8dc5240110b75 Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Sat, 7 Dec 2024 22:06:49 -0600
Subject: [PATCH] fonts: update to nerd-fonts namespace

Signed-off-by: Myned <dev@bjork.tech>
---
 options/custom/default.nix           |  2 +-
 options/custom/programs/mangohud.nix |  2 +-
 options/custom/settings/fonts.nix    | 56 ++++++++++++++++------------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/options/custom/default.nix b/options/custom/default.nix
index 22b83bf..876535f 100644
--- a/options/custom/default.nix
+++ b/options/custom/default.nix
@@ -40,7 +40,7 @@ in {
 
     font = {
       emoji = mkOption {default = "Noto Color Emoji";};
-      monospace = mkOption {default = "Iosevka NFP SemiBold";};
+      monospace = mkOption {default = "IosevkaTermSlab NFP Medium";};
       sans-serif = mkOption {default = "Outfit";};
       serif = mkOption {default = "Liberation Serif";};
     };
diff --git a/options/custom/programs/mangohud.nix b/options/custom/programs/mangohud.nix
index 150c478..c18f259 100644
--- a/options/custom/programs/mangohud.nix
+++ b/options/custom/programs/mangohud.nix
@@ -26,7 +26,7 @@ in {
         device_battery = "gamepad,mouse";
         dynamic_frame_timing = true;
         engine_color = "dc322f";
-        font_file = "${(pkgs.nerdfonts.override {fonts = ["Iosevka"];})}/share/fonts/truetype/NerdFonts/IosevkaNerdFontPropo-SemiBold.ttf";
+        font_file = "${pkgs.nerd-fonts.iosevka}/share/fonts/truetype/NerdFonts/IosevkaTermSlabNerdFontPropo-Medium.ttf";
         font_size = 24;
         fps_limit = "100,75,60,50"; # !! Monitor dependent
         fps_limit_method = "early"; # Smoother frametimes compared to late
diff --git a/options/custom/settings/fonts.nix b/options/custom/settings/fonts.nix
index 281ac8c..4ac3565 100644
--- a/options/custom/settings/fonts.nix
+++ b/options/custom/settings/fonts.nix
@@ -14,30 +14,41 @@ in {
     fonts = {
       enableDefaultPackages = true; # Fallback fonts
 
-      packages = with pkgs; [
-        # Monospace
-        (nerdfonts.override {fonts = ["Iosevka"];})
+      packages = with pkgs.nerd-fonts;
+        [
+          ### Monospace
+          # https://www.nerdfonts.com/#home
+          #?? kitten choose-fonts
+          departure-mono
+          gohufont
+          iosevka-term
+          iosevka-term-slab
+          jetbrains-mono
+          space-mono
+          zed-mono
+        ]
+        ++ (with pkgs; [
+          ### Sans Serif
+          (google-fonts.override {
+            fonts = [
+              # Text
+              "Jost"
+              "Lexend"
+              "Outfit"
 
-        # Sans Serif
-        (google-fonts.override {
-          fonts = [
-            # Text
-            "Jost"
-            "Lexend"
-            "Outfit"
+              # Condensed
+              "Oswald"
 
-            # Condensed
-            "Oswald"
+              # Pixel
+              "Silkscreen"
+            ];
+          })
 
-            # Pixel
-            "Silkscreen"
-          ];
-        })
-
-        # Microsoft
-        corefonts
-        vistafonts
-      ];
+          ### Other
+          # Microsoft
+          corefonts
+          vistafonts
+        ]);
 
       #?? fc-list --brief | grep family: | sort
       fontconfig.defaultFonts = {
@@ -48,7 +59,6 @@ in {
       };
     };
 
-    home-manager.users.${config.custom.username}.fonts.fontconfig.defaultFonts =
-      config.fonts.fontconfig.defaultFonts;
+    home-manager.users.${config.custom.username}.fonts.fontconfig.defaultFonts = config.fonts.fontconfig.defaultFonts;
   };
 }