From 753fb58c91e0fefa2cd53f08a8910f413034c5c8 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Wed, 26 Mar 2025 19:16:02 +0100
Subject: [PATCH] fonts: refactor

---
 modules/options/style/fonts.nix | 12 ------------
 modules/style/fonts.nix         | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 modules/options/style/fonts.nix

diff --git a/modules/options/style/fonts.nix b/modules/options/style/fonts.nix
deleted file mode 100644
index 65eb853..0000000
--- a/modules/options/style/fonts.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{lib, ...}: let
-  inherit (lib) mkOption;
-  inherit (lib.types) package listOf;
-in {
-  options.modules.system.fonts = {
-    # This defines extra fonts to be installed on the system.
-    extraFonts = mkOption {
-      type = listOf package;
-      default = [];
-    };
-  };
-}
diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix
index 694731a..4bd9a68 100644
--- a/modules/style/fonts.nix
+++ b/modules/style/fonts.nix
@@ -1,16 +1,21 @@
 {pkgs, ...}: let
   inherit (builtins) mapAttrs;
-
-  custom-iosevka = pkgs.iosevka.override {
+  valiosevka = pkgs.iosevka.override {
     privateBuildPlan = {
-      family = "Iosevka Custom";
+      family = "valiosevka";
       spacing = "normal";
       serifs = "sans";
-
       noCvSs = true;
       exportGlyphNames = false;
-      variants.inherits = "ss15";
+
       ligations.inherits = "dlig";
+      variants = {
+        inherits = "ss15";
+        design = {
+          e = "flat-crossbar";
+          f = "diagonal-tailed-crossbar-at-x-height";
+        };
+      };
     };
     set = "Fancy";
   };
@@ -29,6 +34,7 @@ in {
       #  Enable font hinting. Hinting aligns glyphs to pixel boundaries
       # to improve rendering sharpness at low resolution.
       hinting.enable = true;
+
       # Set the defalt fonts. This was taken from raf,
       # many thanks.
       defaultFonts = let
@@ -50,7 +56,6 @@ in {
     packages = builtins.attrValues {
       inherit
         (pkgs)
-        # custom-iosevka
         material-icons
         material-design-icons
         papirus-icon-theme
@@ -69,6 +74,7 @@ in {
         comic-shanns-mono
         symbols-only
         ;
+      inherit valiosevka;
     };
     fontDir = {
       # Whether to create a directory with links to all fonts in