overlays/iosevka: refactor family name in spacing overlay

nix/overlays/iosevka/default.nix

@@ -38,7 +38,7 @@ let
         ]
       )
       [
-        (import ./spacings.nix { inherit lib; })
+        (import ./spacings.nix)
         ([ identityOverlay ] ++ import ./variants.nix)
       ];
 
@@ -46,9 +46,8 @@ let
     overlay:
     let
       mergedConfig = lib.fix (lib.extends overlay iosevkaConfig);
-      toKebabCase = x: builtins.replaceStrings [ " " ] [ "-" ] (lib.toLower x);
     in
-    lib.nameValuePair (toKebabCase mergedConfig.family) (mkIosevka mergedConfig)
+    lib.nameValuePair mergedConfig.family (mkIosevka mergedConfig)
   );
 
   iosevka-nerds = builtins.mapAttrs (_: mkNerdFont) iosevkas;

nix/overlays/iosevka/spacings.nix

@@ -1,24 +1,24 @@
-{ lib }:
-
 let
   list = [
-    { spacing = "normal"; }
+    {
+      adjustFamily = old: old;
+      spacing = "normal";
+    }
 
     # Iosevka + Ghostty makes "…" display in a odd way.
     # We use "term" width to avoid this.
     # https://github.com/ghostty-org/ghostty/discussions/10335
-    { spacing = "term"; }
+    {
+      adjustFamily = old: old + "Term";
+      spacing = "term";
+    }
   ];
 in
 
 map (
-  { spacing }@cfg:
+  { adjustFamily, spacing }:
-  let
+  final: prev: {
-    name = lib.toSentenceCase spacing;
+    family = adjustFamily prev.family;
-  in
+    inherit spacing;
-  final: prev:
-  cfg
-  // {
-    family = prev.family + "-${name}";
   }
 ) list

nix/overlays/iosevka/variants.nix

@@ -82,10 +82,10 @@ in
 map (
   { name, code }:
   let
-    kebabName = builtins.replaceStrings [ " " ] [ "-" ] name;
+    shortName = builtins.replaceStrings [ " " ] [ "" ] name;
   in
   final: prev: {
-    family = prev.family + "-${kebabName}";
+    family = prev.family + "${shortName}";
     variants = prev.variants // {
       inherits = code;
     };