update beta install stuff

beta/install.txt

@@ -25,97 +25,71 @@ efibootmgr -b 3 -B
 efibootmgr -b 4 -B
 efibootmgr
 
-# Defining some helper variables (these will be used in later code
+# host name to use
-# blocks as well, so make sure to use the same terminal session or
-# redefine them later)
-DISK=/dev/disk/by-id/nvme-SAMSUNG_MZVLB1T0HBLR-000L2_S4DZNX0R362286
 HOST=beta
 
-sleep 5
+# disks to use
+DISK=/dev/disk/by-id/nvme-SAMSUNG_MZVLB1T0HBLR-000L2_S4DZNX0R362286
 
+# create partition table on all disks and EFI partition
+for D in $DISK; do
     # kill old data
-sgdisk --zap-all $DISK
+    sgdisk --zap-all $D
-blkdiscard -v $DISK
+    blkdiscard -v $D
-wipefs -a $DISK
+    wipefs -a $D
-gdisk -l $DISK
-
     sleep 5
 
     # create partitions
-parted $DISK -- mklabel gpt
+    parted $D -- mklabel gpt
-sgdisk -n 1:0:+1024M -c 1:"EFI System Partition" -t 1:EF00 $DISK
+    sgdisk -n 1:0:+1024M -c 1:"EFI System Partition" -t 1:EF00 $D
-sgdisk -n 2:0:0 -c 2:"Linux" -t 2:8e00 $DISK
+    sgdisk -n 2:0:0 -c 2:"Linux" -t 2:8e00 $D
-parted $DISK -- set 1 boot on
+    parted $D -- set 1 boot on
-
     sleep 5
 
-# take a look
-cat /proc/partitions
-
     # boot partition
-mkfs.fat -F 32 -n EFIBOOT $DISK-part1
+    mkfs.fat -F 32 -n EFIBOOT $D-part1
+    sleep 5
+done
 
+# take a look at the partitions
+lsblk
+
+# create the LUKS container and open it
+cryptsetup luksFormat --sector-size 4096 --batch-mode --verify-passphrase $DISK-part2
+cryptsetup luksOpen $DISK-part2 crypt-system
 sleep 5
 
-# ZFS zpool creation with encryption
+# take a look at the partitions
-zpool create \
+lsblk
-    -o ashift=13 \
-    -o autotrim=off \
-    -O acltype=posixacl \
-    -O atime=off \
-    -O canmount=off \
-    -O compression=on \
-    -O dnodesize=auto \
-    -O utf8only=on \
-    -O normalization=formD \
-    -O xattr=sa \
-    -O mountpoint=none \
-    -O encryption=on \
-    -O keylocation=prompt \
-    -O keyformat=passphrase \
-    zpool $DISK-part2
 
+# create btrfs with volumes
+mkfs.btrfs -f --features block-group-tree --label system /dev/mapper/crypt-system
+mount -t btrfs /dev/mapper/crypt-system /mnt
+btrfs subvolume create /mnt/data
+btrfs subvolume create /mnt/nix
+btrfs subvolume create /mnt/tmp
+umount /mnt
 sleep 5
 
-# show the pool
+# take a look at the partitions
-zpool status
+lsblk
-
-sleep 5
-
-# create all the volumes
-zfs create -o mountpoint=legacy zpool/data
-zfs create -o mountpoint=legacy zpool/nix
-zfs create -o mountpoint=legacy zpool/tmp
-
-# we want 64 KB recordsize
-zfs set recordsize=64K zpool/data
-zfs set recordsize=64K zpool/nix
-zfs set recordsize=64K zpool/tmp
-
-sleep 5
-
-# show the pool
-zpool status
-
-sleep 5
 
 # prepare install, tmpfs root
 mount -t tmpfs none /mnt
 
 # Create directories to mount file systems on
-mkdir -p /mnt/{data,nix,home,boot,root,etc/nixos,tmp}
+mkdir -p /mnt/{data,nix,boot,root,etc/nixos,tmp}
 
 # mount the ESP
 mount $DISK-part1 /mnt/boot
 
 # mount volumes
-mount -t zfs zpool/data /mnt/data
+mount -o subvol=data,noatime /dev/mapper/crypt-system /mnt/data
-mount -t zfs zpool/nix /mnt/nix
+mount -o subvol=nix,noatime /dev/mapper/crypt-system /mnt/nix
-mount -t zfs zpool/tmp /mnt/tmp
+mount -o subvol=tmp,noatime /dev/mapper/crypt-system /mnt/tmp
 
 # bind mount persistent stuff to data
-mkdir -p /mnt/data/{home,root,nixos/$HOST}
+mkdir -p /mnt/data/{root,nixos/$HOST}
-mount --bind /mnt/data/home /mnt/home
 mount --bind /mnt/data/root /mnt/root
 mount --bind /mnt/data/nixos/$HOST /mnt/etc/nixos
 
@@ -133,7 +107,7 @@ nixos-generate-config --root /mnt
 
 # copy config data from another machine including secrets
 
-sudo scp -r /data/nixos root@192.168.13.102:/mnt/data
+doas scp -r /data/nixos root@192.168.13.102:/mnt/data
 
 # install
 
@@ -142,7 +116,9 @@ nixos-install --option experimental-features 'nix-command flakes' --no-root-pass
 # unmount all stuff and sync
 
 umount -Rl /data /mnt
-zpool export -a
+cryptsetup luksClose crypt-system
+mdadm --stop /dev/md/system
+sync
 
 # shutdown once