diff --git a/machines/hermes/filesystems.nix b/machines/hermes/filesystems.nix index f6346e5..802db1a 100644 --- a/machines/hermes/filesystems.nix +++ b/machines/hermes/filesystems.nix @@ -6,23 +6,16 @@ ... }: let - bootUUID = "afbb025b-f483-4b79-9702-645cfca09e8b"; - efiUUID = "5E49-BE19"; - luuksUUID = "9aaac705-2737-4222-9887-51131acec90c"; - cryptrootUUID = "9d76cce0-7e9a-4828-8de2-aab9e07badae"; + bootUUID = "7d30d165-5426-4af4-91f9-2b0631da9cdd"; + efiUUID = "A735-60EE"; + luuksUUID = "679187e3-2f68-4ff8-873f-bb526e9ab544"; + cryptrootUUID = "ef0b8648-8096-49e8-8103-81c9c72a3017"; in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/9d76cce0-7e9a-4828-8de2-aab9e07badae"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; - - boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luuksUUID}"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/${bootUUID}"; @@ -38,6 +31,14 @@ in ]; }; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/${luuksUUID}"; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/${cryptrootUUID}"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + fileSystems."/home" = { device = "/dev/disk/by-uuid/${cryptrootUUID}"; fsType = "btrfs";