From ffebf63fe80d77a1264321eedf9ca4155ba0718f Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sat, 14 Jun 2025 17:44:21 +0100
Subject: [PATCH] fonts: refactor

---
 hosts/desktop.nix                             |  9 -------
 .../common/optional/graphical/fonts.nix       | 17 ++++++++++++
 .../optional/graphical/hyprland/default.nix   | 27 ++++++++-----------
 users/jordan/helios.nix                       |  1 +
 users/jordan/odyssey.nix                      |  1 +
 5 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 users/jordan/common/optional/graphical/fonts.nix

diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index a554357..e79c5e0 100644
--- a/hosts/desktop.nix
+++ b/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;
diff --git a/users/jordan/common/optional/graphical/fonts.nix b/users/jordan/common/optional/graphical/fonts.nix
new file mode 100644
index 0000000..4182cb7
--- /dev/null
+++ b/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
+  ];
+}
diff --git a/users/jordan/common/optional/graphical/hyprland/default.nix b/users/jordan/common/optional/graphical/hyprland/default.nix
index 446bd63..34f48ec 100644
--- a/users/jordan/common/optional/graphical/hyprland/default.nix
+++ b/users/jordan/common/optional/graphical/hyprland/default.nix
@@ -276,22 +276,17 @@ in
     };
   };
 
-  home.packages =
-    (with pkgs; [
-      adwaita-fonts
-      apple-color-emoji
-    ])
-    ++ (with pkgs.unstable; [
-      anyrun
-      clipse
-      dunst
-      libsForQt5.qtstyleplugin-kvantum
-      loupe
-      mpv
-      qadwaitadecorations
-      qadwaitadecorations-qt6
-      wl-clipboard
-    ]);
+  home.packages = with pkgs.unstable; [
+    anyrun
+    clipse
+    dunst
+    libsForQt5.qtstyleplugin-kvantum
+    loupe
+    mpv
+    qadwaitadecorations
+    qadwaitadecorations-qt6
+    wl-clipboard
+  ];
 
   services = {
     flameshot.enable = true;
diff --git a/users/jordan/helios.nix b/users/jordan/helios.nix
index dacd754..80c61bd 100644
--- a/users/jordan/helios.nix
+++ b/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
   ];
diff --git a/users/jordan/odyssey.nix b/users/jordan/odyssey.nix
index e02772a..6d60a38 100644
--- a/users/jordan/odyssey.nix
+++ b/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