From c360986e19f78c5d1a17e1b2ca64138536dfca39 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 2 Mar 2024 13:16:48 +0000
Subject: [PATCH] Move custom Iosevka build plan into own file

Update some more glyphs for Iosevka
---
 system/iosevka.nix | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 system/stylix.nix  | 47 +-------------------------------------
 2 files changed, 58 insertions(+), 46 deletions(-)
 create mode 100644 system/iosevka.nix

diff --git a/system/iosevka.nix b/system/iosevka.nix
new file mode 100644
index 00000000..85104498
--- /dev/null
+++ b/system/iosevka.nix
@@ -0,0 +1,57 @@
+{
+  noCvSs = true;
+  exportGlyphNames = false;
+  ligations.inherits = "dlig";
+  weights = {
+    Regular = {
+      shape = 400;
+      menu = 400;
+      css = 400;
+    };
+    Bold = {
+      shape = 700;
+      menu = 700;
+      css = 700;
+    };
+  };
+  variants.design = {
+    capital-g = "toothless-corner-serifless-hooked";
+    capital-j = "serifed-both-sides";
+    capital-q = "crossing";
+    capital-r = "curly-serifless";
+    e = "rounded";
+    f = "tailed";
+    g = "double-storey-open";
+    i = "serifless";
+    j = "serifless";
+    k = "cursive-serifless";
+    l = "tailed";
+    q = "diagonal-tailed-serifless";
+    y = "cursive-serifless";
+    z = "straight-serifless-with-horizontal-crossbar";
+    lower-delta = "flat-top";
+    lower-lambda = "tailed-turn";
+    lower-xi = "flat-top";
+    lower-chi = "semi-chancery-straight";
+    zero = "tall-slashed";
+    one = "no-base";
+    two = "straight-neck";
+    three = "flat-top";
+    four = "semi-open";
+    five = "oblique-arched";
+    six = "open-contour";
+    seven = "bend-serifless-crossbar";
+    eight = "two-circles";
+    nine = "open-contour";
+    ampersand = "closed";
+    at = "fourfold";
+    percent = "dots";
+    lig-ltgteq = "flat";
+    lig-neq = "more-slanted";
+    lig-equal-chain = "without-notch";
+    lig-hyphen-chain = "without-notch";
+    lig-plus-chain = "without-notch";
+    lig-double-arrow-bar = "without-notch";
+    lig-single-arrow-bar = "without-notch";
+  };
+}
diff --git a/system/stylix.nix b/system/stylix.nix
index e4abbd1e..6608a5b9 100644
--- a/system/stylix.nix
+++ b/system/stylix.nix
@@ -26,52 +26,7 @@
       name = "Catppuccin-${catppuccinVariant}-Dark-Cursors";
     };
     fonts = let
-      iosevkaCustomBuildPlan = {
-        noCvSs = false;
-        exportGlyphNames = false;
-        ligations.inherits = "dlig";
-        # variants.inherits = "ss05";
-        weights = {
-          Regular = {
-            shape = 400;
-            menu = 400;
-            css = 400;
-          };
-          Bold = {
-            shape = 700;
-            menu = 700;
-            css = 700;
-          };
-        };
-        variants.design = {
-          capital-q = "crossing-curly-tailed";
-          e = "rounded";
-          f = "tailed";
-          g = "double-storey-open";
-          i = "tailed";
-          k = "cursive-serifless";
-          l = "tailed-serifed";
-          t = "bent-hook-asymmetric";
-          v = "curly-serifless";
-          w = "curly-serifless";
-          x = "curly-serifless";
-          y = "straight-turn-serifless";
-          lower-lambda = "tailed-turn";
-          lower-xi = "flat-top";
-          lower-chi = "semi-chancery-curly";
-          zero = "tall-slashed";
-          three = "flat-top";
-          six = "straight-bar";
-          seven = "straight-serifless-crossbar";
-          eight = "crossing-asymmetric";
-          nine = "straight-bar";
-          ampersand = "upper-open";
-          at = "fourfold";
-          cent = "through";
-          percent = "rings-segmented-slash";
-          lig-ltgteq = "flat";
-        };
-      };
+      iosevkaCustomBuildPlan = import ./iosevka.nix;
     in {
       sizes = {
         applications = 16;