diff --git a/nodes/hosts/lappy/disk-config.nix b/nodes/hosts/lappy/disk-config.nix index f083241..4dc3b08 100644 --- a/nodes/hosts/lappy/disk-config.nix +++ b/nodes/hosts/lappy/disk-config.nix @@ -95,16 +95,6 @@ "noatime" ]; }; - "/persist/swap" = { - mountpoint = "/persist/swap"; - mountOptions = [ - "subvol=swap" - "noatime" - "nodatacow" - "compress=no" - ]; - swap.swapfile.size = "18G"; - }; }; }; }; diff --git a/nodes/hosts/lappy/system/filesystems.nix b/nodes/hosts/lappy/system/filesystems.nix index 06b7f69..2677dca 100644 --- a/nodes/hosts/lappy/system/filesystems.nix +++ b/nodes/hosts/lappy/system/filesystems.nix @@ -45,14 +45,8 @@ options = [ "fmask=0077" "dmask=0077" ]; }; - fileSystems."/persist/swap" = - { device = "/dev/mapper/cryptroot"; - fsType = "btrfs"; - options = [ "subvol=swap" "noatime" "nodatacow" "compress=no" ]; - }; - swapDevices = [{ - device = "/persist/swap/swapfile"; + device = "/swapfile"; size = 18 * 1024; }];