From c9ecc529f02c8ac9afccba71e3dd4983951ed7d9 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Sun, 18 Aug 2024 20:56:11 +0200 Subject: use luks with btrfs, bcachefs multi device mount is incompatible with the world --- mini/hardware-configuration.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mini/hardware-configuration.nix') diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix index 9adbd15..368766f 100644 --- a/mini/hardware-configuration.nix +++ b/mini/hardware-configuration.nix @@ -14,13 +14,17 @@ fileSystems."/boot" = { device = "/dev/disk/by-id/nvme-CT4000P3PSSD8_2325E6E63746-part1"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; neededForBoot = true; }; - # /nix encrypted bcachefs for the remaining space + # /nix encrypted btrfs for the remaining space + boot.initrd.luks.devices."crypt0".device = "/dev/disk/by-id/nvme-CT4000P3PSSD8_2325E6E63746-part2"; + boot.initrd.luks.devices."crypt1".device = "/dev/disk/by-id/ata-CT2000MX500SSD1_2138E5D5061F"; fileSystems."/nix" = - { device = "/dev/disk/by-id/nvme-CT4000P3PSSD8_2325E6E63746-part2:/dev/disk/by-id/ata-CT2000MX500SSD1_2138E5D5061F"; - fsType = "bcachefs"; + { device = "/dev/mapper/crypt0"; + fsType = "btrfs"; + options = [ "device=/dev/mapper/crypt1" ]; neededForBoot = true; }; -- cgit v1.2.3