updated

install-scripts/hypridle.sh

@@ -4,6 +4,8 @@
 
 idle=(
     libsdbus-c++-dev
+    libsdbus-c++2
+    libsdbus-c++-bin
     libhyprlang-dev
 )
 

install-scripts/nvidia.sh

@@ -14,9 +14,6 @@ nvidia_pkg=(
   nvidia-vaapi-driver
 )
 
-# for ubuntu-nvidia owners! just delete #
-# sudo ubuntu-drivers install
-
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

install.sh

@@ -168,7 +168,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 non-SDDM login manager(s) are active:\n\n$active_list\n\nWARN: DO NOT install or choose to install SDDM & SDDM theme in the choices\nOr disable those active services first before running this script\n\nIf you ignored this warning and you chose to install SDDM, script will return to choices in the middle of the installation.\n\n🏳️ So choose wisely\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\n\nYour option to install SDDM and SDDM theme has now been removed\n\n😎 Ja " 22 80
 fi
 
 # Check if NVIDIA GPU is detected
@@ -204,14 +204,20 @@ if [ "$input_group_detected" == "true" ]; then
     )
 fi
 
+# Conditionally add SDDM and SDDM theme options if no active login manager is found
+if ! check_services_running; then
+    options_command+=(
+        "sddm" "Install & configure SDDM login manager?" "OFF"
+        "sddm_theme" "Download & Install Additional SDDM theme?" "OFF"
+    )
+fi
+
 # Add the remaining static options
 options_command+=(
     "gtk_themes" "Install GTK themes (required for Dark/Light function)" "OFF"
     "bluetooth" "Do you want script to configure Bluetooth?" "OFF"
     "thunar" "Do you want Thunar file manager to be installed?" "OFF"
     "ags" "Install AGS v1 for Desktop-Like Overview" "OFF"
-    "sddm" "Install & configure SDDM login manager?" "OFF"
-    "sddm_theme" "Download & Install Additional SDDM theme?" "OFF"
     "xdph" "Install XDG-DESKTOP-PORTAL-HYPRLAND (for screen share)?" "OFF"
     "zsh" "Install zsh shell with Oh-My-Zsh?" "OFF"
     "pokemon" "Add Pokemon color scripts to your terminal?" "OFF"
@@ -286,36 +292,36 @@ done
 
 printf "\n%.0s" {1..1}
 
-echo "${INFO} ℹ️ Running a full system update..." | tee -a "$LOG"
+echo "${INFO} Running a ${SKY_BLUE}full system update...${RESET}" | tee -a "$LOG"
 sudo apt update
 
 sleep 1
 # execute pre clean up
 execute_script "02-pre-cleanup.sh"
 
-echo "${INFO} ℹ️ Installing necessary dependencies..." | tee -a "$LOG"
+echo "${INFO} Installing ${SKY_BLUE}necessary dependencies...${RESET}" | tee -a "$LOG"
 sleep 1
 execute_script "00-dependencies.sh"
 
-echo "${INFO} ℹ️ Installing necessary fonts..." | tee -a "$LOG"
+echo "${INFO} Installing ${SKY_BLUE}necessary fonts...${RESET}" | tee -a "$LOG"
 sleep 1
 execute_script "fonts.sh"
 
-echo "${INFO} ℹ️ Installing KooL Hyprland packages..." | tee -a "$LOG"
+echo "${INFO} Installing ${SKY_BLUE}KooL Hyprland packages...${RESET}" | tee -a "$LOG"
 sleep 1
 execute_script "01-hypr-pkgs.sh"
 sleep 1
 execute_script "hyprland.sh"
 sleep 1
-execute_script "hyprlock.sh"
-sleep 1
-execute_script "hypridle.sh"
-sleep 1
 execute_script "wallust.sh"
 sleep 1
 execute_script "swww.sh"
 sleep 1
 execute_script "rofi-wayland.sh"
+sleep 1
+execute_script "hyprlock.sh"
+sleep 1
+execute_script "hypridle.sh"
 
 #execute_script "imagemagick.sh" #this is for compiling from source. 07 Sep 2024
 # execute_script "waybar-git.sh" only if waybar on repo is old
@@ -336,57 +342,57 @@ for option in "${options[@]}"; do
                 whiptail --title "Error" --msgbox "One of the following login services is running:\n$active_list\n\nPlease stop & disable it or DO not choose SDDM." 12 60
                 exec "$0"  
             else
-                echo "Installing and configuring SDDM..." | tee -a "$LOG"
+                echo "${INFO} Installing and configuring ${SKY_BLUE}SDDM...${RESET}" | tee -a "$LOG"
                 execute_script "sddm.sh"
             fi
             ;;
         nvidia)
-            echo "Configuring nvidia stuff" | tee -a "$LOG"
+            echo "${INFO} Configuring ${SKY_BLUE}nvidia stuff${RESET}" | tee -a "$LOG"
             execute_script "nvidia.sh"
             ;;
         gtk_themes)
-            echo "Installing GTK themes..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}GTK themes...${RESET}" | tee -a "$LOG"
             execute_script "gtk_themes.sh"
             ;;
         input_group)
-            echo "Adding user into input group..." | tee -a "$LOG"
+            echo "${INFO} Adding user into ${SKY_BLUE}input group...${RESET}" | tee -a "$LOG"
             execute_script "InputGroup.sh"
             ;;
         ags)
-            echo "Installing AGS..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}AGS v1 for Desktop Overview...${RESET}" | tee -a "$LOG"
             execute_script "ags.sh"
             ;;
         xdph)
-            echo "Installing XDG-DESKTOP-PORTAL-HYPRLAND..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland...${RESET}" | tee -a "$LOG"
             execute_script "xdph.sh"
             ;;
         bluetooth)
-            echo "Configuring Bluetooth..." | tee -a "$LOG"
+            echo "${INFO} Configuring ${SKY_BLUE}Bluetooth...${RESET}" | tee -a "$LOG"
             execute_script "bluetooth.sh"
             ;;
         thunar)
-            echo "Installing Thunar file manager..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}Thunar file manager...${RESET}" | tee -a "$LOG"
             execute_script "thunar.sh"
             execute_script "thunar_default.sh"
             ;;
         sddm_theme)
-            echo "Downloading & Installing Additional SDDM theme..." | tee -a "$LOG"
+            echo "${INFO} Downloading & Installing ${SKY_BLUE}Additional SDDM theme...${RESET}" | tee -a "$LOG"
             execute_script "sddm_theme.sh"
             ;;
         zsh)
-            echo "Installing zsh with Oh-My-Zsh..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}zsh with Oh-My-Zsh...${RESET}" | tee -a "$LOG"
             execute_script "zsh.sh"
             ;;
         pokemon)
-            echo "Adding Pokemon color scripts to terminal..." | tee -a "$LOG"
+            echo "${INFO} Adding ${SKY_BLUE}Pokemon color scripts to terminal...${RESET}" | tee -a "$LOG"
             execute_script "zsh_pokemon.sh"
             ;;
         rog)
-            echo "Installing ROG packages..." | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}ROG laptop packages...${RESET}" | tee -a "$LOG"
             execute_script "rog.sh"
             ;;
         dots)
-            echo "Installing pre-configured Hyprland dotfiles..." | tee -a "$LOG"
+            echo "${INFO} Installing pre-configured ${SKY_BLUE}KooL Hyprland dotfiles...${RESET}" | tee -a "$LOG"
             execute_script "dotfiles-branch.sh"
             ;;
         *)