diff --git a/modules/disks/sys/singledisk-deck.nix b/modules/disks/sys/singledisk-deck.nix index 97a6a9f..c7f4e00 100644 --- a/modules/disks/sys/singledisk-deck.nix +++ b/modules/disks/sys/singledisk-deck.nix @@ -2,38 +2,17 @@ flake.nixosModules.disks-sys-singledisk-deck = { inputs, ... }: { imports = [ inputs.disko.nixosModules.disko ]; - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "fmask=0077" "dmask=0077" ]; - extraArgs = [ "-n" "boot" ]; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "xfs"; - mountpoint = "/"; - extraArgs = [ "-L" "root" ]; - }; - }; - }; - }; - }; - }; + disko.enableConfig = false; + + fileSystems."/" = { + device = "/dev/disk/by-label/root"; + fsType = "xfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-label/boot"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = [{