From 5c0a49c2cfc1c1d409565bfffd99b5dac1549bf7 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Tue, 17 Oct 2023 14:22:51 +0200
Subject: [PATCH] Update Installation Scripts

---
 1-install.sh          | 23 +++++++++--------------
 2-install-hyprland.sh |  4 +++-
 2-install-qtile.sh    |  4 +++-
 3-dotfiles.sh         | 12 +++++++-----
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/1-install.sh b/1-install.sh
index f71c180..3f2cd7f 100755
--- a/1-install.sh
+++ b/1-install.sh
@@ -104,7 +104,6 @@ packagesPacman=(
     "xautolock" 
     "blueman"
     "sddm"
-    "code"
     "papirus-icon-theme"
 );
 
@@ -142,19 +141,18 @@ echo "-> Install .bashrc"
 _installSymLink .bashrc ~/.bashrc ~/dotfiles/.bashrc ~/.bashrc
 
 # ------------------------------------------------------
-# Install custom issue (login prompt)
+# Install sddm display manager
 # ------------------------------------------------------
 echo ""
-echo "-> Install login screen"
+echo "-> Install sddm display manager"
 while true; do
     read -p "Do you want to install the custom login promt? (Yy/Nn): " yn
     case $yn in
         [Yy]* )
-            sudo cp ~/dotfiles/login/issue /etc/issue
-            echo "Login promt installed."
+            sudo systemctl enable sddm.service
         break;;
         [Nn]* ) 
-            echo "Custom login promt skipped."
+            echo "sddm installation skipped."
         break;;
         * ) echo "Please answer yes or no.";;
     esac
@@ -166,7 +164,7 @@ done
 echo ""
 echo "-> Install wallapers"
 while true; do
-    read -p "Do you want to clone the wallpapers? (Yy/Nn): " yn
+    read -p "Do you want to clone the wallpapers? If not, the script will install 3 default wallpapers to ~/wallpaper/ (Yy/Nn): " yn
     case $yn in
         [Yy]* )
             if [ -d ~/wallpaper/ ]; then
@@ -184,7 +182,7 @@ while true; do
                 mkdir ~/wallpaper
             fi
             cp ~/dotfiles/wallpapers/* ~/wallpaper
-            echo "Default wallpaper installed."
+            echo "Default wallpapers installed."
         break;;
         * ) echo "Please answer yes or no.";;
     esac
@@ -206,13 +204,10 @@ echo "-> Copy default wallpaper to .cache"
 cp ~/dotfiles/wallpapers/default.jpg ~/.cache/current_wallpaper.jpg
 echo "default wallpaper copied."
 
-# ------------------------------------------------------
-# Enable SDDM Service
-# ------------------------------------------------------
-sudo systemctl enable sddm.service
-
 # ------------------------------------------------------
 # DONE
 # ------------------------------------------------------
 clear
-echo "DONE!"
+echo "DONE!" 
+echo "Please continue with 2-install-hyprland.sh and/or 2-install-qtile.sh"
+
diff --git a/2-install-hyprland.sh b/2-install-hyprland.sh
index 974cc4a..585b786 100755
--- a/2-install-hyprland.sh
+++ b/2-install-hyprland.sh
@@ -70,4 +70,6 @@ _installPackagesPacman "${packagesPacman[@]}";
 _installPackagesYay "${packagesYay[@]}";
 
 echo ""
-echo "DONE! Please reboot your system!"
+echo "DONE!"
+echo "Please continue with 3-dotfiles.sh"
+
diff --git a/2-install-qtile.sh b/2-install-qtile.sh
index 8cf8070..e640bc3 100755
--- a/2-install-qtile.sh
+++ b/2-install-qtile.sh
@@ -58,4 +58,6 @@ packagesPacman=(
 # ------------------------------------------------------
 _installPackagesPacman "${packagesPacman[@]}";
 
-echo "DONE! Please reboot your system!"
+echo "DONE!" 
+echo "Please continue with 3-dotfiles.sh"
+
diff --git a/3-dotfiles.sh b/3-dotfiles.sh
index adbb513..fd23e5e 100755
--- a/3-dotfiles.sh
+++ b/3-dotfiles.sh
@@ -25,9 +25,9 @@ echo "                                    "
 echo "by Stephan Raabe (2023)"
 echo "-------------------------------------"
 echo ""
-echo "The script will ask for permission to remove existing folders and files."
-echo "But you can decide to keep your local versions by answering with No (Nn)."
-echo "Symbolic links will be created from ~/dotfiles into your home and .config directories."
+echo "The script will ask for permission to remove existing directories and files from ~/.config/"
+echo "Symbolic links will then be created from ~/dotfiles into your ~/.config/ directory."
+echo "But you can decide to keep your personal versions by answering with No (Nn)."
 echo ""
 
 # ------------------------------------------------------
@@ -78,7 +78,8 @@ _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.to
 _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
 _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
 _installSymLink wal ~/.config/wal ~/dotfiles/wal/ ~/.config
-wal -i screenshots/
+
+wal -i wallpapers/
 echo "Pywal templates initiated!"
 echo ""
 
@@ -115,4 +116,5 @@ _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 # ------------------------------------------------------
 # DONE
 # ------------------------------------------------------
-echo "DONE! Please reboot your system!"
+echo "DONE!" 
+echo "Please logout and reboot your system!"