From e433e897542e6c34226a06cb637d70ba0e399c72 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 9 Jun 2025 05:31:01 +0900 Subject: [PATCH 1/2] new sddm theme --- install-scripts/sddm_theme.sh | 57 +++++++++++++++-------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/install-scripts/sddm_theme.sh b/install-scripts/sddm_theme.sh index a67c8c5..1669d9e 100755 --- a/install-scripts/sddm_theme.sh +++ b/install-scripts/sddm_theme.sh @@ -2,8 +2,8 @@ # 💫 https://github.com/JaKooLit 💫 # # SDDM themes # -source_theme="https://codeberg.org/JaKooLit/sddm-sequoia" -theme_name="sequoia_2" +source_theme="https://github.com/JaKooLit/simple-sddm-2.git" +theme_name="simple_sddm_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 )" @@ -54,50 +54,41 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then # setting up SDDM theme - sddm_conf_dir="/etc/sddm.conf.d" + sddm_conf="/etc/sddm.conf" BACKUP_SUFFIX=".bak" - + echo -e "${NOTE} Setting up the login screen." | tee -a "$LOG" - if [ -d "$sddm_conf_dir" ]; then - echo "Backing up files in $sddm_conf_dir" | tee -a "$LOG" - for file in "$sddm_conf_dir"/*; do - if [ -f "$file" ]; then - if [[ "$file" == *$BACKUP_SUFFIX ]]; then - echo "Skipping backup file: $file" | tee -a "$LOG" - continue - fi - # Backup each original file - sudo cp "$file" "$file$BACKUP_SUFFIX" 2>&1 | tee -a "$LOG" - echo "Backup created for $file" | tee -a "$LOG" - - # Edit existing "Current=" - if grep -q '^[[:space:]]*Current=' "$file"; then - sudo sed -i "s/^[[:space:]]*Current=.*/Current=$theme_name/" "$file" 2>&1 | tee -a "$LOG" - echo "Updated theme in $file" | tee -a "$LOG" - fi - fi - done + # Backup the sddm.conf file if it exists + if [ -f "$sddm_conf" ]; then + echo "Backing up $sddm_conf" | tee -a "$LOG" + sudo cp "$sddm_conf" "$sddm_conf$BACKUP_SUFFIX" 2>&1 | tee -a "$LOG" else - echo "$CAT - $sddm_conf_dir not found, creating..." | tee -a "$LOG" - sudo mkdir -p "$sddm_conf_dir" 2>&1 | tee -a "$LOG" + echo "$sddm_conf does not exist, creating a new one." | tee -a "$LOG" + sudo touch "$sddm_conf" 2>&1 | tee -a "$LOG" fi - if [ ! -f "$sddm_conf_dir/theme.conf.user" ]; then - echo -e "[Theme]\nCurrent = $theme_name" | sudo tee "$sddm_conf_dir/theme.conf.user" > /dev/null + # Check if the [Theme] section exists + if grep -q '^\[Theme\]' "$sddm_conf"; then + # Update the Current= line under [Theme] + sudo sed -i "/^\[Theme\]/,/^\[/{s/^\s*Current=.*/Current=$theme_name/}" "$sddm_conf" 2>&1 | tee -a "$LOG" - if [ -f "$sddm_conf_dir/theme.conf.user" ]; then - echo "Created and configured $sddm_conf_dir/theme.conf.user with theme $theme_name" | tee -a "$LOG" + # If no Current= line was found and replaced, append it after the [Theme] section + if ! grep -q '^\s*Current=' "$sddm_conf"; then + sudo sed -i "/^\[Theme\]/a Current=$theme_name" "$sddm_conf" 2>&1 | tee -a "$LOG" + echo "Appended Current=$theme_name under [Theme] in $sddm_conf" | tee -a "$LOG" else - echo "Failed to create $sddm_conf_dir/theme.conf.user" | tee -a "$LOG" + echo "Updated Current=$theme_name in $sddm_conf" | tee -a "$LOG" fi else - echo "$sddm_conf_dir/theme.conf.user already exists, skipping creation." | tee -a "$LOG" + # Append the [Theme] section at the end if it doesn't exist + echo -e "\n[Theme]\nCurrent=$theme_name" | sudo tee -a "$sddm_conf" > /dev/null + echo "Added [Theme] section with Current=$theme_name in $sddm_conf" | tee -a "$LOG" 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" + 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" From 2afc7293d5df984bc77a9bd0c276cde462899e39 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 9 Jun 2025 08:31:03 +0900 Subject: [PATCH 2/2] updated for new SDDM theme --- CHANGELOGS.md | 3 +++ README.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 8afa7ac..edbd839 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## CHANGELOGS +## 08 June 2025 +- updated SDDM theme. + ## 20 March 2025 - adjusted hyprland installation script. This is great for those who are using -git packages - added findutils as dependencies diff --git a/README.md b/README.md index 1fce12a..4f0e838 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872 #### 💫 SDDM and GTK Themes offered -- If you opted to install SDDM theme, here's the [`LINK`](https://codeberg.org/JaKooLit/sddm-sequoia) which is a fork of [`LINK`](https://codeberg.org/minMelody/sddm-sequoia) +- If you opted to install SDDM theme, here's the [`LINK`](https://github.com/JaKooLit/simple-sddm-2) which is a modified fork of [`LINK`](https://github.com/Keyitdev/sddm-astronaut-theme) - If you opted to install GTK Themes, Icons, here's the [`LINK`](https://github.com/JaKooLit/GTK-themes-icons). This also includes Bibata Modern Ice cursor. #### 👀 NVidia GPU Owners.