From 5a296c6e97c4912a2a12f12fdd6a5562ac44f580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 23:57:15 +0100 Subject: [PATCH] overlays/iosevka-term: always build iosevka term --- nix/configurations/vanadium.nix | 2 +- .../{iosevka.nix => iosevka-term.nix} | 49 +++++++++++-------- 2 files changed, 30 insertions(+), 21 deletions(-) rename nix/overlays/{iosevka.nix => iosevka-term.nix} (91%) diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 3221dcd8..2f4bec34 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -57,7 +57,7 @@ in ../overlays/ghostty-dev.nix ../overlays/npins.nix - ../overlays/iosevka.nix + ../overlays/iosevka-term.nix ../packages/overlay.nix ./vanadium/overlay.nix diff --git a/nix/overlays/iosevka.nix b/nix/overlays/iosevka-term.nix similarity index 91% rename from nix/overlays/iosevka.nix rename to nix/overlays/iosevka-term.nix index a22bf34b..e8068820 100644 --- a/nix/overlays/iosevka.nix +++ b/nix/overlays/iosevka-term.nix @@ -1,29 +1,19 @@ -final: prev: rec { - nerd-fonts = - let - mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { }; - in - prev.nerd-fonts - // { - iosevka = mkNerdFont { - font = iosevka; - patcherArgs = [ - "--complete" - "--careful" - "--name {/.}-NFM" - "--mono" - ]; - }; - }; - - iosevka = prev.iosevka.override { +final: prev: +let + iosevka-term = prev.iosevka.override { + # This changes pname which changes what the outputted buildPlan name is. + # Stupid API set = ""; # Guide: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md privateBuildPlan = { family = "Iosevka"; serifs = "sans"; - 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"; # Otherwise kitty behaves funny with ligature # noLigation = true; @@ -171,4 +161,23 @@ final: prev: rec { ]; }; }; + + mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { }; + iosevka-term-nerd = mkNerdFont { + font = iosevka-term; + patcherArgs = [ + "--complete" + "--careful" + "--name {/.}-NFM" + "--mono" + ]; + }; +in +{ + inherit iosevka-term; + + nerd-fonts = prev.nerd-fonts // { + iosevka = iosevka-term-nerd; + iosevka-term = iosevka-term-nerd; + }; }