From 4c3fdff8a29bda3d4b4eb1c17a6ee836d9290604 Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Thu, 20 Mar 2025 23:33:28 +0000
Subject: [PATCH] Updated order of encryption

---
 install.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/install.sh b/install.sh
index 9633e92..b939f59 100644
--- a/install.sh
+++ b/install.sh
@@ -11,31 +11,30 @@ parted $DISK -- set 1 boot on
 # Create the root partition
 parted $DISK -- mkpart primary ext4 513MiB 100%
 
-# Format the partitions
+# Format the boot partition
 mkfs.fat -F32 ${DISK}1
-mkfs.ext4 ${DISK}2
+
+# DO NOT FORMAT the root partition before encryption!
+# cryptsetup will fail if the partition is already formatted
+
+# Encrypt the root partition
+cryptsetup luksFormat ${DISK}2
+cryptsetup open ${DISK}2 root
+
+# Now format the encrypted partition
+mkfs.ext4 /dev/mapper/root
 
 # Mount the partitions
-mount ${DISK}2 /mnt
-
-cryptsetup luksFormat /dev/sda2
-cryptsetup open /dev/sda2 root
-mkfs.ext4 /dev/mapper/root
 mount /dev/mapper/root /mnt
 
 mkdir -p /mnt/boot
 mount ${DISK}1 /mnt/boot
 
-cryptsetup luksFormat /dev/sda2
-cryptsetup open /dev/sda2 root
-mkfs.ext4 /dev/mapper/root
-mount /dev/mapper/root /mnt
-
-mkdir -p /mnt/etc/nixos
 # Clone the configuration repository
+mkdir -p /mnt/etc/nixos
 git clone https://git.luke-else.co.uk/luke-else/nixos-config.git /mnt/etc/nixos
 
-# Install NixOS
+# Generate NixOS configuration (optional if using flakes)
 nixos-generate-config --root /mnt
 
 # Install NixOS using the cloned configuration