From e188716eaf5da5594d60d55cf0c738ac92a4f6e0 Mon Sep 17 00:00:00 2001
From: Chris Titus <dfm.titus@gmail.com>
Date: Fri, 22 Oct 2021 19:09:56 -0500
Subject: [PATCH] Update 1-setup.sh

---
 1-setup.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/1-setup.sh b/1-setup.sh
index 16a9949..4bf07e0 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -12,13 +12,6 @@ echo "--          Network Setup           --"
 echo "--------------------------------------"
 pacman -S networkmanager dhclient --noconfirm --needed
 systemctl enable --now NetworkManager
-if ! source install.conf; then
-	read -p "Please enter username:" username
-    read -p "Please enter password:" password
-echo "username=$username" >> ${HOME}/ArchTitus/install.conf
-echo "password=$password" >> ${HOME}/ArchTitus/install.conf
-fi
-passwd --password $password root
 echo "-------------------------------------------------"
 echo "Setting up mirrors for optimal download          "
 echo "-------------------------------------------------"
@@ -190,7 +183,6 @@ PKGS=(
 'plasma-systemmonitor'
 'plasma-thunderbolt'
 'plasma-vault'
-'plasma-wayland-session'
 'plasma-workspace'
 'plasma-workspace-wallpapers'
 'polkit-kde-agent'
@@ -273,11 +265,15 @@ elif lspci | grep -E "Integrated Graphics Controller"; then
 fi
 
 echo -e "\nDone!\n"
-
+if ! source install.conf; then
+	read -p "Please enter username:" username
+echo "username=$username" >> ${HOME}/ArchTitus/install.conf
+fi
 if [ $(whoami) = "root"  ];
 then
     [ ! -d "/home/$username" ] && useradd -m -p $password -G wheel,libvirt -s /bin/bash $username 
-    cp -R /root/ArchTitus /home/$username/
+	passwd $username
+	cp -R /root/ArchTitus /home/$username/
     chown -R $username: /home/$username/ArchTitus
 else
 	echo "You are already a user proceed with aur installs"