From ac9f812f255e680388b3af442cd501e679e3c2a9 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 12 May 2024 21:32:57 -0400
Subject: [PATCH] home: fixed font inconsistency

---
 aly.nix                                         | 5 +++--
 dustin.nix                                      | 4 ++--
 homeManagerModules/apps/fuzzel/default.nix      | 2 +-
 homeManagerModules/desktop/cinnamon/default.nix | 7 ++++---
 homeManagerModules/desktop/theme.nix            | 8 ++++----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/aly.nix b/aly.nix
index 33ea00f1..b1c7b891 100644
--- a/aly.nix
+++ b/aly.nix
@@ -70,12 +70,12 @@
           package = pkgs.catppuccin-cursors.frappeDark;
         };
         font = {
-          name = "NotoSansNerdFont";
+          name = "NotoSans Nerd Font";
           size = 11;
           package = pkgs.nerdfonts.override {fonts = ["Noto"];};
         };
         terminalFont = {
-          name = "NotoSansMNerdFont";
+          name = "NotoSansM Nerd Font";
           size = 11;
           package = pkgs.nerdfonts.override {fonts = ["Noto"];};
         };
@@ -125,6 +125,7 @@
     "workspace 4: work" = [{app_id = "google-chrome";} {app_id = "chromium-browser";}];
     "workspace 10: zoom" = [{class = "zoom";} {app_id = "Zoom";}];
   };
+  
   wayland.windowManager.hyprland.extraConfig = ''
     # Workspace - Browser
     workspace = 1,defaultName:web
diff --git a/dustin.nix b/dustin.nix
index a832abcf..d4f40f3c 100644
--- a/dustin.nix
+++ b/dustin.nix
@@ -57,12 +57,12 @@
           package = pkgs.catppuccin-cursors.frappeDark;
         };
         font = {
-          name = "NotoSansNerdFont";
+          name = "NotoSans Nerd Font";
           size = 11;
           package = pkgs.nerdfonts.override {fonts = ["Noto"];};
         };
         terminalFont = {
-          name = "NotoSansMNerdFont";
+          name = "NotoSansM Nerd Font";
           size = 11;
           package = pkgs.nerdfonts.override {fonts = ["Noto"];};
         };
diff --git a/homeManagerModules/apps/fuzzel/default.nix b/homeManagerModules/apps/fuzzel/default.nix
index 89cdb0c6..95bc0b71 100644
--- a/homeManagerModules/apps/fuzzel/default.nix
+++ b/homeManagerModules/apps/fuzzel/default.nix
@@ -11,7 +11,7 @@
       enable = true;
       settings = {
         main = {
-          font = "${config.alyraffauf.desktop.theme.terminalFont.name}-Regular";
+          font = "${config.alyraffauf.desktop.theme.terminalFont.name} Regular";
           icon-theme = "${config.alyraffauf.desktop.theme.iconTheme.name}";
           layer = "overlay";
           width = 36;
diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix
index 09b28079..93211357 100644
--- a/homeManagerModules/desktop/cinnamon/default.nix
+++ b/homeManagerModules/desktop/cinnamon/default.nix
@@ -15,7 +15,7 @@
       "org/cinnamon/desktop/background".picture-uri = "file://${config.alyraffauf.desktop.theme.wallpaper}";
       "org/cinnamon/desktop/interface".cursor-size = config.alyraffauf.desktop.theme.cursorTheme.size;
       "org/cinnamon/desktop/interface".cursor-theme = config.alyraffauf.desktop.theme.cursorTheme.name;
-      "org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.desktop.theme.font.name}-Regular ${toString config.alyraffauf.desktop.theme.font.size}";
+      "org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.desktop.theme.font.name} Regular ${toString config.alyraffauf.desktop.theme.font.size}";
       "org/cinnamon/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
       "org/cinnamon/desktop/interface".icon-theme = config.alyraffauf.desktop.theme.iconTheme.name;
       "org/cinnamon/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.desktop.theme.font.name} ${toString config.alyraffauf.desktop.theme.font.size}";
@@ -23,11 +23,12 @@
       "org/cinnamon/muffin".workspace-cycle = true;
       "org/cinnamon/muffin".workspaces-only-on-primary = true;
       "org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false;
-      "org/cinnamon/theme".name = config.alyraffauf.desktop.theme.gtk.name;      "org/gnome/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
+      "org/cinnamon/theme".name = config.alyraffauf.desktop.theme.gtk.name;
+      "org/gnome/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
       "org/gnome/desktop/interface".cursor-size = config.alyraffauf.desktop.theme.cursorTheme.size;
       "org/gnome/desktop/interface".cursor-theme = config.alyraffauf.desktop.theme.cursorTheme.name;
       "org/gnome/desktop/interface".icon-theme = config.alyraffauf.desktop.theme.iconTheme.name;
-      "org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.desktop.theme.terminalFont.name} ${toString config.alyraffauf.desktop.theme.terminalFont.size}";
+      "org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.desktop.theme.terminalFont.name} Regular ${toString config.alyraffauf.desktop.theme.terminalFont.size}";
       "org/gnome/desktop/peripherals/touchpad".natural-scroll = true;
       "org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
       "org/gnome/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.desktop.theme.font.name} ${toString config.alyraffauf.desktop.theme.font.size}";
diff --git a/homeManagerModules/desktop/theme.nix b/homeManagerModules/desktop/theme.nix
index fdb7ca8e..9b89e66e 100644
--- a/homeManagerModules/desktop/theme.nix
+++ b/homeManagerModules/desktop/theme.nix
@@ -59,7 +59,7 @@
     alyraffauf.desktop.theme.font = {
       name = lib.mkOption {
         description = "Font name.";
-        default = "NotoSansNerdFont";
+        default = "NotoSans Nerd Font";
         type = lib.types.str;
       };
       size = lib.mkOption {
@@ -76,7 +76,7 @@
     alyraffauf.desktop.theme.terminalFont = {
       name = lib.mkOption {
         description = "Font name.";
-        default = "NotoSansMNerdFont";
+        default = "NotoSansM Nerd Font";
         type = lib.types.str;
       };
       size = lib.mkOption {
@@ -153,7 +153,7 @@
       enable = true;
       defaultFonts = {
         monospace = [config.alyraffauf.desktop.theme.terminalFont.name];
-        serif = ["NotoSerifNerdFont"];
+        serif = ["NotoSerif Nerd Font"];
         sansSerif = [config.alyraffauf.desktop.theme.font.name];
       };
     };
@@ -172,7 +172,7 @@
       };
 
       font = {
-        name = "${config.alyraffauf.desktop.theme.font.name}";
+        name = "${config.alyraffauf.desktop.theme.font.name} Regular";
         package = config.alyraffauf.desktop.theme.font.package;
         size = config.alyraffauf.desktop.theme.font.size;
       };