fonts: refactor

hosts/desktop.nix

@@ -46,15 +46,6 @@
 
   systemd.services.NetworkManager-wait-online.enable = false;
 
-  fonts.packages = with pkgs; [
-    corefonts
-    noto-fonts
-    nerd-fonts.bigblue-terminal
-    nerd-fonts.comic-shanns-mono
-    nerd-fonts.terminess-ttf
-    nerd-fonts.ubuntu-mono
-  ];
-
   modules = {
     system.desktop.gnome.enable = true;
     services.tailscale.enable = true;

users/jordan/common/optional/graphical/fonts.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  home.packages = with pkgs; [
+    adwaita-fonts
+    apple-color-emoji
+    corefonts
+    nerd-fonts.bigblue-terminal
+    nerd-fonts.comic-shanns-mono
+    nerd-fonts.terminess-ttf
+    nerd-fonts.ubuntu-mono
+    sf-pro
+  ];
+}

users/jordan/common/optional/graphical/hyprland/default.nix

@@ -276,22 +276,17 @@ in
     };
   };
 
-  home.packages =
+  home.packages = with pkgs.unstable; [
-    (with pkgs; [
+    anyrun
-      adwaita-fonts
+    clipse
-      apple-color-emoji
+    dunst
-    ])
+    libsForQt5.qtstyleplugin-kvantum
-    ++ (with pkgs.unstable; [
+    loupe
-      anyrun
+    mpv
-      clipse
+    qadwaitadecorations
-      dunst
+    qadwaitadecorations-qt6
-      libsForQt5.qtstyleplugin-kvantum
+    wl-clipboard
-      loupe
+  ];
-      mpv
-      qadwaitadecorations
-      qadwaitadecorations-qt6
-      wl-clipboard
-    ]);
 
   services = {
     flameshot.enable = true;

users/jordan/helios.nix

@@ -6,6 +6,7 @@
 {
   imports = [
     ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/fonts.nix
     ./common/optional/graphical/hyprland
     ./common/optional/graphical/mimeapps.nix
   ];

users/jordan/odyssey.nix

@@ -6,6 +6,7 @@
 {
   imports = [
     ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/fonts.nix
     ./common/optional/graphical/hyprland
     ./common/optional/graphical/libreoffice.nix
     ./common/optional/graphical/mimeapps.nix