From aa393a453bd9a96ac6c9fc0762cf4072d6012aae Mon Sep 17 00:00:00 2001
From: LailaTheElf <mail@lailatheelf.nl>
Date: Thu, 27 Nov 2025 21:53:29 +0100
Subject: [PATCH] use pated to dinamicly create partitions

---
 configs/elfDesktop.sfdisk     | 11 ---------
 configs/elfLaptop.sfdisk      | 11 ---------
 configs/install_elfDesktop.sh |  2 +-
 elfDesktop.sh                 |  1 -
 elfLaptop.sh                  |  3 +--
 elf_os.sh                     | 44 +++++++++++++++++++++++------------
 6 files changed, 31 insertions(+), 41 deletions(-)
 delete mode 100644 configs/elfDesktop.sfdisk
 delete mode 100644 configs/elfLaptop.sfdisk

diff --git a/configs/elfDesktop.sfdisk b/configs/elfDesktop.sfdisk
deleted file mode 100644
index a66a0fe..0000000
--- a/configs/elfDesktop.sfdisk
+++ /dev/null
@@ -1,11 +0,0 @@
-label: gpt
-label-id: 181CDCBC-511C-4F07-B00D-AB210C4BCCBC
-device: /dev/nvme0n1
-unit: sectors
-first-lba: 2048
-last-lba: 1953525134
-sector-size: 512
-
-/dev/nvme0n1p1 : start=        2048, size=     1048576, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=1765C25B-7606-4F9C-8174-04EFEFD3FCE2, name="boot"
-/dev/nvme0n1p2 : start=     1050624, size=     8388608, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, uuid=C0DA7E9C-D507-4E9A-96AE-E7AF26DBCE9F
-/dev/nvme0n1p3 : start=     9439232, size=  1572864000, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=219EFC65-B9ED-4E10-BF4B-01CD6A7CC8C7, name="elfdrive"
diff --git a/configs/elfLaptop.sfdisk b/configs/elfLaptop.sfdisk
deleted file mode 100644
index bc12b14..0000000
--- a/configs/elfLaptop.sfdisk
+++ /dev/null
@@ -1,11 +0,0 @@
-label: gpt
-label-id: F961223E-AB17-44CA-8DC3-082C1476070D
-device: /dev/sdb
-unit: sectors
-first-lba: 34
-last-lba: 250069646
-sector-size: 512
-
-/dev/sdb1 : start=        2048, size=     2097152, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=486DA8A9-47F3-469D-9458-F29776D786A3, name="boot"
-/dev/sdb2 : start=     2099200, size=    16777216, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F, uuid=DCA4D33F-2283-48EE-98BF-739D527ABBBB
-/dev/sdb3 : start=    18876416, size=   231192576, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=ACF561E3-BE4F-479A-A9EF-2C82B324E35E, name="elfdrive"
diff --git a/configs/install_elfDesktop.sh b/configs/install_elfDesktop.sh
index 21a9041..720257a 100755
--- a/configs/install_elfDesktop.sh
+++ b/configs/install_elfDesktop.sh
@@ -3,7 +3,7 @@
 . /first-boot.env
 . $CONFIG_DIR/elfos.sh
 
-run root        "install amd-ucode"          "pacman -S --noconfirm amd-ucode"
+run root        "install amd-ucode"           "pacman -S --noconfirm amd-ucode"
 run root        "install Jellifin-server"     "pacman -S --noconfirm jellifin-server jellifin-web"
 run root        "add media disk to fstab"     "cat >>/etc/fstab <<EOF
 
diff --git a/elfDesktop.sh b/elfDesktop.sh
index aa48d17..34234ab 100644
--- a/elfDesktop.sh
+++ b/elfDesktop.sh
@@ -6,7 +6,6 @@ DISK="/dev/nvme0n1"
 USERNAME="laila"
 
 ENCRYPT_DISK="false"
-SFDISK_FILE="./configs/elfDesktop.sfdisk"
 UEFI_PARTITION="${UEFI_DISK}p1"
 SWAP_PARTITION="${DISK}p2"
 ROOT_PARTITION="${DISK}p3"
diff --git a/elfLaptop.sh b/elfLaptop.sh
index bac74a7..4db430f 100644
--- a/elfLaptop.sh
+++ b/elfLaptop.sh
@@ -6,8 +6,7 @@ DISK="/dev/sda"
 USERNAME="laila"
 
 ENCRYPT_DISK="true"
-SFDISK_FILE="./configs/elfLaptop.sfdisk"
 UEFI_PARTITION="${UEFI_DISK}1"
 SWAP_PARTITION="${DISK}2"
 ROOT_PARTITION="${DISK}3"
-INSTALL_PARTS="flatpaks,vscodium,other"
+INSTALL_PARTS="flatpaks,vscodium,other,rclone"
diff --git a/elf_os.sh b/elf_os.sh
index 49d2332..5c19323 100755
--- a/elf_os.sh
+++ b/elf_os.sh
@@ -84,21 +84,42 @@ function choose_disk() {
     fi
 
     DISK="$disk"
+}
+
+function format_disk() {
+    echo
+    echo === format disk "$DISK"
+    echo
+
+    local answer=""
+    while [[ "$answer" != "yes" ]]
+    do
+        echo "Disk to wipe clean:"
+        echo
+        parted "$DISK" print
+        echo
+        echo -n "are you sure you want to wipe the above disk (yes/no)? "
+        read answer
+        
+        if [[ "$answer" = "no" ]]
+        then
+            echo "abort"
+            exit 0
+        fi
+    done
+
+    run "create partition table"      "parted --script --fix "$DISK" mktable gpt"
+    run "create boot partition"       "parted --script --fix "$DISK" mkpart primary 2048s 512MB"
+    run "create root partition"       "parted --script --fix "$DISK" mkpart primary 512MB 100%"
 
     if [[ -b "${disk}1" ]]
     then
         UEFI_PARTITION="${disk}1"
+        ROOT_PARTITION="${disk}2"
     elif [[ -b "${disk}p1" ]]
     then
         UEFI_PARTITION="${disk}p1"
-    fi
-
-    if [[ -b "${disk}1" ]]
-    then
-        ROOT_PARTITION="${disk}1"
-    elif [[ -b "${disk}p1" ]]
-    then
-        ROOT_PARTITION="${disk}p1"
+        ROOT_PARTITION="${disk}p2"
     fi
 
     if [[ $ENCRYPT_DISK = "true" ]]
@@ -107,14 +128,7 @@ function choose_disk() {
     else
         ROOT_PARTITION_MAP="${ROOT_PARTITION}"
     fi
-}
 
-function format_disk() {
-    echo
-    echo === format disk
-    echo
-
-    run "applly partion table"        "sfdisk $DISK <$SFDISK_FILE"	
     run "format boot partition"       "mkfs.fat -F 32 ${UEFI_PARTITION}"
     if [[ $ENCRYPT_DISK = "true" ]]; then
     echo -n "$PASS" >keyfile.luks