From d7e5df3f5dda91b8e0aadbb0a81a04a8c6912ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 3 Jan 2026 11:10:27 +0100 Subject: [PATCH] overlays/iosevka: refactor patcher argument passing, use bundled nerdicons --- nix/lib/mkNerdFont.nix | 15 ++++++--------- nix/overlays/iosevka.nix | 4 +++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/nix/lib/mkNerdFont.nix b/nix/lib/mkNerdFont.nix index f8694d72..e9bffc02 100644 --- a/nix/lib/mkNerdFont.nix +++ b/nix/lib/mkNerdFont.nix @@ -6,8 +6,7 @@ }: { font, - extraArgs ? [ ], - useDefaultsArgs ? true, + patcherArgs ? [ ], }: stdenvNoCC.mkDerivation { /* @@ -27,17 +26,15 @@ stdenvNoCC.mkDerivation { buildPhase = let - args = - lib.optionals useDefaultsArgs [ - "--complete" - "--no-progressbars" - ] - ++ extraArgs; + allPatcherArgs = [ + "--no-progressbars" + ] + ++ patcherArgs; in '' mkdir -p nerd-font find \( -name \*.ttf -o -name \*.otf \) | parallel --jobs=$NIX_BUILD_CORES nerd-font-patcher {} \ - --outputdir nerd-font ${builtins.concatStringsSep " " args} + --outputdir nerd-font ${builtins.concatStringsSep " " allPatcherArgs} ''; installPhase = '' diff --git a/nix/overlays/iosevka.nix b/nix/overlays/iosevka.nix index 1295191f..b161be51 100644 --- a/nix/overlays/iosevka.nix +++ b/nix/overlays/iosevka.nix @@ -7,7 +7,9 @@ final: prev: rec { // { iosevka = mkNerdFont { font = iosevka; - extraArgs = [ + patcherArgs = [ + "--complete" + "--careful" "--name {/.}-NFM" "--mono" ];