diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 154136a..058f9b8 100644 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -15,22 +15,24 @@ Extra=( hypr_package=( curl dunst - foot grim gvfs gvfs-backends + kitty + nano network-manager-gnome pavucontrol playerctl polkit-kde-agent-1 python3-requests + python3-pip qt5ct + rofi slurp waybar wget wl-clipboard wlogout - wofi ) # the following packages can be deleted. however, dotfiles may not work properly @@ -43,7 +45,6 @@ hypr_package_2=( mpv nvtop pamixer - swaybg swayidle viewnior vim @@ -111,4 +112,10 @@ go install go.senan.xyz/cliphist@latest 2>&1 | tee -a "$LOG" # copy cliphist into /usr/local/bin for some reason it is installing in ~/go/bin sudo cp -r "$HOME/go/bin/cliphist" "/usr/local/bin/" 2>&1 | tee -a "$LOG" + +## Installing pywal colors +printf "\n%s - Installing Pywal.... \n" "${NOTE}" + +sudo pip3 install pywal 2>&1 | tee -a "$LOG" + clear diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 1631aea..77ec49d 100644 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -23,11 +23,12 @@ if [ -d Hyprland-Dots ]; then chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else - if git clone https://github.com/JaKooLit/Hyprland-Dots.git; then + if git clone --branch Betav0.4 https://github.com/JaKooLit/Hyprland-Dots; then cd Hyprland-Dots || exit 1 chmod +x copy.sh ./copy.sh 2>&1 | tee -a "$LOG" else echo -e "${ERROR} Can't download Hyprland-Dots" 2>&1 | tee -a "$LOG" fi -fi \ No newline at end of file +fi + diff --git a/install.sh b/install.sh index ded4423..74dacf7 100644 --- a/install.sh +++ b/install.sh @@ -61,7 +61,6 @@ nwg="" rog="" sddm="" swaylock="" -swww="" thunar="" xdph="" zsh="" @@ -133,8 +132,6 @@ ask_yes_no "Do you want to install zsh and oh-my-zsh?" zsh printf "\n" ask_yes_no "Do you want to install swaylock-effects?" swaylock printf "\n" -ask_yes_no "Do you want to install swww?" swww -printf "\n" ask_yes_no "Do you want to install nwg-look?" nwg printf "\n" ask_yes_no "Do you want to copy dotfiles?" dots @@ -149,6 +146,7 @@ execute_script "00-dependencies.sh" execute_script "00-hypr-pkgs.sh" execute_script "fonts.sh" execute_script "swappy.sh" +execute_script "swww.sh" if [ "$nvidia" == "Y" ]; then execute_script "nvidia.sh" @@ -190,10 +188,6 @@ if [ "$swaylock" == "Y" ]; then execute_script "swaylock-effects.sh" fi -if [ "$swww" == "Y" ]; then - execute_script "swww.sh" -fi - if [ "$nwg" == "Y" ]; then execute_script "nwg-look.sh" fi