Merge pull request #143 from JaKooLit/main

Main to development

CHANGELOGS.md

@@ -1,5 +1,9 @@
 ## Changelogs
 
+## 29 Aug 2024
+- switched over to non-git wallust package
+- improved indentions on some install scripts
+
 ## 28 Aug 2024
 - Added final check if hyprland is installed and will give an error to user
 

install-scripts/00-hypr-pkgs.sh

@@ -18,8 +18,6 @@ curl
   grim 
   gvfs 
   gvfs-mtp
-hypridle
-hyprlock
   imagemagick
   inxi 
   jq
@@ -34,7 +32,6 @@ playerctl
   polkit-gnome
   python-requests
   python-pyquery
-pyprland 
   qt5ct
   qt6ct
   qt6-svg
@@ -43,7 +40,7 @@ slurp
   swappy 
   swaync 
   swww
-wallust-git 
+  wallust 
   waybar
   wget
   wl-clipboard
@@ -92,7 +89,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
 
 # uninstalling conflicting packages
-printf "\n%s - Removing Mako, Dunst and rofi-wayland as it conflicts with swaync and rofi-wayland \n" "${NOTE}"
+printf "\n%s - Removing Mako, Dunst and rofi as it conflicts with swaync and rofi-wayland \n" "${NOTE}"
 for PKG in "${uninstall[@]}"; do
   uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then

install-scripts/hyprland.sh

@@ -3,8 +3,13 @@
 # Main Hyprland Package #
 
 hypr=(
-hyprland
   hyprcursor
+  hyprutils
+  aquamarine
+  hypridle
+  hyprlock
+  hyprland
+  pyprland 
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install.sh

@@ -275,6 +275,6 @@ if pacman -Q hyprland &> /dev/null || pacman -Q hyprland-git &> /dev/null; then
     fi
 else
     # Print error message if neither package is installed
-    printf "\n${NOTE} Hyprland failed to install. Please check Install-Logs...\n\n"
+    printf "\n${WARN} Hyprland failed to install. Please check Install-Logs...\n\n"
     exit 1
 fi