Merge pull request #188 from JaKooLit/main

main to development

README.md

@@ -131,6 +131,7 @@ sudo nano /etc/apt/sources.list
 
 ## ✨ Auto clone and install
 - you can use this command to automatically clone the installer and ran the script for you
+- NOTE: `curl` package is required before running this command
 ```bash
 sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Debian-Hyprland/main/auto-install.sh)
 ```
@@ -250,6 +251,17 @@ env = GBM_BACKEND,nvidia-drm
 env = WLR_RENDERER_ALLOW_SOFTWARE,1
 ```
 
+### 🚩 changing login manager to SDDM
+- if you really want to change login manager, there are couple of things you need to carry out before running this install script
+- first install sddm. the no-install-recommends is suggested else it will pull lots of plasma depencies.
+```bash
+sudo apt install --no-install-recommends -y sddm
+```
+- then ran `sudo dpkg-reconfigure sddm` choose sddm and then reboot.
+- once reboot done, you can ran the script and choose sddm & sddm theme
+- [LINK](https://www.simplified.guide/ubuntu/switch-to-gdm) for some guide
+
+
 #### 🫥 Improving performance for Older Nvidia Cards using driver 470
   - [`SEE HERE`](https://github.com/JaKooLit/Hyprland-Dots/discussions/123#discussion-6035205)
   

install-scripts/Global_functions.sh

@@ -71,7 +71,7 @@ install_package() {
 build_dep() { 
   echo -e "${INFO} building dependencies for ${MAGENTA}$1${RESET} "
     (
-      stdbuf -oL sudo build-dep -y "$1" 2>&1
+      stdbuf -oL sudo apt build-dep -y "$1" 2>&1
     ) >> "$LOG" 2>&1 &
     PID=$!
     show_progress $PID "$1" 

install-scripts/hypridle.sh

@@ -6,7 +6,6 @@ idle=(
     libsdbus-c++-dev
     libsdbus-c++2
     libsdbus-c++-bin
-    libhyprlang-dev
 )
 
 #specific branch or release

install-scripts/hyprlang.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# hyplang #
+
+
+#specific branch or release
+lang_tag="v0.5.2"
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; }
+
+# Source the global functions script
+if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then
+  echo "Failed to source Global_functions.sh"
+  exit 1
+fi
+
+# 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)_hyprlang2.log"
+
+# Installation of dependencies
+printf "\n%s - Installing ${YELLOW}hyprlang dependencies${RESET} .... \n" "${INFO}"
+
+# Check if hyprlang folder exists and remove it
+if [ -d "hyprlang" ]; then
+    rm -rf "hyprlang"
+fi
+
+# Clone and build 
+printf "${INFO} Installing ${YELLOW}hyprlang $lang_tag${RESET} ...\n"
+if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprlang.git; then
+    cd hyprlang || exit 1
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+    cmake --build ./build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
+    if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
+        printf "${OK} ${MAGENTA}hyprlang $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for ${YELLOW}hyprlang $lang_tag${RESET}" 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 ${YELLOW}hyprlang $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
+fi
+
+printf "\n%.0s" {1..2}

install-scripts/rofi-wayland.sh

@@ -8,6 +8,7 @@ rofi=(
   pandoc
   doxygen
   cppcheck
+  imagemagick
   libmpdclient-dev
   libnl-3-dev
   libasound2-dev

install.sh

@@ -94,6 +94,7 @@ if ! dpkg -l | grep -w pciutils > /dev/null; then
     printf "\n%.0s" {1..1}
 fi
 
+
 # Path to the install-scripts directory
 script_directory=install-scripts
 
@@ -168,7 +169,7 @@ if check_services_running; then
 
     # Display the active login manager(s) in the whiptail message box
     whiptail --title "Active non-SDDM login manager(s) detected" \
-        --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\n\nYour option to install SDDM and SDDM theme has now been removed\n\n😎 Ja " 22 80
+        --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\n😎 Ja " 27 80
 fi
 
 # Check if NVIDIA GPU is detected
@@ -321,6 +322,8 @@ execute_script "rofi-wayland.sh"
 sleep 1
 execute_script "hyprlock.sh"
 sleep 1
+execute_script "hyprlang.sh"
+sleep 1
 execute_script "hypridle.sh"
 
 #execute_script "imagemagick.sh" #this is for compiling from source. 07 Sep 2024

uninstall.sh

@@ -62,22 +62,24 @@ remove_packages() {
     done < "$selected_packages_file"
 }
 
-
-
 # Function to remove selected directories
 remove_directories() {
     local selected_dirs_file=$1
     while read -r dir; do
-        if [ -d "$HOME/.config/$dir" ]; then
+        pattern="$HOME/.config/$dir*"        
-            echo "Removing directory: $HOME/.config/$dir"
+        # Loop through directories matching the pattern
-            if ! rm -rf "$HOME/.config/$dir"; then
+        for dir_to_remove in $pattern; do
-                echo "$ERROR Failed to remove directory: $HOME/.config/$dir"
+            if [ -d "$dir_to_remove" ]; then
+                echo "Removing directory: $dir_to_remove"
+                if ! rm -rf "$dir_to_remove"; then
+                    echo "$ERROR Failed to remove directory: $dir_to_remove"
+                else
+                    echo "$OK Successfully removed directory: $dir_to_remove"
+                fi
             else
-                echo "$OK Successfully removed directory: $HOME/.config/$dir"
+                echo "$INFO Directory ${YELLOW}$dir_to_remove${RESET} not found. Skipping."
             fi
-        else
+        done
-            echo "$INFO Directory ${YELLOW}$HOME/.config/$dir${RESET} not found. Skipping."
-        fi
     done < "$selected_dirs_file"
 }
 
@@ -90,13 +92,8 @@ packages=(
     "fastfetch" "fastfetch" "off"
     "ffmpegthumbnailer" "FFmpeg Thumbnailer" "off"
     "grim" "screenshot tool" "off"
-    "hypridle" "hyprland idling agent" "off"
-    "hyprland" "hyprland main package" "off"
-    "hyprlock" "lockscreen" "off"
     "polkit-kde-agent-1" "polkit agent" "off"
-    "imagemagick" "imagemagick" "off"
+    "imagemagick" "Image manipulation tool" "off"
-    "inxi" "CLI system information" "off"
-    "jq" "json data" "off"
     "kitty" "kitty-terminal" "off"
     "qt5-style-kvantum" "QT apps theming" "off"
     "qt5-style-kvantum-themes" "QT apps theming" "off"
@@ -107,9 +104,7 @@ packages=(
     "nwg-displays" "display monitor configuration app" "off"
     "nwg-look" "gtk settings app" "off"
     "pamixer" "pamixer" "off"
-    "pokemon-colorscripts-git" "terminal colorscripts" "off"
     "pavucontrol" "pavucontrol" "off"
-    "pipewire-alsa" "pipewire-alsa" "off"
     "playerctl" "playerctl" "off"
     "qalculate-gtk" "calculater - QT" "off"
     "qt5ct" "qt5ct" "off"
@@ -123,7 +118,6 @@ packages=(
     "thunar-archive-plugin" "Archive Plugin" "off"
     "thunar-volman" "Volume Management" "off"
     "tumbler" "Thumbnail Service" "off"
-    "unzip" "unzip" "off"
     "wallust" "color pallete generator" "off"
     "waybar" "wayland bar" "off"
     "wl-clipboard" "clipboard manager" "off"
@@ -132,6 +126,7 @@ packages=(
     "yad" "dialog box" "off"
     "yt-dlp" "video downloader" "off"
     "xarchiver" "Archive Manager" "off"
+    "hyprland" "hyprland main package" "off"
 )
 
 # Define the list of directories to choose from (with options_command tags)
@@ -243,7 +238,7 @@ done
 
 printf "\n%.0s" {1..1}
 printf "\n%s${SKY_BLUE}Attempting to remove locally installed packages${RESET}\n" "${NOTE}"
-for file in ags hypridle hyprlock pokemon-colorscripts rofi wallust; do
+for file in ags hypridle hyprlock rofi wallust; do
     if [ -f "/usr/local/bin/$file" ]; then
         sudo rm "/usr/local/bin/$file"
         echo "$file removed."