diff --git a/README.md b/README.md index c0255d9..d116e72 100644 --- a/README.md +++ b/README.md @@ -44,5 +44,6 @@ to achieve this i still need to create a proper live iso with my config and my b Sorted rougly by priority - migrate the rest of my machines -- private nix cache (unneeded with cachix?) - hercules-ci effects for deploying machines on update (if configuration is valid) +- go back to hercules or just migrate off of gha in some way +- fix disko diff --git a/hosts/kazuki/disks.nix b/hosts/kazuki/disks.nix index fb5a1e6..46dd14d 100644 --- a/hosts/kazuki/disks.nix +++ b/hosts/kazuki/disks.nix @@ -7,23 +7,23 @@ in type = "disk"; device = bootDevice; content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "EFI"; + type = "gpt"; + partitions = { + esp = { + label = "EFI"; + priority = 1; start = "1MiB"; end = "128MiB"; - fs-type = "fat32"; - bootable = true; + type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; }; - } - { - name = "LINUX"; + }; + linux = { + label = "LINUX"; + priority = 2; start = "128MiB"; end = "-4G"; content = { @@ -47,17 +47,16 @@ in }; }; }; - } - { - name = "SWAP"; - start = "-4G"; - end = "100%"; + }; + swap = { + label = "SWAP"; + size = "100%"; content = { type = "swap"; randomEncryption = true; }; - } - ]; + }; + }; }; }; }