diff --git a/hosts/rustboro/disko.nix b/hosts/rustboro/disko.nix index f7ed3194..66b9e72f 100644 --- a/hosts/rustboro/disko.nix +++ b/hosts/rustboro/disko.nix @@ -8,44 +8,44 @@ type = "gpt"; partitions = { ESP = { - priority = 1; - name = "ESP"; - start = "1M"; - end = "1024M"; + size = "1024M"; type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; }; }; - root = { + luks = { size = "100%"; content = { - type = "btrfs"; - extraArgs = ["-f"]; # Override existing partition - # Subvolumes must set a mountpoint in order to be mounted, - # unless their parent is mounted - subvolumes = { - # Subvolume name is different from mountpoint - "rootfs" = {mountpoint = "/";}; - # For use with future impermanence setups - "persist" = { - mountpoint = "/persist"; - mountOptions = ["compress=zstd" "noatime"]; - }; - # Subvolume name is the same as the mountpoint - "home" = { - mountOptions = ["compress=zstd"]; - mountpoint = "/home"; - }; - # Parent is not mounted so the mountpoint must be set - "nix" = { - mountOptions = ["compress=zstd" "noatime"]; - mountpoint = "/nix"; + type = "luks"; + name = "crypted"; + content = { + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "persist" = { + mountpoint = "/persist"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/home" = { + mountpoint = "/home"; + mountOptions = ["compress=zstd" "noatime"]; + }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = ["compress=zstd" "noatime"]; + }; }; }; - mountpoint = "/partition-root"; }; }; };