Merge pull request #74 from JaKooLit/development

Releasing a new installer to work with Hyprland-Dots v2.2.11

CHANGELOGS.md

@@ -1,5 +1,12 @@
 ## Changelogs
 
+## 10 May 2024
+- added wallust-git and remove python-pywal for migration to wallust on Hyprland-Dots v2.2.11
+
+## 07 May 2024
+- added ags.sh for upcoming ags overview for next Hyprland-Dots release. Will be installed form source
+- added manual installation of waybar since Debian is very slow in updating their packages
+
 ## 03 May 2024
 - Bump swww to v0.9.5
 - added python3-pyquery for new weather-waybar python based on Hyprland-Dots

install-scripts/00-dependencies.sh

@@ -8,6 +8,7 @@ dependencies=(
     cmake
     cmake-extras
     curl
+    gawk
     gettext
     gir1.2-graphene-1.0
     git

install-scripts/00-hypr-pkgs.sh

@@ -97,9 +97,4 @@ done
 ## making brightnessctl work
 sudo chmod +s $(which brightnessctl) 2>&1 | tee -a "$LOG" || true
 
-## Installing pywal colors
-printf "\n%s - Installing Pywal.... \n" "${NOTE}"
-
-sudo pip3 install pywal --break-system-packages 2>&1 | tee -a "$LOG"
-
 clear

install-scripts/ags.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Aylur's GTK Shell #
+
+ags=(
+node-typescript 
+npm 
+meson 
+libgjs-dev 
+gjs 
+libgtk-layer-shell-dev 
+libgtk-3-dev 
+libpulse-dev 
+libdbusmenu-gtk3-dev 
+libsoup-3.0-dev
+)
+
+# specific tags to download
+ags_tag="v1.8.2"
+
+## 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 )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log"
+MLOG="install-$(date +%d-%H%M%S)_ags.log"
+
+# Installing ags Dependencies
+for PKG1 in "${ags[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+#install typescript by npm
+sudo npm install --global typescript 2>&1 | tee -a "$LOG"
+
+# ags
+
+printf "${NOTE} Install and Compiling Aylurs GTK shell\n"
+
+# Check if folder exists and remove it
+if [ -d "ags" ]; then
+    printf "${NOTE} Removing existing ags folder...\n"
+    rm -rf "ags"
+fi
+
+# Clone nwg-look repository with the specified tag
+if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.git; then
+    cd ags || exit 1
+    # Build and install ags
+	npm install
+	meson setup build
+    if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
+        printf "${OK} ags installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for ags" 2>&1 | tee -a "$MLOG"
+    fi
+
+    # Move logs to Install-Logs directory
+    mv "$MLOG" ../Install-Logs/ || true
+    cd ..
+else
+    echo -e "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG"
+    mv "$MLOG" ../Install-Logs/ || true
+    exit 1
+fi
+

install-scripts/hyprland.sh

@@ -4,7 +4,7 @@
 
 
 #specific branch or release
-hyprland_tag="v0.39.1"
+hyprland_tag="v0.40.0"
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 # Determine the directory where the script is located

install-scripts/hyprlock.sh

@@ -34,7 +34,7 @@ for PKG1 in "${lock[@]}"; do
   fi
 done
 
-# Check if hyprlidle folder exists and remove it
+# Check if hyprlock folder exists and remove it
 if [ -d "hyprlock" ]; then
     printf "${NOTE} Removing existing hyprlock folder...\n"
     rm -rf "hyprlock"

install-scripts/hyprwayland-scanner.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# hyprwayland-scanner - One depency from Hyprland v0.40.0#
+
+scan_depend=(
+libpugixml-dev
+)
+#specific branch or release
+scan_tag="v0.3.7"
+
+## 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 )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprlang.log"
+MLOG="install-$(date +%d-%H%M%S)_hyprwayland-scanner.log"
+
+##
+# Installation of dependencies
+printf "\n%s - Installing hyprwayland-scanner dependencies.... \n" "${NOTE}"
+
+for PKG1 in "${scan_depend[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+printf "${NOTE} Installing hyprwayland-scanner...\n"  
+
+# Check if hyprwayland-scanner folder exists and remove it
+if [ -d "hyprwayland-scanner" ]; then
+    printf "${NOTE} Removing existing hyprwayland-scanner folder...\n"
+    rm -rf "hyprwayland-scanner"
+fi
+
+# Clone and build hyprlang
+printf "${NOTE} Installing hyprwayland-scanner...\n"
+if git clone --recursive -b $scan_tag https://github.com/hyprwm/hyprwayland-scanner.git; then
+    cd hyprwayland-scanner || exit 1
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -B build
+	cmake --build build -j `nproc`
+    if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then
+        printf "${OK} hyprwayland-scanner installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for hyprwayland-scanner." 2>&1 | tee -a "$MLOG"
+    fi
+    #moving the addional logs to Install-Logs directory
+    mv $MLOG ../Install-Logs/ || true 
+    cd ..
+else
+    echo -e "${ERROR} Download failed for hyprwayland-scanner. Please check log." 2>&1 | tee -a "$LOG"
+fi
+
+
+clear
+

install-scripts/nvidia.sh

@@ -10,6 +10,7 @@ nvidia_pkg=(
   linux-headers-$(uname -r)
   libnvidia-egl-wayland1
   libva-wayland2
+  libnvidia-egl-wayland1
   nvidia-vaapi-driver
 )
 

install-scripts/pywal.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# 💫 https://github.com/JaKooLit 💫 #
-# Pywal Colors) #
-
-pywal=(
-  imagemagick
-  python3-pip
-)
-
-## 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 )"
-
-# Change the working directory to the parent directory of the script
-PARENT_DIR="$SCRIPT_DIR/.."
-cd "$PARENT_DIR" || exit 1
-
-source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
-
-# Set the name of the log file to include the current date and time
-LOG="Install-Logs/install-$(date +'%d-%H%M%S')_pywal.log"
-
-# Installing Pywal dependencies
-for package in "${pywal[@]}"; do
-  install_package "$package" || exit 1
-done
-
-## Installing pywal colors
-printf "\n%s - Installing Pywal.... \n" "${NOTE}"
-sudo pip3 install pywal --break-system-packages 2>&1 | tee -a "$LOG"
-
-clear

install-scripts/wallust.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# wallust - pywal colors replacment #
+
+depend=(
+librust-jpeg-decoder-dev
+imagemagick
+rustup
+)
+
+#specific branch or release
+wal_tag="dev"
+
+## 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 )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log"
+MLOG="install-$(date +%d-%H%M%S)_wallust.log"
+
+# Installing depencies
+for PKG1 in "${depend[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+##
+printf "${NOTE} Installing wallust from dev branch...\n"  
+
+# Check if folder exists and remove it
+if [ -d "wallust" ]; then
+    printf "${NOTE} Removing existing wallust folder...\n"
+    rm -rf "wallust"
+fi
+
+# Clone and build wallust
+printf "${NOTE} Installing wallust...\n"
+if git clone --depth 1 -b $wal_tag https://codeberg.org/explosion-mental/wallust.git; then
+    cd wallust || exit 1
+	make
+    if sudo make install 2>&1 | tee -a "$MLOG" ; then
+        printf "${OK} wallust installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for wallust." 2>&1 | tee -a "$MLOG"
+    fi
+    #moving the addional logs to Install-Logs directory
+    mv $MLOG ../Install-Logs/ || true 
+    cd ..
+else
+    echo -e "${ERROR} Download failed for wallust." 2>&1 | tee -a "$LOG"
+fi
+
+clear
+

install-scripts/waybar-git.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# waybar - from source #
+
+waybar=(
+cmake
+meson
+scdoc
+wayland-protocols
+clang-tidy 
+gobject-introspection 
+libdbusmenu-gtk3-dev 
+libevdev-dev 
+libfmt-dev 
+libgirepository1.0-dev 
+libgtk-3-dev 
+libgtkmm-3.0-dev 
+libinput-dev 
+libjsoncpp-dev 
+libmpdclient-dev 
+libnl-3-dev 
+libnl-genl-3-dev 
+libpulse-dev 
+libsigc++-2.0-dev 
+libspdlog-dev 
+libwayland-dev 
+scdoc 
+upower 
+libxkbregistry-dev
+)
+
+
+## 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 )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_waybar-gt.log"
+MLOG="install-$(date +%d-%H%M%S)_waybar-git.log"
+
+# Installation of dependencies
+printf "\n%s - Installing waybar-git dependencies.... \n" "${NOTE}"
+
+for PKG1 in "${waybar[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+# Check if waybar folder exists and remove it
+if [ -d "waybar" ]; then
+    printf "${NOTE} Removing existing waybar folder...\n"
+    rm -rf "waybar"
+fi
+
+# Clone and build waybar from source
+printf "${NOTE} Installing waybar...\n"
+if git clone https://github.com/Alexays/Waybar; then
+    cd Waybar || exit 1
+	meson build
+    if sudo ninja -C build install 2>&1 | tee -a "$MLOG" ; then
+        printf "${OK} waybar-git installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for waybar-git." 2>&1 | tee -a "$MLOG"
+    fi
+    #moving the addional logs to Install-Logs directory
+    mv $MLOG ../Install-Logs/ || true 
+    cd ..
+else
+    echo -e "${ERROR} Download failed for waybar-git" 2>&1 | tee -a "$LOG"
+fi
+
+clear
+

install.sh

@@ -161,14 +161,17 @@ execute_script "fonts.sh"
 execute_script "swappy.sh"
 execute_script "swww.sh"
 execute_script "rofi-wayland.sh"
-execute_script "pywal.sh"
 execute_script "force-install.sh"
+execute_script "wallust.sh"
+execute_script "ags.sh"
 execute_script "hyprlang.sh"
 execute_script "hyprlock.sh"
 execute_script "hyprcursor.sh"
 execute_script "hypridle.sh"
+execute_script "hyprwayland-scanner.sh"
 execute_script "hyprland.sh"
 execute_script "hypr-eco.sh"
+execute_script "waybar-git.sh"
 
 
 #execute_script "cliphist.sh"