Merge pull request #300 from JaKooLit/development

Development to main

CHANGELOGS.md

@@ -1,5 +1,11 @@
 ## CHANGELOGS
 
+## 22 July 2025
+- Updated sddm theme and script to work with the updated simple_sddm_2 theme
+
+## 17 July 2025
+- added quickshell script to replace ags for desktop overview
+
 ## 08 June 2025
 - updated SDDM theme. 
 

install-scripts/fonts.sh

@@ -19,7 +19,6 @@ fonts=(
   noto-fonts
 )
 
-
 ## 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-scripts/quickshell.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# quickshell - for desktop overview replacing AGS
+
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
+
+quick=(
+    quickshell
+)
+
+## 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)_quick.log"
+
+# Installation of main components
+printf "\n%s - Installing ${SKY_BLUE}Quick Shell ${RESET} for Desktop Overview \n" "${NOTE}"
+
+for PKG1 in "${quick[@]}"; do
+    install_package "$PKG1" "$LOG"
+done
+
+# removal of ags
+# Check if the file exists and remove it
+printf "\n%s - removing ${SKY_BLUE}AGS${RESET}  \n" "${NOTE}"
+if [ -f "/usr/local/bin/ags" ]; then
+    sudo rm -r /usr/local/bin/ags
+fi
+
+if [ -d "/usr/local/share/com.github.Aylur.ags" ]; then
+    sudo rm -rf /usr/local/share/com.github.Aylur.ags
+fi
+
+
+printf "\n%.0s" {1..1}

install-scripts/sddm.sh

@@ -3,9 +3,10 @@
 # SDDM Log-in Manager #
 
 sddm=( 
-  qt6-5compat 
   qt6-declarative 
   qt6-svg
+  qt6-virtualkeyboard
+  qt6-multimedia-ffmpeg
   sddm
 )
 

install-scripts/sddm_theme.sh

@@ -52,7 +52,6 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then
   # Move cloned theme to the themes directory
   sudo mv "$theme_name" "/usr/share/sddm/themes/$theme_name" 2>&1 | tee -a "$LOG"
 
-
   # setting up SDDM theme
   sddm_conf="/etc/sddm.conf"
   BACKUP_SUFFIX=".bak"
@@ -86,16 +85,30 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then
     echo "Added [Theme] section with Current=$theme_name in $sddm_conf" | tee -a "$LOG"
   fi
 
+  # Add [General] section with InputMethod=qtvirtualkeyboard if it doesn't exist
+  if ! grep -q '^\[General\]' "$sddm_conf"; then
+    echo -e "\n[General]\nInputMethod=qtvirtualkeyboard" | sudo tee -a "$sddm_conf" > /dev/null
+    echo "Added [General] section with InputMethod=qtvirtualkeyboard in $sddm_conf" | tee -a "$LOG"
+  else
+    # Update InputMethod line if section exists
+    if grep -q '^\s*InputMethod=' "$sddm_conf"; then
+      sudo sed -i '/^\[General\]/,/^\[/{s/^\s*InputMethod=.*/InputMethod=qtvirtualkeyboard/}' "$sddm_conf" 2>&1 | tee -a "$LOG"
+      echo "Updated InputMethod to qtvirtualkeyboard in $sddm_conf" | tee -a "$LOG"
+    else
+      sudo sed -i '/^\[General\]/a InputMethod=qtvirtualkeyboard' "$sddm_conf" 2>&1 | tee -a "$LOG"
+      echo "Appended InputMethod=qtvirtualkeyboard under [General] in $sddm_conf" | tee -a "$LOG"
+    fi
+  fi
+
   # Replace current background from assets
   sudo cp -r assets/sddm.png "/usr/share/sddm/themes/$theme_name/Backgrounds/default" 2>&1 | tee -a "$LOG"
   sudo sed -i 's|^wallpaper=".*"|wallpaper="Backgrounds/default"|' "/usr/share/sddm/themes/$theme_name/theme.conf" 2>&1 | tee -a "$LOG"
 
-  echo "${OK} - ${MAGENTA}Additional SDDM Theme${RESET} successfully installed." | tee -a "$LOG"
+  echo "${OK} - ${MAGENTA}Additional ${YELLOW}$theme_name SDDM Theme${RESET} successfully installed." | tee -a "$LOG"
 
 else
 
   echo "${ERROR} - Failed to clone the sddm theme repository. Please check your internet connection." | tee -a "$LOG" >&2
 fi
 
-
 printf "\n%.0s" {1..2}

install.sh

@@ -125,7 +125,7 @@ execute_script() {
 gtk_themes="OFF"
 bluetooth="OFF"
 thunar="OFF"
-ags="OFF"
+quickshell="OFF"
 sddm="OFF"
 sddm_theme="OFF"
 xdph="OFF"
@@ -259,10 +259,10 @@ fi
 
 # Add the remaining static options
 options_command+=(
-    "gtk_themes" "Install GTK themes (required for Dark/Light function)" "OFF"
+    "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"
+    "quickshell" "Install quickshell for Desktop-Like Overview?" "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"
@@ -404,9 +404,9 @@ for option in "${options[@]}"; do
             echo "${INFO} Adding user into ${SKY_BLUE}input group...${RESET}" | tee -a "$LOG"
             execute_script "InputGroup.sh"
             ;;
-        ags)
+        quickshell)
-            echo "${INFO} Installing ${SKY_BLUE}AGS v1 for Desktop Overview...${RESET}" | tee -a "$LOG"
+            echo "${INFO} Installing ${SKY_BLUE}quickshell for Desktop Overview...${RESET}" | tee -a "$LOG"
-            execute_script "ags.sh"
+            execute_script "quickshell.sh"
             ;;
         xdph)
             echo "${INFO} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland...${RESET}" | tee -a "$LOG"

preset.sh

@@ -1,48 +0,0 @@
-# 💫 https://github.com/JaKooLit 💫 #
-
-# Define the options you want to preselect (either ON or OFF)
-# IMPORTANT: answer should be inside ""
-
-### Script will install nvidia-dkms nvidia-utils & nvidia-settings
-###-Would you like script to Configure NVIDIA for you?
-nvidia="OFF"
-### Would you like to blacklist nouveau? (y/n)
-nouveau="OFF"
-
-###-Install GTK themes (required for Dark/Light function)?
-gtk_themes="ON"
-
-###-Do you want to configure Bluetooth?
-bluetooth="ON"
-
-###-Do you want to install Thunar file manager?
-thunar="ON"
-
-### Adding user to the 'input' group might be necessary for waybar keyboard-state functionality
-input_group="ON"
-
-### Desktop overview Demo Link in README
-### Desktop overview Demo Link in README
-### Install AGS (aylur's GTK shell) v1 for Desktop-Like Overview?" 
-ags="ON"
-
-###-Install & configure SDDM log-in Manager
-sddm="ON"
-### install and download SDDM themes
-sddm_theme="ON"
-
-###-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)
-xdph="ON"
-
-### Shell extension. Bash alternative
-###-Install zsh, oh-my-zsh
-zsh="ON"
-### add Pokemon color scripts to terminal 
-pokemon="ON"
-
-### This will install ASUSCTL & SUPERGFXCTL
-###-Installing on Asus ROG Laptops?
-rog="OFF"
-
-###-Download and Add pre-configured Hyprland dotfiles?
-dots="ON"

uninstall.sh

@@ -106,9 +106,10 @@ packages=(
     "pavucontrol" "pavucontrol" "off"
     "playerctl" "playerctl" "off"
     "pyprland" "pyprland" "off"
-    "qalculate-gtk" "calculater - QT" "off"
+    "qalculate-gtk" "calculator - QT" "off"
     "qt5ct" "qt5ct" "off"
     "qt6ct" "qt6ct" "off"
+    "quickshell" "quickshell" "off"
     "rofi-wayland" "rofi-wayland" "off"
     "slurp" "screenshot tool" "off"
     "swappy" "screenshot tool" "off"
@@ -134,13 +135,13 @@ packages=(
 
 # Define the list of directories to choose from (with options_command tags)
 directories=(
-    "ags" "AGS desktop overview configuration" "off"
     "btop" "btop configuration" "off"
     "cava" "cava configuration" "off"
     "fastfetch" "fastfetch configuration" "off"
     "hypr" "main hyprland configuration" "off"
     "kitty" "kitty terminal configuration" "off"
     "Kvantum" "Kvantum-manager configuration" "off"
+    "quickshell" "quickshell desktop overview configuration" "off"
     "qt5ct" "qt5ct configuration" "off"
     "qt6ct" "qt6ct configuration" "off"
     "rofi" "rofi configuration" "off"