From 2b8161cf2db483389df7bae90c2da3e8320bc051 Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Fri, 31 Mar 2023 15:47:24 +0200
Subject: change processing order

---
 nais | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nais b/nais
index 73588d3..6aba559 100755
--- a/nais
+++ b/nais
@@ -107,6 +107,10 @@ install_arch() {
 	echo "LANG=$(echo "$LOCALE" | awk '{ print $1 }')" > /mnt/etc/locale.conf
 	echo "$HOSTNAME" > /mnt/etc/hostname
 
+	sed -i 's/# \(%wheel ALL=(ALL:ALL) NOPASSWD: ALL\)/\1/g' /mnt/etc/sudoers
+	arch-chroot /mnt useradd -m -G wheel "$USERNAME" || exit
+	echo "$USERNAME:$PASSWORD" | arch-chroot /mnt chpasswd
+
 	arch-chroot /mnt sh -c "mkdir /home/$USERNAME/system"
 	arch-chroot /mnt sh -c "cd /home/$USERNAME/system && git clone https://git.nathanreiner.xyz/elk && cd elk && ./install $KEYUUID"
 	sed -i 's/MODULES=(\(.*\))/MODULES=(\1 btrfs)/g' /mnt/etc/mkinitcpio.conf
@@ -116,10 +120,6 @@ install_arch() {
 	sed -i 's/\(HOOKS=(.*\)block/\1block encrypt/g' /mnt/etc/mkinitcpio.conf
 	arch-chroot /mnt mkinitcpio -P || exit
 
-	sed -i 's/# \(%wheel ALL=(ALL:ALL) NOPASSWD: ALL\)/\1/g' /mnt/etc/sudoers
-	arch-chroot /mnt useradd -m -G wheel "$USERNAME" || exit
-	echo "$USERNAME:$PASSWORD" | arch-chroot /mnt chpasswd
-
 	sed -i "s/\(GRUB_CMDLINE_LINUX=\".*\)\"/\1 cryptdevice=UUID=$ROOTUUID:root cryptkey=/dev/mapper/elkdev:btrfs:\/.keys\/$KEYFILE elkuuid=$KEYUUID\"/g" /mnt/etc/default/grub
 
 	if [ "$BOOT_MODE" = "bios" ]; then
-- 
cgit v1.2.3-70-g09d2