diff --git a/flake.nix b/flake.nix index a51e514..84d1e7a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,12 @@ }; outputs = - { self, nixpkgs, whiskers, ... }: + { + self, + nixpkgs, + whiskers, + ... + }: let systems = [ "aarch64-darwin" @@ -28,7 +33,14 @@ devShells = forEachSystem ( { pkgs, system }: { - default = pkgs.mkShell { packages = with pkgs; [ whiskers.packages.${system}.default zip ]; }; + default = pkgs.mkShell { + packages = with pkgs; [ + whiskers.packages.${system}.default + libsForQt5.kpackage + kdePackages.kpackage + zip + ]; + }; } ); diff --git a/install_new.sh b/install_new.sh index efd3bba..2b93f04 100755 --- a/install_new.sh +++ b/install_new.sh @@ -131,7 +131,7 @@ Choose a style - 1. Modern 2. Classic EOF - read -r ACCENT + read -r STYLE fi case "$STYLE" in @@ -172,7 +172,7 @@ echo "Done" echo -n "Fetching zip... " # curl "$URL" -o ./theme.zip -cp "$DISTDIR/catppuccin-mocha-blue.tar.gz" ./theme.tar.gz +cp "$DISTDIR/catppuccin-$FLAVOURNAME-$ACCENTNAME.tar.gz" ./theme.tar.gz echo "Done" echo -n "Unzipping... " @@ -193,10 +193,11 @@ cp "$SRCROOT/contents/defaults.$STYLENAME" "$SRCROOT/contents/defaults" echo "Done" echo "Installing KDE theme..." -kpackagetool5 -i "$SRCROOT" +kpackagetool6 -i "$SRCROOT" echo "Done" echo -n "Moving files to home dir..." +mkdir -p "$LOOKANDFEELDIR/catppuccin-$FLAVOURNAME-$ACCENTNAME" cp -r "$SRCROOT/Splash/contents/splash" "$LOOKANDFEELDIR/$GLOBALTHEMENAME/contents" cp -r "$SRCROOT/Splash/contents/previews" "$LOOKANDFEELDIR/$GLOBALTHEMENAME/contents/previews" cp -r "$SRCROOT/catppuccin-$FLAVOURNAME-$STYLENAME" "$AURORAEDIR" @@ -212,4 +213,4 @@ rm -r "$LOOKANDFEELDIR/$GLOBALTHEMENAME/theme.colors" echo "Done" echo -echo "Theme installation complete" \ No newline at end of file +echo "Theme installation complete"