diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix index 86fbad6..b3cfd0a 100644 --- a/modules/nixos/desktop-usage.nix +++ b/modules/nixos/desktop-usage.nix @@ -17,7 +17,11 @@ }; systemPackages = with pkgs; [ + marksman + markdown-oxide gnupg + pinentry-tty + pinentry-curses ]; }; diff --git a/pkgs/iosevka-lyteterm-raw.nix b/pkgs/iosevka-lyteterm-raw.nix index 4b2ba02..ab023b6 100644 --- a/pkgs/iosevka-lyteterm-raw.nix +++ b/pkgs/iosevka-lyteterm-raw.nix @@ -1,7 +1,6 @@ {iosevka, ...}: let set = "LyteTerm"; -in - (iosevka.override { +in ((iosevka.override { inherit set; privateBuildPlan = '' @@ -125,7 +124,22 @@ in ''; }) .overrideAttrs { - postBuild = '' + buildPhase = '' + export HOME=$TMPDIR + runHook preBuild + npm run build --no-update-notifier --targets ttf::$pname -- --jCmd=$NIX_BUILD_CORES --verbose=9 npm run build --no-update-notifier --targets woff2::$pname -- --jCmd=$NIX_BUILD_CORES --verbose=9 + runHook postBuild ''; - } + + installPhase = '' + runHook preInstall + ttfontdir="$out/share/fonts/truetype" + wfontdir="$out/share/fonts/woff2" + install -d "$ttfontdir" + install -d "$wfontdir" + install "dist/$pname/TTF"/* "$ttfontdir" + install "dist/$pname/WOFF2"/* "$wfontdir" + runHook postInstall + ''; + }) diff --git a/pkgs/iosevka-lyteterm-webmin.nix b/pkgs/iosevka-lyteterm-webmin.nix index b6efe64..968c93d 100644 --- a/pkgs/iosevka-lyteterm-webmin.nix +++ b/pkgs/iosevka-lyteterm-webmin.nix @@ -2,15 +2,15 @@ pkgs, parallel, python311Packages, - iosevka-lyteterm-raw, + iosevkaLyteTerm, ... }: let - BASE_FONTS = "${iosevka-lyteterm-raw}/iosevka-lyteterm"; + BASE_FONTS = "${iosevkaLyteTerm}"; in pkgs.stdenvNoCC.mkDerivation { inherit BASE_FONTS; - pname = "iosevka-lyteterm-webmin"; - version = iosevka-lyteterm-raw.version; + pname = "iosevkaLyteTermWebMin"; + version = iosevkaLyteTerm.version; buildInputs = [parallel] ++ (with python311Packages; [fonttools brotli]); PYTHONPATH = pkgs.python3.withPackages (pp: with pp; [brotli]); srcs = [