diff --git a/hosts/sin/luks-btrfs-raid.nix b/hosts/sin/luks-btrfs-raid.nix index 4addbba..29047b6 100644 --- a/hosts/sin/luks-btrfs-raid.nix +++ b/hosts/sin/luks-btrfs-raid.nix @@ -50,50 +50,7 @@ }; }; - # data1 = { - # type = "disk"; - # device = "/dev/sda"; - # content = { - # type = "gpt"; - # partitions = { - # crypt_p1 = { - # size = "100%"; - # content = { - # type = "luks"; - # name = "p_data1"; # device-mapper name when decrypted - # # Remove settings.keyFile if you want to use interactive password entry - # settings = { - # allowDiscards = true; - # keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00"; - # keyFileSize = 4096; - # }; - # }; - # }; - # }; - # }; - # }; data = { - type = "disk"; - device = "/dev/sdc"; - content = { - type = "gpt"; - partitions = { - crypt_p = { - size = "100%"; - content = { - type = "luks"; - name = "p_data"; - settings = { - allowDiscards = true; - keyFile = "/dev/disk/by-uuid/2021-07-11-12-33-27-00"; - keyFileSize = 4096; - }; - }; - }; - }; - }; - }; - data1 = { type = "disk"; device = "/dev/sdb"; content = { @@ -103,7 +60,7 @@ size = "100%"; content = { type = "luks"; - name = "p_data1"; + name = "p_data"; # Remove settings.keyFile if you want to use interactive password entry settings = { allowDiscards = true; @@ -112,10 +69,6 @@ }; content = { type = "btrfs"; - extraArgs = [ - "-d raid0" - "/dev/mapper/p_data3" # Use decrypted mapped device, same name as defined in disk1 - ]; subvolumes = { "/" = { mountpoint = "/mnt/fs";