From 7a0260da910e983f7a9ddf9b1de100e5f84af6df Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Tue, 22 Jul 2025 13:07:18 +0900
Subject: [PATCH] Preparation for the new SDDM theme simple sddm updated
 version

---
 CHANGELOGS.md                 |  4 ++++
 install-scripts/sddm.sh       | 10 +++++++---
 install-scripts/sddm_theme.sh | 20 +++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 407e3ca..fa41030 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,9 @@
 ## CHANGELOGS
 
+## 22 July 2025
+- Updated sddm theme and script to work with the updated simple_sddm_2 theme
+- Manual building process
+
 ## 21 June 2025
 - Added a warning message that support is now very limited
 
diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh
index ab4d99d..b2be906 100755
--- a/install-scripts/sddm.sh
+++ b/install-scripts/sddm.sh
@@ -8,10 +8,13 @@ sddm1=(
 )
 
 sddm2=(
-  qt6-5compat-dev
-  qml6-module-qt5compat-graphicaleffects
+  libqt6svg6
   qt6-declarative-dev
   qt6-svg-dev
+  qt6-virtualkeyboard-plugin
+  libqt6multimedia6
+  qml6-module-qtquick-controls
+  qml6-module-qtquick-effects
 )
 
 # login managers to attempt to disable
@@ -48,7 +51,7 @@ done
 
 # Installation of additional sddm stuff
 for PKG2 in "${sddm2[@]}"; do
-  re_install_package "$PKG2"  "$LOG"
+  install_package "$PKG2"  "$LOG"
 done
 
 # Check if other login managers are installed and disable their service before enabling SDDM
@@ -77,5 +80,6 @@ sudo systemctl enable sddm.service 2>&1 | tee -a "$LOG"
 
 wayland_sessions_dir=/usr/share/wayland-sessions
 [ ! -d "$wayland_sessions_dir" ] && { printf "$CAT - $wayland_sessions_dir not found, creating...\n"; sudo mkdir -p "$wayland_sessions_dir" 2>&1 | tee -a "$LOG"; }
+sudo cp assets/hyprland.desktop "$wayland_sessions_dir/" 2>&1 | tee -a "$LOG"
 
 printf "\n%.0s" {1..2}
\ No newline at end of file
diff --git a/install-scripts/sddm_theme.sh b/install-scripts/sddm_theme.sh
index 4f85513..b2838d5 100755
--- a/install-scripts/sddm_theme.sh
+++ b/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,10 +85,25 @@ 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"
-
+  
   printf "\n%.0s" {1..1}
   printf "${NOTE} copying ${YELLOW}JetBrains Mono Nerd Font${RESET} to ${YELLOW}/usr/local/share/fonts${RESET} .......\n"
   printf "${NOTE} necessary for the new SDDM theme to work properly........\n"
@@ -107,7 +121,7 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then
   fc-cache -v -f 2>&1 | tee -a "$LOG"
 
   printf "\n%.0s" {1..1}
-  
+
   echo "${OK} - ${MAGENTA}Additional SDDM Theme${RESET} successfully installed." | tee -a "$LOG"
 
 else