From 4dbc4785c35a535c13ee62de4efcc500ad102e60 Mon Sep 17 00:00:00 2001
From: "quentin@aristote.fr" <quentin@aristote.fr>
Date: Sat, 3 Oct 2026 12:01:25 +0200
Subject: fix init scripts

---
 flake.nix | 79 +++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 35355b7..e1daffd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,52 +79,61 @@
                 (pkgs.writeShellApplication {
                   name = "format-disk";
                   text = ''
-                    DISK=/dev/"$1"
-                    # create crypt
-                    cryptsetup luksFormat "$DISK"2
-                    cryptsetup luksOpen "$DISK"2 crypt
-                    until [ -e /dev/nixos ]
-                    do
-                      sleep 1
-                    done
-                    # split into logical volumes
-                    pvcreate /dev/mapper/crypt
-                    vgcreate nixos /dev/mapper/crypt
-                    echo '==================================================================='
-                    echo '==================================================================='
-                    echo '  lsmem'
-                    echo '==================================================================='
-                    lsmem
-                    echo '==================================================================='
-                    echo 'Input swapsize:'
-                    read -r SWAPSIZE
-                    lvcreate -L "$SWAPSIZE" --name swap nixos
-                    lvcreate -l 100%FREE --name root nixos
-                    # mount
-                    mkswap /dev/nixos/swap
-                    mkfs.ext4 /dev/nixos/root
-                    mount /dev/nixos/root /mnt
-                    # create luks keys
-                    mkdir --parents /mnt/etc/luks/keys && pushd "$_"
-                    dd bs=1k count=4 if=/dev/random of=master
-                    dd bs=1k count=4 if=/dev/random of=tmp
-                    chmod 400 master tmp
-                    cryptsetup luksAddKey "$DISK"2
-                    popd
+                                        DISK="$1"
+                                        BOOT="$DISK$2"
+                                        CRYPT="$DISK$3"
+                                        # create crypt
+                                        cryptsetup luksFormat "$CRYPT"
+                                        cryptsetup luksOpen "$CRYPT" crypt
+                                        until [ -e /dev/mapper/crypt ]
+                                        do
+                                          sleep 1
+                                        done
+                                        # split into logical volumes
+                                        pvcreate /dev/mapper/crypt
+                                        vgcreate nixos /dev/mapper/crypt
+                                        echo '==================================================================='
+                                        echo '==================================================================='
+                                        echo '  lsmem'
+                                        echo '==================================================================='
+                                        lsmem
+                                        echo '==================================================================='
+                                        echo 'Input swapsize:'
+                                        read -r SWAPSIZE
+                                        lvcreate -L "$SWAPSIZE" --name swap nixos
+                                        lvcreate -l 100%FREE --name root nixos
+                                        # create file systems
+                                        mkswap /dev/nixos/swap
+                                        mkfs.ext4 /dev/nixos/root
+                                        mkfs.fat -F 32 -n boot "$BOOT"
+                                        # mount
+                                        mount /dev/nixos/root /mnt
+                    		    mkdir /mnt/boot
+                                        mount "$BOOT" /mnt/boot
+                                        swapon /dev/nixos/swap
+                                        # create luks keys
+                                        mkdir --parents /mnt/etc/luks/keys && pushd "$_"
+                                        dd bs=1k count=4 if=/dev/random of=master
+                                        dd bs=1k count=4 if=/dev/random of=tmp
+                                        chmod 400 master tmp
+                                        cryptsetup luksAddKey "$CRYPT" master
+                                        popd
                   '';
                 })
                 (pkgs.writeShellApplication {
                   name = "mount-system";
                   text = ''
-                    DISK=/dev/"$1"
-                    cryptsetup open "$DISK"2 crypt
+                    DISK="$1"
+                    BOOT="$DISK$2"
+                    CRYPT="$DISK$3"
+                    cryptsetup open "$CRYPT" crypt
                     until [ -e /dev/nixos ]
                     do
                       sleep 1
                     done
                     mount /dev/nixos/root /mnt
+                    mount "$BOOT" /mnt/boot
                     swapon /dev/nixos/swap
-                    mount "$DISK"1 /mnt/boot
                   '';
                 })
                 (pkgs.writeShellApplication {
-- 
cgit v1.3.1