From 17d919c0ed49cdda41cd8fc779cb893e4b9248cf Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Wed, 13 Dec 2023 10:03:23 +0900
Subject: [PATCH] changed / switched to hyprland extra repo

---
 CHANGELOGS.md               |  3 +++
 install-scripts/hyprland.sh |  8 ++++----
 install-scripts/nvidia.sh   | 17 +++++++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 9a86a9e..366c4ff 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,8 @@
 ## Changelogs
 
+## 13 Dec 2023
+- switched hyprland to Extra Repo hyprland (both nvidia and non-nvidia). Seeing they are updating all the time :)
+
 ## 11 Dec 2023
 - Changing over to zsh automatically if user opted
 - If chose to install zsh and have no login manager, zsh auto login will auto start Hyprland
diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh
index caa033d..ea17544 100644
--- a/install-scripts/hyprland.sh
+++ b/install-scripts/hyprland.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 hypr=(
-hyprland-git
+hyprland
 )
 
 ############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
@@ -44,17 +44,17 @@ install_package() {
   fi
 }
 
-# Removing outdated Hyprland from extra repo to avoid conflict
+# Removing other Hyprland to avoid conflict
 printf "${YELLOW} Checking for other hyprland packages and remove if any..${RESET}\n"
 if pacman -Qs hyprland > /dev/null; then
   printf "${YELLOW} Hyprland detected. uninstalling to install Hyprland-git...${RESET}\n"
-    for hyprnvi in hyprland hyprland-nvidia hyprland-nvidia-git hyprland-nvidia-hidpi-git; do
+    for hyprnvi in hyprland-git hyprland-nvidia hyprland-nvidia-git hyprland-nvidia-hidpi-git; do
     sudo pacman -R --noconfirm "$hyprnvi" 2>/dev/null | tee -a "$LOG" || true
     done
 fi
 
 # Hyprland
-printf "${NOTE} Installing Hyprland Packages...\n"
+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; }
diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh
index 3849e89..a4af9a4 100644
--- a/install-scripts/nvidia.sh
+++ b/install-scripts/nvidia.sh
@@ -8,6 +8,10 @@ nvidia_pkg=(
   libva-nvidia-driver-git
 )
 
+hypr=(
+  hyprland
+)
+
 ############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
 
 # Set some colors for output messages
@@ -52,16 +56,17 @@ install_package() {
 printf "${YELLOW} Checking for other hyprland packages and remove if any..${RESET}\n"
 if pacman -Qs hyprland > /dev/null; then
   printf "${YELLOW} Hyprland detected. uninstalling to install Hyprland-git...${RESET}\n"
-    for hyprnvi in hyprland hyprland-nvidia hyprland-nvidia-git hyprland-nvidia-hidpi-git; do
+    for hyprnvi in hyprland-git hyprland-nvidia hyprland-nvidia-git hyprland-nvidia-hidpi-git; do
     sudo pacman -R --noconfirm "$hyprnvi" 2>/dev/null | tee -a "$LOG" || true
     done
 fi
 
-# install hyprland-git
-printf "${YELLOW}Installing Hyprland-git...${RESET}\n"
-for PKG1 in hyprland-git; do
-  install_package "$PKG1" 2>&1 | tee -a "$LOG"
-done
+# 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"