Clean-up

install-scripts/gtk_themes.sh

@@ -59,48 +59,25 @@ install_package() {
   fi
 }
 
+# installing unzip package to unzip theme packages
+for PKG1 in unzip; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\033[1A\033[K${ERROR} - $PKG1 install had failed, please check the install.log"
+    exit 1
+  fi
+done
 
 # Themes and cursors
-printf "\n${NOTE} INSTALLING GTK THEMES \n"
-  while true; do
-    read -rp "${CAT} Which GTK Theme and Cursors to install? Catppuccin or Tokyo Theme? Enter 'c' or 't': " choice
-    case "$choice" in
-      c|C)
-        printf "${NOTE} Installing Catpuccin Theme packages...\n"
-        for THEME1 in catppuccin-gtk-theme-mocha catppuccin-gtk-theme-latte catppuccin-cursors-mocha; do
-          install_package "$THEME1" 2>&1 | tee -a "$LOG"
-          [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THEME1 install had failed, please check the install.log"; exit 1; }
-        done
-        # Shiny-Dark-Icons-themes
-        mkdir -p ~/.icons
-        cd assets
-        tar -xf Shiny-Dark-Icons.tar.gz -C ~/.icons
-        tar -xf Shiny-Light-Icons.tar.gz -C ~/.icons
-        cd ..
-        sed -i '9,12s/#//' config/hypr/scripts/DarkLight.sh
-        sed -i '9,12s/#//' config/hypr/scripts/DarkLight-swaybg.sh
-        sed -i '31s/#//' config/hypr/configs/Settings.conf
-        cp -f 'config/hypr/waybar/style/dark-styles/style-dark-cat.css' 'config/hypr/waybar/style/style-dark.css'
-        break
-        ;;
-      t|T)
-        printf "${NOTE} Installing Tokyo Theme packages...\n"
-        wget https://github.com/ljmill/tokyo-night-icons/releases/download/v0.2.0/TokyoNight-SE.tar.bz2
-        mkdir -p ~/.icons
-        tar -xvjf TokyoNight-SE.tar.bz2 -C ~/.icons
-        mkdir -p ~/.themes
-        cp -r -f assets/tokyo-themes/* ~/.themes/
-        sed -i '15,18s/#//' config/hypr/scripts/DarkLight.sh
-        sed -i '15,18s/#//' config/hypr/scripts/DarkLight-swaybg.sh
-        sed -i '32s/#//' config/hypr/configs/Settings.conf
-        cp -f 'config/hypr/waybar/style/dark-styles/style-dark-tokyo.css' 'config/hypr/waybar/style/style-dark.css'
-        break
-        ;;
-      *)
-        printf "%s - Invalid choice. Please enter 'c' or 't'\n" "${ERROR}"
-        continue
-        ;;
-    esac
-  done
+printf "${NOTE} Installing Tokyo Theme GTK packages...\n"
+if wget https://github.com/ljmill/tokyo-night-icons/releases/download/v0.2.0/TokyoNight-SE.tar.bz2; then
+  mkdir -p ~/.icons
+  tar -xvjf TokyoNight-SE.tar.bz2 -C ~/.icons
+  mkdir -p ~/.themes
+  unzip -q "assets/tokyo-themes/Tokyonight-Dark-B.zip" -d ~/.themes || true
+  unzip -q "assets/tokyo-themes/Tokyonight-Light-B.zip" -d ~/.themes || true
+else
+  echo -e "${ERROR} Download failed for Tokyo Theme GTK packages."
+fi
 
-  clear
+clear

install-scripts/nvidia.sh

@@ -49,20 +49,17 @@ install_package() {
 # nvidia stuff
 printf "${YELLOW}Installing Nvidia Hyprland...${RESET}\n"
 if pacman -Qs hyprland > /dev/null; then
-  read -n1 -rp "${CAT} Hyprland detected. Would you like to remove and install hyprland-nvidia instead? (y/n) " nvidia_hypr
-  echo
-  if [[ $nvidia_hypr =~ ^[Yy]$ ]]; then
-    for hyprnvi in hyprland hyprland-nvidia hyprland-nvidia-hidpi-git; do
+  printf "${YELLOW} Hyprland detected uninstalling to install Hyprland-nvidia-git...${RESET}\n"
+    for hyprnvi in hyprland hyprland-nvidia hyprland-git hyprland-nvidia-hidpi-git; do
     sudo pacman -R --noconfirm "$hyprnvi" 2>/dev/null | tee -a "$LOG" || true
     done
-  fi
 fi
 
 # install hyprland-nvidia-git
 install_package "hyprland-nvidia-git" 2>&1 | tee -a "$LOG"
 
 # Install additional Nvidia packages
-printf "${YELLOW} Installing Nvidia packages...\n"
+printf "${YELLOW} Installing addition Nvidia packages...\n"
 for krnl in $(cat /usr/lib/modules/*/pkgbase); do
   for NVIDIA in "${krnl}-headers" "${nvidia_pkg[@]}"; do
     install_package "$NVIDIA" 2>&1 | tee -a "$LOG"
@@ -78,12 +75,7 @@ else
 fi
 
 sudo mkinitcpio -P 2>&1 | tee -a "$LOG"
-printf "\n"
-printf "\n"
-printf "\n"
-
-# Preparing exec.conf to enable env = WLR_NO_HARDWARE_CURSORS,1 so it will be ready once config files copied
-sed -i '21s/#//' config/hypr/configs/ENVariables.conf
+printf "\n\n\n"
 
 # Additional Nvidia steps
 NVEA="/etc/modprobe.d/nvidia.conf"

install-scripts/rog.sh

@@ -57,6 +57,5 @@ install_package() {
     done
     printf " Activating ROG services...\n"
     sudo systemctl enable --now supergfxd 2>&1 | tee -a "$LOG"
-    sed -i '20s/#//' config/hypr/configs/Execs.conf
 
 clear