diff --git a/nixos/hosts/warsaw-ovh-01/disks.nix b/nixos/hosts/warsaw-ovh-01/disks.nix index 55726072..b3a2b3e6 100644 --- a/nixos/hosts/warsaw-ovh-01/disks.nix +++ b/nixos/hosts/warsaw-ovh-01/disks.nix @@ -1,91 +1,56 @@ +{ lib, ... }: { - # https://github.com/nix-community/disko/blob/master/example/boot-raid1.nix - disko.devices = { - disk = { - sda = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - boot = { - size = "1M"; - type = "EF02"; # GRUB MBR - }; - ESP = { - size = "500M"; - type = "EF00"; - content = { - type = "mdraid"; - name = "boot"; - }; - }; - mdadm = { - size = "100%"; - content = { - type = "mdraid"; - name = "raid1"; - }; - }; + disko.devices.disk = lib.genAttrs [ "a" "b" ] (name: { + type = "disk"; + device = "/dev/sd${name}"; + content = { + type = "gpt"; + partitions = { + boot = { + size = "1M"; + type = "EF02"; # for grub MBR + }; + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "mdraid"; + name = "boot"; }; }; - }; - - sdb = { - type = "disk"; - device = "/dev/sdb"; - content = { - type = "gpt"; - partitions = { - boot = { - size = "1M"; - type = "EF02"; # GRUB MBR - }; - ESP = { - size = "500M"; - type = "EF00"; - content = { - type = "mdraid"; - name = "boot"; - }; - }; - mdadm = { - size = "100%"; - content = { - type = "mdraid"; - name = "raid1"; - }; - }; + mdadm = { + size = "100%"; + content = { + type = "mdraid"; + name = "raid1"; }; }; }; }; - - mdadm = { - boot = { - type = "mdadm"; - level = 1; - metadata = "1.0"; + }); + disko.devices.mdadm = { + boot = { + type = "mdadm"; + level = 1; + metadata = "1.0"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + raid1 = { + type = "mdadm"; + level = 1; + content = { + type = "luks"; + name = "crypted"; content = { type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - raid1 = { - type = "mdadm"; - level = 1; - content = { - type = "luks"; - name = "ROOT"; - extraOpenArgs = [ "--allow-discards" ]; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; + format = "ext4"; + mountpoint = "/"; }; }; }; - }; + }; }