diff --git a/lib/importantize.nix b/lib/importantize.nix index 03434ec..e15edcb 100644 --- a/lib/importantize.nix +++ b/lib/importantize.nix @@ -1,6 +1,6 @@ {pkgs, ...}: pkgs.writers.writeJSBin "importantize" { - libraries = [pkgs.nodePackages.postcss]; + libraries = [pkgs.postcss]; } '' const postcss = require("postcss"); diff --git a/lib/mkUserStyles.nix b/lib/mkUserStyles.nix index 7a4cea9..5d5a0d7 100644 --- a/lib/mkUserStyles.nix +++ b/lib/mkUserStyles.nix @@ -104,13 +104,12 @@ in name = "userstyles.css"; phases = ["buildPhase"]; nativeBuildInputs = with pkgs; [ + clean-css-cli dart-sass lessc ]; buildPhase = '' - export NODE_PATH=${pkgs.nodePackages.less-plugin-clean-css}/lib/node_modules - cp "${catppuccin-userstyles}/lib/lib.less" lib-base16.less chmod u+w lib-base16.less printf '%s\n' ${escapeShellArg lessPaletteOverride} >> lib-base16.less @@ -120,7 +119,8 @@ in file="${catppuccin-userstyles}/styles/$style/catppuccin.user.less" if [ -f "$file" ]; then (cat lib-base16.less; cat "$file" | sed '\|@import "https://userstyles.catppuccin.com/lib/lib.less";|d'; echo ${escapeShellArg (lessVarDecl lessVars)}) | \ - lessc --source-map-no-annotation --clean-css="-b --s0 --skip-rebase --skip-advanced --skip-aggressive-merging --skip-shorthand-compacting" - >> catppuccin.userstyles.css + lessc --source-map-no-annotation - | \ + cleancss -O1 >> catppuccin.userstyles.css fi done