From 7e32a07bd8abb823dacd79f638af8b57cef9caa9 Mon Sep 17 00:00:00 2001
From: Fern Garden <mail@fern.garden>
Date: Thu, 17 Jul 2025 20:46:17 +0800
Subject: [PATCH] Move font packages to correct config option & add custom
 build of iosevka

---
 overlay.nix                | 26 ++++++++++++++++++++++++++
 suites/desktop/default.nix |  8 +++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 232cd7c..4472d41 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -59,4 +59,30 @@ with inputs;
         prev.pkgs.temurin-jre-bin
       ];
     };
+
+    iosevka = prev.iosevka.override {
+      set = "Custom";
+
+      privateBuildPlan = {
+        family = "IosevkaCustom";
+        spacing = "term";
+        serifs = "sans";
+        noCvSs = false;
+        exportGlyphNames = true;
+        variants.inherits = "ss05";
+
+        weights = {
+          Regular = {
+            shape = 400;
+            menu = 400;
+            css = 400;
+          };
+          Bold = {
+            shape = 700;
+            menu = 700;
+            css = 700;
+          };
+        };
+      };
+    };
   }
diff --git a/suites/desktop/default.nix b/suites/desktop/default.nix
index ed51371..b232b10 100755
--- a/suites/desktop/default.nix
+++ b/suites/desktop/default.nix
@@ -117,9 +117,6 @@ with lib; {
     gnomeExtensions.smile-complementary-extension
     jellyfin-media-player
     libreoffice
-    merriweather
-    merriweather-sans
-    nerd-fonts
     obsidian
     prismlauncher
     prismlauncher
@@ -129,6 +126,11 @@ with lib; {
     yubioath-flutter
   ];
 
+  fonts.packages = with pkgs; [
+    merriweather
+    iosevka
+  ];
+
   # Allow opening terminal applications from gnome app launcher.
   xdg.terminal-exec = {
     enable = true;