diff --git a/nixos/machines/cherry/hardware-configuration/disko-config.nix b/nixos/machines/cherry/hardware-configuration/disko-config.nix index 9e705d0..c78f4d0 100644 --- a/nixos/machines/cherry/hardware-configuration/disko-config.nix +++ b/nixos/machines/cherry/hardware-configuration/disko-config.nix @@ -1,4 +1,3 @@ -{ config, lib, ... }: { # disko configuration @@ -9,25 +8,22 @@ type = "disk"; device = "/dev/nvme0n1"; content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "ESP"; - start = "0"; - end = "500MiB"; - bootable = true; + type = "gpt"; + partitions = { + boot = { + priority = 1; + size = "500M"; + type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; mountOptions = [ "defaults" ]; }; - } - { - name = "zfs"; - start = "500MiB"; - end = "100%"; + }; + root = { + priority = 100; + size = "100%"; content = { type = "luks"; name = "root"; @@ -38,8 +34,8 @@ pool = "zroot"; }; }; - } - ]; + }; + }; }; }; };