From 9dc0624398cdac8c85641b7b25d61cce19cf1429 Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Fri, 12 Sep 2025 15:23:41 -0600
Subject: [PATCH] home: upgrade fonts to nerdfonts

---
 home/modules/gui/fonts.nix  |  5 ++---
 home/modules/gui/mako.nix   |  2 +-
 home/modules/gui/sway.nix   |  4 ++--
 home/modules/gui/waybar.nix |  8 ++++----
 home/modules/zed.nix        |  4 ++--
 sys/modules/baseline.nix    | 11 +++++++++++
 sys/modules/gtklock.nix     |  2 +-
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/home/modules/gui/fonts.nix b/home/modules/gui/fonts.nix
index 1830208..b74c094 100644
--- a/home/modules/gui/fonts.nix
+++ b/home/modules/gui/fonts.nix
@@ -8,7 +8,7 @@
     enable = true;
     defaultFonts = {
       monospace = [
-        "JetBrains Mono"
+        "JetBrainsMono Nerd Font"
         "Noto Sans Mono CJK SC"
         "Noto Sans Mono"
         "Noto Color Emoji"
@@ -31,11 +31,10 @@
   # with fonts.packages buy im too lazy to check
   home.packages = with pkgs; [
     jetbrains-mono
+    nerd-fonts.jetbrains-mono
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-emoji
     noto-fonts-extra
-    nerd-fonts.fira-code
-    nerd-fonts.droid-sans-mono
   ];
 }
diff --git a/home/modules/gui/mako.nix b/home/modules/gui/mako.nix
index 7f0dde4..ad6fd11 100644
--- a/home/modules/gui/mako.nix
+++ b/home/modules/gui/mako.nix
@@ -18,7 +18,7 @@ in {
         progress-color = "over #FFFFFF";
         border-radius = 0;
         default-timeout = 7000;
-        font = "JetBrains Mono 10";
+        font = "JetBrainsMono Nerd Font 10";
         icons = true;
         ignore-timeout = false;
         layer = "top";
diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix
index b795be7..3edd4c0 100644
--- a/home/modules/gui/sway.nix
+++ b/home/modules/gui/sway.nix
@@ -62,7 +62,7 @@ in {
         };
 
         fonts = {
-          names = ["JetBrains Mono"];
+          names = ["JetBrainsMono Nerd Font"];
           style = "Regular";
           size = 8.0;
         };
@@ -136,7 +136,7 @@ in {
         keybindings = let
           mod = config.wayland.windowManager.sway.config.modifier;
           grimshot = getExe pkgs.sway-contrib.grimshot;
-          bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrains Mono 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
+          bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrainsMono Nerd Font 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
         in
           mkOptionDefault {
             "${mod}+a" = "focus parent";
diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index eb73361..ecc5a56 100644
--- a/home/modules/gui/waybar.nix
+++ b/home/modules/gui/waybar.nix
@@ -48,16 +48,16 @@ in {
             tooltip = false;
           };
           "cpu" = {
-            format = "cpu {usage}%";
+            format = " {usage}%";
             tooltip = false;
           };
           "memory" = {
-            format = "mem {percentage}%";
+            format = " {percentage}%";
             tooltip = true;
             tooltip-format = "{used}/{total}";
           };
           "disk" = {
-            format = "disk {specific_used:0.0f}/{specific_total:0.0f}";
+            format = " {specific_used:0.0f}/{specific_total:0.0f}";
             unit = "GiB";
             tooltip = false;
           };
@@ -68,7 +68,7 @@ in {
       };
       style = ''
         * {
-          font-family: "JetBrains Mono", monospace;
+          font-family: "JetBrainsMono Nerd Font", monospace;
           font-size: 12px;
           font-weight: 500;
           border: none;
diff --git a/home/modules/zed.nix b/home/modules/zed.nix
index 6e54ca7..60fd59a 100644
--- a/home/modules/zed.nix
+++ b/home/modules/zed.nix
@@ -40,8 +40,8 @@ in {
         };
         autosave = "on_focus_change";
         auto_update = false;
-        buffer_font_family = "JetBrains Mono";
-        buffer_font_size = 16;
+        buffer_font_family = "JetBrainsMono Nerd Font";
+        buffer_font_size = 22;
         hide_mouse = "never";
         minimap.show = "auto";
         tabs = {
diff --git a/sys/modules/baseline.nix b/sys/modules/baseline.nix
index 3869463..8c75530 100644
--- a/sys/modules/baseline.nix
+++ b/sys/modules/baseline.nix
@@ -53,6 +53,17 @@ in {
         ];
     };
 
+    fonts.packages = with pkgs; [
+      jetbrains-mono
+      nerd-fonts.jetbrains-mono
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-emoji
+      noto-fonts-extra
+      nerd-fonts.fira-code
+      nerd-fonts.droid-sans-mono
+    ];
+
     services = {
       openssh.enable = mkDefault true;
 
diff --git a/sys/modules/gtklock.nix b/sys/modules/gtklock.nix
index 3600b41..5d9721d 100644
--- a/sys/modules/gtklock.nix
+++ b/sys/modules/gtklock.nix
@@ -26,7 +26,7 @@ in {
         window {
           background-color: black;
           color: #eaeaea;
-          font-family: "JetBrains Mono", monospace;
+          font-family: "JetBrainsMono Nerd Font", monospace;
           font-size: 14px;
         }