From bf1ea1e5fd82beb1e97fdd56a1fb089bab398e19 Mon Sep 17 00:00:00 2001 From: Madeline Hashcube Date: Sat, 17 Oct 2026 23:21:23 -0500 Subject: [PATCH] fix: i have fix everything --- flake.nix | 34 ++++++++++++++++++++++++++++++---- private-build-plans.toml | 31 ------------------------------- 2 files changed, 30 insertions(+), 35 deletions(-) delete mode 100644 private-build-plans.toml diff --git a/flake.nix b/flake.nix index 821bce8..7cae3a9 100644 --- a/flake.nix +++ b/flake.nix @@ -30,12 +30,13 @@ ); overlays.iosevka-hashcube = (self: super: { iosevka-hashcube = ((super.iosevka.overrideAttrs (_:{ - nativeBuildInputs = [ super.nerd-font-patcher ttf2psf.packages."${super.system}".default ] ++ super.iosevka.nativeBuildInputs; + nativeBuildInputs = [ super.nerd-font-patcher ttf2psf.packages."${super.stdenv.hostPlatform.system}".default ] ++ super.iosevka.nativeBuildInputs; postInstall = let - ttf2psf_path = ttf2psf.packages."${super.system}".default; + ttf2psf_path = ttf2psf.packages."${super.stdenv.hostPlatform.system}".default; in '' mkdir -p $out/share/consolefonts/ mkdir -p $out/share/fonts/truetype/iosevka + rm $out/share/fonts/truetype/*Hashcube-Extended*.ttf ttf2psf -c ${ttf2psf_path}/share/ttf2psf/charsets/Lat38.256 \ -e ${ttf2psf_path}/share/ttf2psf/equivalence/linux.set \ -w 64\ @@ -43,8 +44,33 @@ "$out/share/consolefonts/iosevka_hashcube.psf" mv $out/share/fonts/truetype/*.ttf $out/share/fonts/truetype/iosevka/ ''; - })).override { - privateBuildPlan = nixpkgs.lib.importTOML ./private-build-plans.toml; + })).override{ + privateBuildPlan = let attrsets = super.lib.attrsets; lists = super.lib.lists; in { + family = "Iosevka Hashcube"; + spacing = "term"; + serifs = "sans"; + noCvSs = true; + exportGlyphNames = true; + variants.inherits = "ss14"; + ligations.inherits = "dlig"; + + weights = attrsets.mergeAttrsList( lists.imap1 (i: v: { ${v} = let s = i*100; in { shape = s; menu = s; css = s; }; }) [ "Thin" "ExtraLight" "Light" "Regular" "Medium" "SemiBold" "Bold" "ExtraBold" "Heavy" ]); + + slopes = { + Upright = { + angle = 0; + shape = "upright"; + menu = "upright"; + css = "normal" ; + }; + Italic = { + angle = 9.4; + shape = "italic"; + menu = "italic"; + css = "italic"; + }; + }; + }; }); }); devShells = eachSystem ( diff --git a/private-build-plans.toml b/private-build-plans.toml deleted file mode 100644 index 62c5290..0000000 --- a/private-build-plans.toml +++ /dev/null @@ -1,31 +0,0 @@ -family = "Iosevka Hashcube" - -[buildPlans.IosevkaCustom] -family = "Iosevka Custom" -spacing = "term" -serifs = "sans" -noCvSs = true -exportGlyphNames = false - - [buildPlans.IosevkaCustom.variants] - inherits = "ss14" - - [buildPlans.IosevkaCustom.ligations] - inherits = "dlig" - -[buildPlans.IosevkaCustom.widths.Normal] -shape = 500 -menu = 5 -css = "normal" - -[buildPlans.IosevkaCustom.slopes.Upright] -angle = 0 -shape = "upright" -menu = "upright" -css = "normal" - -[buildPlans.IosevkaCustom.slopes.Italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" \ No newline at end of file -- knotmirror 0.0.1