Merge pull request #64 from JaKooLit/development

updated install.sh

install-scripts/nvidia.sh

@@ -13,11 +13,6 @@ nvidia_pkg=(
   libva-nvidia-driver-git
 )
 
-hypr=(
-  hyprland
-  hyprcursor
-)
-
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 # Determine the directory where the script is located
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -41,13 +36,6 @@ if pacman -Qs hyprland > /dev/null; then
     done
 fi
 
-# Hyprland
-printf "${NOTE} Installing Hyprland......\n"
- for HYPR in "${hypr[@]}"; do
-   install_package "$HYPR" 2>&1 | tee -a "$LOG"
-   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR install had failed, please check the install.log"; exit 1; }
-  done
-
 # Install additional Nvidia packages
 printf "${YELLOW} Installing addition Nvidia packages...\n"
 for krnl in $(cat /usr/lib/modules/*/pkgbase); do

install.sh

@@ -188,14 +188,13 @@ execute_script "00-hypr-pkgs.sh"
 # Install pipewire and pipewire-audio
 execute_script "pipewire.sh"
 
+# Install hyprland
+execute_script "hyprland.sh"
+
 if [ "$nvidia" == "Y" ]; then
     execute_script "nvidia.sh"
 fi
 
-if [ "$nvidia" == "N" ]; then
-    execute_script "hyprland.sh"
-fi
-
 if [ "$gtk_themes" == "Y" ]; then
     execute_script "gtk_themes.sh"
 fi