From 5b6e05ebf61817b0b8eeeef19add27f25ebd2b13 Mon Sep 17 00:00:00 2001 From: Lander Van den Bulcke Date: Tue, 4 Nov 2025 10:18:49 +0100 Subject: [PATCH] fix: disko config Signed-off-by: Lander Van den Bulcke --- hosts/hyp-01/modules/disko.nix | 70 ++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/hosts/hyp-01/modules/disko.nix b/hosts/hyp-01/modules/disko.nix index 3962c3a..525e047 100644 --- a/hosts/hyp-01/modules/disko.nix +++ b/hosts/hyp-01/modules/disko.nix @@ -9,60 +9,82 @@ in type = "disk"; device = disk1; content = { - type = "table"; - format = "mbr"; - partitions = [ - { - name = "boot-primary"; - size = "1G"; - bootable = true; + type = "gpt"; + efiGptPartitionFirst = false; + partitions = { + boot = { + priority = 1; type = "EF02"; + size = "32M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = null; + }; + hybrid = { + mbrPartitionType = "0x0c"; + mbrBootableFlag = false; + }; + }; + esp = { + size = "1G"; + type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; mountOptions = [ "nofail" ]; }; - } - { - name = "zfs-a"; + }; + zfs = { size = "100%"; content = { type = "zfs"; pool = "zroot"; }; - } - ]; + }; + }; }; }; disk2 = { type = "disk"; device = disk2; content = { - type = "table"; - format = "mbr"; - partitions = [ - { - name = "boot-secondary"; - size = "1G"; - bootable = true; + type = "gpt"; + efiGptPartitionFirst = false; + partitions = { + boot = { + priority = 1; type = "EF02"; + size = "32M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = null; + }; + hybrid = { + mbrPartitionType = "0x0c"; + mbrBootableFlag = false; + }; + }; + esp = { + size = "1G"; + type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot-fallback"; mountOptions = [ "nofail" ]; }; - } - { - name = "zfs-b"; + }; + zfs = { size = "100%"; content = { type = "zfs"; pool = "zroot"; }; - } - ]; + }; + }; }; }; };