diff --git a/nix/overlays/iosevka/default.nix b/nix/overlays/iosevka/default.nix index bd107471..236e7059 100644 --- a/nix/overlays/iosevka/default.nix +++ b/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; diff --git a/nix/overlays/iosevka/spacings.nix b/nix/overlays/iosevka/spacings.nix index 2f454a5a..3a70de9b 100644 --- a/nix/overlays/iosevka/spacings.nix +++ b/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: - let - name = lib.toSentenceCase spacing; - in - final: prev: - cfg - // { - family = prev.family + "-${name}"; + { adjustFamily, spacing }: + final: prev: { + family = adjustFamily prev.family; + inherit spacing; } ) list diff --git a/nix/overlays/iosevka/variants.nix b/nix/overlays/iosevka/variants.nix index 883d63da..fce85d4a 100644 --- a/nix/overlays/iosevka/variants.nix +++ b/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; };