From 02be84b69bed5509a28f82698933e27d92a4dccb Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 27 Nov 2023 21:50:40 +0100
Subject: [PATCH] split out userland stuff

---
 chroot.sh   | 52 +++++-----------------------------------------------
 userland.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 47 deletions(-)
 create mode 100755 userland.sh

diff --git a/chroot.sh b/chroot.sh
index 89419de..aa43ac8 100755
--- a/chroot.sh
+++ b/chroot.sh
@@ -47,6 +47,9 @@ ${pwd}
 EOD
 usermod -aG wheel arch-is-best
 
+rm -rf /home/arch-is-best/arch-dev-vm
+mv /root/arch-dev-vm/* /home/arch-is-best/arch-dev-vm
+
 echo "
 
 ==> New user created! Please enter the password for the new user to switch to it
@@ -54,56 +57,11 @@ to finish up setup
 
 "
 
-chmod 777 /home/arch-is-best/vscode-extensions
+chmod 777 /home/arch-is-best/arch-dev-vm/vscode-extensions
 
-su arch-is-best
+su arch-is-best -c /home/arch-is-best/arch-dev-vm/userland.sh
 
 
-echo "
-
-==> Setup complete, adding config files to new user plus some other config
-
-"
-
-cd /tmp
-git clone https://aur.archlinux.org/yay.git
-cd yay
-makepkg -si
-
-echo "
-
-==> AUR helper installed
-
-"
-
-read -p "Do you want to have a barebone (b) or complete (c) install? " installType
-
-if [[ "$installType" != "c" ]]; then
-    yay -Syu --noconfirm nodejs npm rustup kate python-pip gcc
-fi
-
-yay -Syu --noconfirm vscodium
-
-
-mkdir /home/arch-is-best/.config
-
-mv /home/arch-is-best/arch-dev-vm/config/* /home/arch-is-best/.config
-
-file="/home/arch-is-best/vscode-extensions"
-while read line; do
-    vscodium --install-extension "${line}"
-done < "${file}"
-
-echo "
-
-==> We now need to change the shell to a more user-friendly one.
-Please enter your password again
-
-"
-
-chsh -s /bin/fish
-
-exit
 
 echo "
 
diff --git a/userland.sh b/userland.sh
new file mode 100755
index 0000000..69975e9
--- /dev/null
+++ b/userland.sh
@@ -0,0 +1,47 @@
+# This runs in userland
+
+echo "
+
+==> Setup complete, adding config files to new user plus some other config
+
+"
+
+cd /tmp
+git clone https://aur.archlinux.org/yay.git
+cd yay
+makepkg -si
+
+echo "
+
+==> AUR helper installed
+
+"
+
+read -p "Do you want to have a barebone (b) or complete (c) install? " installType
+
+if [[ "$installType" != "c" ]]; then
+    yay -Syu --noconfirm nodejs npm rustup kate python-pip gcc
+fi
+
+yay -Syu --noconfirm vscodium
+
+
+mkdir /home/arch-is-best/.config
+
+mv /home/arch-is-best/arch-dev-vm/config/* /home/arch-is-best/.config
+
+file="/home/arch-is-best/vscode-extensions"
+while read line; do
+    vscodium --install-extension "${line}"
+done < "${file}"
+
+echo "
+
+==> We now need to change the shell to a more user-friendly one.
+Please enter your password again
+
+"
+
+chsh -s /bin/fish
+
+exit
\ No newline at end of file