diff --git a/devices/steamdeck/default.nix b/devices/steamdeck/default.nix index 89fa2e4e..d5218d58 100644 --- a/devices/steamdeck/default.nix +++ b/devices/steamdeck/default.nix @@ -10,21 +10,16 @@ inputs: { mount = { - vfat."/dev/disk/by-uuid/7179-9C69" = "/boot/efi"; + vfat."/dev/disk/by-uuid/A44C-6DB4" = "/boot/efi"; btrfs = { - "/dev/disk/by-uuid/c6d35075-85fe-4129-aaa8-f436ab85ce43"."/boot" = "/boot"; + "/dev/disk/by-uuid/10c2ee85-b5bf-41ff-9901-d36d2edd8a69"."/boot" = "/boot"; "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; }; }; }; - decrypt.auto = - { - "/dev/disk/by-uuid/4f7420f9-ea19-4713-b084-2ac8f0a963ac" = { mapper = "root"; ssd = true; }; - "/dev/disk/by-uuid/88bd9d44-928b-40a2-8f3d-6dcd257c4601" = - { mapper = "swap"; ssd = true; before = [ "root" ]; }; - }; - swap = [ "/dev/mapper/swap" ]; - resume = "/dev/mapper/swap"; + decrypt.auto."/dev/disk/by-uuid/124ce605-93b4-454f-924b-fe741f39e065" = { mapper = "root"; ssd = true; }; + swap = [ "/nix/swap/swap" ]; + resume = { device = "/dev/mapper/root"; offset = 533760; }; rollingRootfs = {}; }; nixpkgs.march = "znver2"; diff --git a/modules/system/fileSystems/default.nix b/modules/system/fileSystems/default.nix index f12b21fd..4622cf0b 100644 --- a/modules/system/fileSystems/default.nix +++ b/modules/system/fileSystems/default.nix @@ -214,7 +214,7 @@ inputs: else { resumeDevice = fileSystems.resume.device; - kernelModules = [ "resume_offset=${fileSystems.resume.offset}" ]; + kernelModules = [ "resume_offset=${builtins.toString fileSystems.resume.offset}" ]; } );} )