From 3c0d94fe76c192f54bb4466885a88db562a20c27 Mon Sep 17 00:00:00 2001
From: monologiq <git@pmlogue.me>
Date: Tue, 16 Dec 2025 20:16:13 +0100
Subject: [PATCH] hermes: Create fonts.nix

---
 machines/hermes/default.nix | 73 +---------------------------------
 machines/hermes/fonts.nix   | 78 +++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 72 deletions(-)
 create mode 100644 machines/hermes/fonts.nix

diff --git a/machines/hermes/default.nix b/machines/hermes/default.nix
index f4eaf0a..ac223cf 100644
--- a/machines/hermes/default.nix
+++ b/machines/hermes/default.nix
@@ -15,6 +15,7 @@
     ./bluetooth.nix
     ./networking.nix
     ./hardware.nix
+    ./fonts.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_6_17;
@@ -52,78 +53,6 @@
     gsettings-desktop-schemas
   ];
 
-  fonts.fontconfig = {
-    enable = true;
-    antialias = true;
-    hinting = {
-      enable = true;
-      style = "slight";
-    };
-    subpixel = {
-      rgba = "rgb";
-      lcdfilter = "default";
-    };
-    defaultFonts = {
-      serif = [
-        "SF Pro"
-        "DejaVu Serif"
-      ];
-      sansSerif = [
-        "SF Pro"
-        "DejaVu Sans"
-      ];
-      monospace = [
-        "Iosevka"
-        "DejaVu Sans Mono"
-      ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
-  fonts.packages = with pkgs; [
-    inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}".sf-pro
-    noto-fonts-color-emoji
-    (iosevka.override {
-      set = "cavalier";
-
-      privateBuildPlan = {
-        family = "Iosevka Cavalier";
-        spacing = "normal";
-        serifs = "sans";
-        noCvSs = false;
-        exportGlyphNames = true;
-
-        variants.inherits = "ss08";
-
-        variants.weights.Regular = {
-          shape = 400;
-          menu = 400;
-          css = 400;
-        };
-
-        variants.weights.Bold = {
-          shape = 700;
-          menu = 700;
-          css = 700;
-        };
-
-        variants.weights.Italic = {
-          angle = 9.4;
-          shape = "italic";
-          menu = "italic";
-          css = "italic";
-        };
-
-        variants.weights.Upright = {
-          angle = 0;
-          shape = "upright";
-          menu = "upright";
-          css = "upright";
-        };
-      };
-    })
-  ];
-
   programs._1password.enable = true;
   programs._1password-gui = {
     enable = true;
diff --git a/machines/hermes/fonts.nix b/machines/hermes/fonts.nix
new file mode 100644
index 0000000..f577145
--- /dev/null
+++ b/machines/hermes/fonts.nix
@@ -0,0 +1,78 @@
+{ inputs, pkgs, ... }:
+let
+  apple-fonts = inputs.apple-fonts.packages."${pkgs.stdenv.hostPlatform.system}";
+in
+{
+  fonts.fontconfig = {
+    enable = true;
+    antialias = true;
+    hinting = {
+      enable = true;
+      style = "slight";
+    };
+    subpixel = {
+      rgba = "rgb";
+      lcdfilter = "default";
+    };
+    defaultFonts = {
+      serif = [
+        "SF Pro"
+        "DejaVu Serif"
+      ];
+      sansSerif = [
+        "SF Pro"
+        "DejaVu Sans"
+      ];
+      monospace = [
+        "Iosevka Cavalier"
+        "DejaVu Sans Mono"
+      ];
+      emoji = [ "Noto Color Emoji" ];
+    };
+  };
+
+  fonts.packages = with pkgs; [
+    apple-fonts.sf-pro
+    noto-fonts-cjk-sans
+    noto-fonts-color-emoji
+    (iosevka.override {
+      set = "cavalier";
+
+      privateBuildPlan = {
+        family = "Iosevka Cavalier";
+        spacing = "normal";
+        serifs = "sans";
+        noCvSs = false;
+        exportGlyphNames = true;
+
+        variants.inherits = "ss08";
+
+        variants.weights.Regular = {
+          shape = 400;
+          menu = 400;
+          css = 400;
+        };
+
+        variants.weights.Bold = {
+          shape = 700;
+          menu = 700;
+          css = 700;
+        };
+
+        variants.weights.Italic = {
+          angle = 9.4;
+          shape = "italic";
+          menu = "italic";
+          css = "italic";
+        };
+
+        variants.weights.Upright = {
+          angle = 0;
+          shape = "upright";
+          menu = "upright";
+          css = "upright";
+        };
+      };
+    })
+  ];
+}