Updates

.install/displaymanager.sh

@@ -2,6 +2,7 @@
 # Disable display manager
 # ------------------------------------------------------
 disman=0
+profile="Hyprland"
 if [ -f /etc/systemd/system/display-manager.service ]; then
 echo -e "${GREEN}"
 cat <<"EOF"
@@ -14,12 +15,11 @@ cat <<"EOF"
 
 EOF
 echo -e "${NONE}"
-    echo "An active display manager has been dedected."
+    echo "An active display manager has been detected."
     echo ""
     if [[ $profile == *"Hyprland"* ]]; then
-        echo "IMPORTANT: Starting Hyprland from tty (terminal) with command Hyprland is recommended."
+        echo "IMPORTANT: Starting Hyprland works from tty (terminal) with command Hyprland or with the display manager SDDM (> 0.20.0 already installed or the latest git version (yay -S sddm-git)."
         echo "Please check: https://wiki.hyprland.org/hyprland-wiki/pages/Getting-Started/Master-Tutorial/#launching-hyprland"
-        echo "Hyprland could work with SDDM > 0.20.0 or the latest git version (yay -S sddm-git)."
         echo "Login with other display managers could fail and could have negative side effects on some devices."
         echo ""
     fi
@@ -30,17 +30,40 @@ echo -e "${NONE}"
         echo ""
     fi
 
-    if gum confirm "Do you want to deactive the current display manager?" ;then
+    if gum confirm "Do you want to enable/update to sddm or disable the display manager?" --affirmative "Enable" --negative "Disable" ;then
+        if [ -f /etc/systemd/system/display-manager.service ]; then
+            sudo rm /etc/systemd/system/display-manager.service
+        fi
+        sudo systemctl enable sddm.service
+
+        if [ ! -d /etc/sddm.conf.d/ ]; then
+            sudo mkdir /etc/sddm.conf.d
+            echo "Folder /etc/sddm.conf.d created."
+        fi
+
+        sudo cp sddm/sddm.conf /etc/sddm.conf.d/
+        echo "File /etc/sddm.conf.d/sddm.conf updated."
+
+        if [ -f /usr/share/sddm/themes/sugar-candy/theme.conf ]; then
+            if [ -f ~/.cache/current_wallpaper.jpg ]; then
+                sudo cp ~/.cache/current_wallpaper.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
+                echo "Current wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
+            else
+                sudo cp wallpapers/default.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
+                echo "Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
+            fi
+
+            sudo cp sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
+            echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
+        fi
+    elif [ $? -eq 130 ]; then
+        exit 130
+    else
         if [ -f /etc/systemd/system/display-manager.service ]; then
             sudo rm /etc/systemd/system/display-manager.service
             echo "Current display manager removed."
         fi
         disman=1
-    elif [ $? -eq 130 ]; then
-        exit 130
-    else
-        echo "Disable display manager skipped."
-        echo "You can run ~/dotfiles/hypr/script/disablewm.sh at a later point of time if needed."
     fi
     echo ""
 else

.install/preparation.sh

@@ -33,8 +33,5 @@ if [[ $(_isFolderEmpty ~/dotfiles-versions/$version/) == 0 ]] ;then
     echo "Execution of rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ is required."
     exit
 fi
-if [ ! -f ~/dotfiles-versions/hook.sh ]; then
-    # cp .install/templates/hook.sh ~/dotfiles-versions/ 
-fi
 echo "dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
 echo ""