From fef2c07614350bcc7570f6b0cc120fbc7f211cf7 Mon Sep 17 00:00:00 2001
From: FReenen <git@finnvanreenen.nl>
Date: Fri, 29 Nov 2024 15:42:27 +0100
Subject: [PATCH] add more varables

---
 elfLaptop.sh  | 24 +++++++++++++-----------
 first-boot.sh |  1 +
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/elfLaptop.sh b/elfLaptop.sh
index 8fab2e4..2d1fb5c 100644
--- a/elfLaptop.sh
+++ b/elfLaptop.sh
@@ -1,6 +1,11 @@
 
 HOSTNAME="ELFLaptop"
-DISK="/dev/sdb"
+UEFI_DISK="/dev/sdb"
+DISK="/dev/sda"
+
+UEFI_PARTITION="${UEFI_DISK}1"
+SWAP_PARTITION="${DISK}3"
+ROOT_PARTITION="${DISK}4"
 
 function run(){
     echo "[    ] $1"
@@ -41,12 +46,12 @@ echo
 echo === setup partitions
 echo
 
-run "applly partion table"        "sfdisk $DISK <./elfLaptop.sfdisk"	
-run "format boot partition"       "mkfs.fat -F 32 ${DISK}1"
-run "format swap partition"       "mkswap ${DISK}2"
+#run "applly partion table"        "sfdisk $DISK <./elfLaptop.sfdisk"	
+run "format boot partition"       "mkfs.fat -F 32 ${UEFI_PARTITION}"
+run "format swap partition"       "mkswap ${SWAP_PARTITION}"
 echo -n "$PASS" >keyfile.luks
-run "encrypt root partition"      "cryptsetup luksFormat --batch-mode --key-file keyfile.luks ${DISK}3"     "rm keyfile.luks"
-run "map root partitaion"         "cryptsetup open --batch-mode --key-file keyfile.luks ${DISK}3 cryptroot" "rm keyfile.luks"
+run "encrypt root partition"      "cryptsetup luksFormat --batch-mode --key-file keyfile.luks ${ROOT_PARITION}"      "rm keyfile.luks"
+run "map root partitaion"         "cryptsetup open --batch-mode --key-file keyfile.luks ${ROOT_PARTITION} cryptroot" "rm keyfile.luks"
 rm keyfile.luks
 run "format root partition"       "mkfs.btrfs /dev/mapper/cryptroot"
 
@@ -55,9 +60,9 @@ run "create root btrfs subvolume" "btrfs subvolume create /mnt/@"
 run "create home btrfs subvolume" "btrfs subvolume create /mnt/@home"
 run "unmount btrfs"               "umount /mnt"
 run "mount root subvolume"        "mount -o subvol=@ /dev/mapper/cryptroot /mnt"
-run "mount boot partition"        "mount --mkdir ${DISK}1 /mnt/boot"
+run "mount boot partition"        "mount --mkdir ${UEFI_PARITION} /mnt/boot"
 run "mount home subvolume"        "mount --mkdir -o subvol=@home /dev/mapper/cryptroot /mnt/home"
-run "enable swap"                 "swapon ${DISK}2"
+run "enable swap"                 "swapon ${SWAP_PARTITION}"
 
 echo
 echo === install arch
@@ -77,6 +82,3 @@ arch-chroot /mnt bash /root/in-root.sh "$HOSTNAME" "$DISK" || exit
 run "umount drives"               "umount -R /mnt"
 run "close cryptroot"             "cryptsetup close cryptroot"
 run "reboot"                      "shutdown -r now"
-
-
-
diff --git a/first-boot.sh b/first-boot.sh
index 67daec8..9940ad2 100644
--- a/first-boot.sh
+++ b/first-boot.sh
@@ -33,6 +33,7 @@ run root   "add $username to docker group" "usermod -aG docker $username"
 run root   "create home dirs"            "sudo -u $username mkdir -p /home/$username/.local/python-env"
 
 #TODO: setup bluetooth
+#TODO: update /etc/securty/faillock.conf
 
 run ubuntu "create python env"           "python3 -m venv /home/$username/.local/python-env"
 #TODO: user this python env by default