From a96b2d18e597124be109b5136e6344fb8ac13be9 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 27 Nov 2023 21:38:46 +0100
Subject: [PATCH] add some more fixes

---
 chroot.sh  | 44 +++++++++++++++++++++++++++-----------------
 install.sh |  5 +++--
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/chroot.sh b/chroot.sh
index a8c7ebd..f54f7a2 100755
--- a/chroot.sh
+++ b/chroot.sh
@@ -9,7 +9,7 @@ hwclock --systohc
 locale-gen
 
 echo "LANG=en_GB.UTF-8" > /etc/locale.conf
-echo "KEYMAP=de_CH.latin1" > /etc/vconsole.conf
+echo "KEYMAP=de_CH-latin1" > /etc/vconsole.conf
 echo "arch-dev-vm" > /etc/hostname
 
 echo "
@@ -23,11 +23,6 @@ sleep 2
 mkinitcpio -P
 plymouth-set-default-theme -R script
 
-cd /tmp
-git clone https://aur.archlinux.org/yay.git
-cd yay
-makepkg -si
-
 grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=ARCH
 grub-mkconfig -o /boot/grub/grub.cfg
 
@@ -37,14 +32,6 @@ echo "
 
 "
 
-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
-
 echo "
 
 ==> Creating new user, please choose a password once prompted!
@@ -53,9 +40,12 @@ echo "
 
 read -p "Choose a password: " pwd
 
-useradd -m arch-is-the-best
-echo "$pwd" | passwd arch-is-the-best --stdin
-usermod -aG wheel arch-is-the-best
+useradd -m arch-is-best
+passwd arch-is-best << EOD
+${pwd}
+${pwd}
+EOD
+usermod -aG wheel arch-is-best
 
 echo "
 
@@ -76,6 +66,26 @@ echo "
 
 "
 
+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
diff --git a/install.sh b/install.sh
index 027f955..94afd93 100755
--- a/install.sh
+++ b/install.sh
@@ -95,9 +95,10 @@ echo "
 
 sleep 2
 
-cp -r ~/arch-dev-vm /mnt/root/
+mkdir /mnt/root
+cp -r ~/arch-dev-vm /mnt/root/arch-dev-vm/
 
-arch-chroot /mnt /root/chroot.sh
+arch-chroot /mnt /root/arch-dev-vm/chroot.sh
 
 # Chroot is running