From 12149bb2f6340592296bd510161c96dd588761f2 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 1 Jun 2024 21:25:58 -0500 Subject: [PATCH] Dragon upgraded --- flake.nix | 2 +- modules/home-manager/sway.nix | 2 +- modules/nixos/fonts.nix | 3 +- overlays/default.nix | 2 +- packages/default.nix | 6 ++++ .../iosevkaLyteTerm.nix | 0 packages/iosevkaLyteTermSubset.nix | 29 +++++++++++++++++ pkgs/default.nix | 12 ------- pkgs/iosevka-lyteterm-webmin.nix | 31 ------------------- pkgs/iosevka-lyteterm.nix | 21 ------------- 10 files changed, 39 insertions(+), 69 deletions(-) create mode 100644 packages/default.nix rename pkgs/iosevka-lyteterm-raw.nix => packages/iosevkaLyteTerm.nix (100%) create mode 100644 packages/iosevkaLyteTermSubset.nix delete mode 100644 pkgs/default.nix delete mode 100644 pkgs/iosevka-lyteterm-webmin.nix delete mode 100644 pkgs/iosevka-lyteterm.nix diff --git a/flake.nix b/flake.nix index bd74b15..732cece 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ # Your custom packages # Acessible through 'nix build', 'nix shell', etc packages = forAllSystems (system: - import ./pkgs { + import ./packages { pkgs = nixpkgs.legacyPackages.${system}; }); diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index 27dc6a3..45f749a 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -44,7 +44,7 @@ home.file."${config.xdg.configHome}/tofi/config" = { enable = true; text = '' - font = ${pkgs.iosevka-lyteterm}/share/fonts/truetype/iosevka-lyteterm-regular.ttf + font = ${pkgs.iosevkaLyteTerm}/share/fonts/truetype/IosevkaLyteTerm-regular.ttf text-color = #f8f8f8 prompt-color = #f38ba8 diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix index b905686..1ff44e8 100644 --- a/modules/nixos/fonts.nix +++ b/modules/nixos/fonts.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { - # fonts.packages if unstable? fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) - pkgs.iosevka-lyteterm + pkgs.iosevkaLyteTerm ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 59e114d..384e405 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ {nixpkgs, ...}: { # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: - import ../pkgs { + import ../packages { pkgs = nixpkgs.legacyPackages.${final.system}; }; diff --git a/packages/default.nix b/packages/default.nix new file mode 100644 index 0000000..203bbc8 --- /dev/null +++ b/packages/default.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: rec { + iosevkaLyteTerm = pkgs.callPackage ./iosevkaLyteTerm.nix {}; + iosevkaLyteTermSubset = pkgs.callPackage ./iosevkaLyteTermSubset.nix { + inherit iosevkaLyteTerm; + }; +} diff --git a/pkgs/iosevka-lyteterm-raw.nix b/packages/iosevkaLyteTerm.nix similarity index 100% rename from pkgs/iosevka-lyteterm-raw.nix rename to packages/iosevkaLyteTerm.nix diff --git a/packages/iosevkaLyteTermSubset.nix b/packages/iosevkaLyteTermSubset.nix new file mode 100644 index 0000000..c26bc06 --- /dev/null +++ b/packages/iosevkaLyteTermSubset.nix @@ -0,0 +1,29 @@ +{ + pkgs, + parallel, + python311Packages, + iosevkaLyteTerm, + ... +}: +pkgs.stdenvNoCC.mkDerivation { + inherit (iosevkaLyteTerm) version; + + pname = "${iosevkaLyteTerm.pname}Subset"; + buildInputs = [parallel] ++ (with python311Packages; [fonttools brotli]); + PYTHONPATH = pkgs.python3.withPackages (pp: with pp; [brotli]); + src = iosevkaLyteTerm; + + installPhase = '' + ls -la "${iosevkaLyteTerm}/share/fonts/woff2" + cp "${iosevkaLyteTerm}"/share/fonts/woff2/*.woff2 ./ + cp "${iosevkaLyteTerm}"/share/fonts/truetype/*.ttf ./ + echo ' !"#$%&'"'"'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ‌… ⎜⎡⎣─│┊└├┬╯░▒♯' > ./subset-glyphs.txt + mkdir -p "$out/share/fonts/woff2" + mkdir -p "$out/share/fonts/truetype" + parallel pyftsubset --name-IDs+=0,4,6 --text-file=./subset-glyphs.txt --flavor=woff2 ::: ./*.woff2 + parallel pyftsubset --name-IDs+=0,4,6 --text-file=./subset-glyphs.txt ::: ./*.ttf + cp ./*.subset.woff2 "$out/share/fonts/woff2" + cp ./*.subset.ttf "$out/share/fonts/truetype" + ls -laR + ''; +} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 942837e..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' -{pkgs, ...}: rec { - # example = pkgs.callPackage ./example { }; - - iosevkaLyteTerm = pkgs.callPackage ./iosevka-lyteterm-raw.nix {inherit (pkgs) iosevka;}; - iosevkaLyteTermWebMin = pkgs.callPackage ./iosevka-lyteterm-webmin.nix { - pkgs = pkgs; - inherit (pkgs) python311Packages parallel; - inherit iosevkaLyteTerm; - }; -} diff --git a/pkgs/iosevka-lyteterm-webmin.nix b/pkgs/iosevka-lyteterm-webmin.nix deleted file mode 100644 index 968c93d..0000000 --- a/pkgs/iosevka-lyteterm-webmin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - parallel, - python311Packages, - iosevkaLyteTerm, - ... -}: let - BASE_FONTS = "${iosevkaLyteTerm}"; -in - pkgs.stdenvNoCC.mkDerivation { - inherit BASE_FONTS; - pname = "iosevkaLyteTermWebMin"; - version = iosevkaLyteTerm.version; - buildInputs = [parallel] ++ (with python311Packages; [fonttools brotli]); - PYTHONPATH = pkgs.python3.withPackages (pp: with pp; [brotli]); - srcs = [ - BASE_FONTS - ]; - installPhase = '' - cp "$BASE_FONTS"/woff2/*.woff2 ./ - cp "$BASE_FONTS"/ttf/*.ttf ./ - echo ' !"#$%&'"'"'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ‌… ⎜⎡⎣─│┊└├┬╯░▒♯' > ./subset-glyphs.txt - mkdir -p "$out/share/fonts/woff2" - mkdir -p "$out/share/fonts/truetype" - parallel pyftsubset --name-IDs+=0,4,6 --text-file=./subset-glyphs.txt --flavor=woff2 ::: ./*.woff2 - parallel pyftsubset --name-IDs+=0,4,6 --text-file=./subset-glyphs.txt ::: ./*.ttf - cp ./*.subset.woff2 "$out/share/fonts/woff2" - cp ./*.subset.ttf "$out/share/fonts/truetype" - ls -laR - ''; - } diff --git a/pkgs/iosevka-lyteterm.nix b/pkgs/iosevka-lyteterm.nix deleted file mode 100644 index 0501422..0000000 --- a/pkgs/iosevka-lyteterm.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - pkgs, - iosevka-lyteterm-raw, - ... -}: let - BASE_FONTS = "${iosevka-lyteterm-raw}/iosevka-lyteterm/ttf"; -in - pkgs.stdenvNoCC.mkDerivation { - inherit BASE_FONTS; - pname = "iosevka-lyteterm-ttf"; - version = iosevka-lyteterm-raw.version; - srcs = [ - BASE_FONTS - ]; - installPhase = '' - mkdir -p "$out/share/fonts/truetype" - for f in "$BASE_FONTS"/*.ttf; do - cp "$f" "$out/share/fonts/truetype" - done - ''; - }