From fd2e2d216bc0a69ef0953006061019a965ad50d0 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Thu, 11 Jan 2024 18:33:21 +0100 Subject: neko bcachefs --- neko/hardware-configuration.nix | 75 ++++++++++++-------------- neko/install.txt | 114 ++++++++++++++++------------------------ 2 files changed, 79 insertions(+), 110 deletions(-) diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix index b441981..8506313 100644 --- a/neko/hardware-configuration.nix +++ b/neko/hardware-configuration.nix @@ -13,74 +13,69 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; + neededForBoot = true; options = [ "defaults" "size=8G" "mode=755" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/909C-CE7E"; + { device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP4000GM30013_7VS01VBM-part1"; fsType = "vfat"; + neededForBoot = true; }; - # system - boot.initrd.luks.devices."crypt-system".device = "/dev/disk/by-uuid/27c4619d-4e60-458e-95ad-e348a7894a14"; - - # projects - boot.initrd.luks.devices."crypt-projects".device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R846614L"; - - # vms - boot.initrd.luks.devices."crypt-vms".device = "/dev/disk/by-id/nvme-CT2000P5PSSD8_213330E4ED05"; - fileSystems."/nix" = - { device = "/dev/mapper/crypt-system"; - fsType = "btrfs"; - options = [ "subvol=nix" "noatime" "nodiratime" ]; + { device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP4000GM30013_7VS01VBM-part2"; + fsType = "bcachefs"; + neededForBoot = true; + options = [ "noatime" "nodiratime" ]; }; fileSystems."/data" = - { device = "/dev/mapper/crypt-system"; - fsType = "btrfs"; - options = [ "subvol=data" "noatime" "nodiratime" ]; + { device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP4000GM30013_7VS01VBM-part3"; + fsType = "bcachefs"; + neededForBoot = true; + options = [ "noatime" "nodiratime" ]; }; fileSystems."/home" = - { - depends = [ "/data" ]; - device = "/data/home"; + { device = "/data/home"; fsType = "none"; + neededForBoot = true; options = [ "bind" ]; + depends = [ "/data" ]; }; fileSystems."/root" = - { - depends = [ "/data" ]; - device = "/data/root"; + { device = "/data/root"; fsType = "none"; + neededForBoot = true; options = [ "bind" ]; + depends = [ "/data" ]; }; fileSystems."/etc/nixos" = - { - depends = [ "/data" ]; - device = "/data/nixos/neko"; + { device = "/data/nixos/neko"; fsType = "none"; + neededForBoot = true; options = [ "bind" ]; + depends = [ "/data" ]; }; - fileSystems."/home/cullmann/projects" = - { - depends = [ "/home" ]; - device = "/dev/mapper/crypt-projects"; - fsType = "btrfs"; - options = [ "noatime" "nodiratime" ]; - }; - - fileSystems."/home/cullmann/vms" = - { - depends = [ "/home" ]; - device = "/dev/mapper/crypt-vms"; - fsType = "btrfs"; - options = [ "noatime" "nodiratime" ]; - }; +# fileSystems."/home/cullmann/vms" = +# { device = "/dev/disk/by-id/nvme-CT2000P5PSSD8_213330E4ED05"; +# fsType = "bcachefs"; +# neededForBoot = true; +# options = [ "noatime" "nodiratime" ]; +# depends = [ "/home" ]; +# }; +# +# fileSystems."/home/cullmann/projects" = +# { device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R846614L"; +# fsType = "bcachefs"; +# neededForBoot = true; +# options = [ "noatime" "nodiratime" ]; +# depends = [ "/home" ]; +# }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/neko/install.txt b/neko/install.txt index 7de23c9..d6b0167 100644 --- a/neko/install.txt +++ b/neko/install.txt @@ -1,3 +1,23 @@ +# +# kill old efi boot stuff +# + +efibootmgr +efibootmgr -b 0 -B +efibootmgr -b 1 -B +efibootmgr -b 2 -B +efibootmgr -b 3 -B +efibootmgr -b 4 -B +efibootmgr + +# +# install script below +# + +# fix unlocking https://nixos.wiki/wiki/Bcachefs +nix-env -iA nixos.keyutils +keyctl link @u @s + # Defining some helper variables (these will be used in later code # blocks as well, so make sure to use the same terminal session or # redefine them later) @@ -19,7 +39,8 @@ gdisk -l $DISK # create partitions parted $DISK -- mklabel gpt sgdisk -n 1:0:+1024M -c 1:"EFI System Partition" -t 1:EF00 $DISK -sgdisk -n 2:0:0 -c 2:"Linux" -t 2:8e00 $DISK +sgdisk -n 2:0:+256G -c 2:"nix" -t 2:8e00 $DISK +sgdisk -n 3:0:0 -c 3:"data" -t 3:8e00 $DISK parted $DISK -- set 1 boot on sleep 5 @@ -30,33 +51,9 @@ cat /proc/partitions # boot partition mkfs.fat -F 32 -n EFIBOOT $DISK-part1 -# create the crypto containers -cryptsetup luksFormat --sector-size 4096 --batch-mode --verify-passphrase $DISK-part2 - -sleep 5 - -# open them, set right options persistently -cryptsetup luksOpen --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue --persistent $DISK-part2 crypt-system - -sleep 5 -lsblk --fs - -# create btrfs with fast & strong checksumming and fast mounting -mkfs.btrfs -f --csum xxhash --features block-group-tree /dev/mapper/crypt-system - -sleep 5 -btrfs filesystem show - -# create all the volumes -mount /dev/mapper/crypt-system /mnt -btrfs subvolume create /mnt/data -btrfs subvolume create /mnt/nix - -sleep 5 -btrfs subvolume list /mnt - -# umount again, we will only use explicit subvolumes -umount /mnt +# create encrypted bcachefs +bcachefs format --block_size=4096 --errors=ro --metadata_checksum=xxhash --data_checksum=xxhash --compression=lz4 --wide_macs --acl --encrypted --fs_label=nix --discard -f $DISK-part2 +bcachefs format --block_size=4096 --errors=ro --metadata_checksum=xxhash --data_checksum=xxhash --compression=lz4 --wide_macs --acl --encrypted --fs_label=data --discard -f $DISK-part3 # prepare install mount -t tmpfs none /mnt @@ -67,9 +64,9 @@ mkdir -p /mnt/{data,nix,home,boot,root,etc/nixos} # mount the ESP mount $DISK-part1 /mnt/boot -# mount volumes -mount -o subvol=data,noatime,nodiratime /dev/mapper/crypt-system /mnt/data -mount -o subvol=nix,noatime,nodiratime /dev/mapper/crypt-system /mnt/nix +# mount bcachefs stuff +mount -o noatime,nodiratime $DISK-part2 /mnt/nix +mount -o noatime,nodiratime $DISK-part3 /mnt/data # bind mount persistent stuff to data mkdir -p /mnt/{data/home,data/root,data/nixos/$HOST} @@ -88,9 +85,11 @@ nixos-generate-config --root /mnt cp /mnt/etc/nixos/hardware-configuration.nix /tmp cp /mnt/etc/nixos/configuration.nix /tmp -# copy data +# copy config data + +# patch some paths there -rsync --checksum -vaR --delete /data /mnt +sudo scp -r /data/nixos root@192.168.13.100:/mnt/data # install @@ -99,60 +98,35 @@ nixos-install --no-root-passwd --root /mnt # unmount all stuff umount -Rl /mnt -cryptsetup luksClose crypt-system + +# sync all /data after the install + +sudo -E rsync -va --delete --one-file-system /data root@192.168.13.100:/ # # after install tasks for extra file systems # -# create projects disk +# create vms disk -DD=/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R846614L +DD=/dev/disk/by-id/nvme-CT2000P5PSSD8_213330E4ED05 sgdisk --zap-all $DD blkdiscard -v $DD wipefs -a $DD sleep 5 -# create the crypto containers -cryptsetup luksFormat --batch-mode --verify-passphrase $DD - -sleep 5 - -# open them, set right options persistently -cryptsetup luksOpen --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue --persistent $DD crypt-projects +# create encrypted bcachefs +bcachefs format --block_size=4096 --errors=ro --metadata_checksum=xxhash --data_checksum=xxhash --compression=lz4 --wide_macs --acl --encrypted --fs_label=vms --discard -f $DD -sleep 5 -lsblk --fs - -# create btrfs with fast & strong checksumming and fast mounting -mkfs.btrfs -f --csum xxhash --features block-group-tree /dev/mapper/crypt-projects - -sleep 5 -btrfs filesystem show - -# create vms disk +# create projects disk -DD=/dev/disk/by-id/nvme-CT2000P5PSSD8_213330E4ED05 +DD=/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R846614L sgdisk --zap-all $DD blkdiscard -v $DD wipefs -a $DD sleep 5 -# create the crypto containers -cryptsetup luksFormat --batch-mode --verify-passphrase $DD - -sleep 5 - -# open them, set right options persistently -cryptsetup luksOpen --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue --persistent $DD crypt-vms - -sleep 5 -lsblk --fs - -# create btrfs with fast & strong checksumming and fast mounting -mkfs.btrfs -f --csum xxhash --features block-group-tree /dev/mapper/crypt-vms - -sleep 5 -btrfs filesystem show +# create encrypted bcachefs +bcachefs format --block_size=4096 --errors=ro --metadata_checksum=xxhash --data_checksum=xxhash --compression=lz4 --wide_macs --acl --encrypted --fs_label=projects --discard -f $DD -- cgit v1.2.3