diff --git a/nixos/pruflas/configuration.nix b/nixos/pruflas/configuration.nix index d5f17b4..bbf6120 100644 --- a/nixos/pruflas/configuration.nix +++ b/nixos/pruflas/configuration.nix @@ -72,13 +72,6 @@ with lib; { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - swapDevices = [ - { - device = "/var/swapfile"; - size = 32768; - } - ]; - # Desktop things for media playback services.xserver.enable = true; diff --git a/nixos/pruflas/hardware-configuration.nix b/nixos/pruflas/hardware-configuration.nix index 2ed6324..82dcd49 100644 --- a/nixos/pruflas/hardware-configuration.nix +++ b/nixos/pruflas/hardware-configuration.nix @@ -14,7 +14,7 @@ { device = "/dev/disk/by-uuid/767a84ad-4157-4e9f-a3db-145449edd3bc"; fsType = "btrfs"; - options = [ "subvol=root" ]; + options = [ "subvol=root" "compress=zstd" ]; }; fileSystems."/boot" = @@ -27,16 +27,22 @@ { device = "/dev/disk/by-uuid/767a84ad-4157-4e9f-a3db-145449edd3bc"; fsType = "btrfs"; - options = [ "subvol=home" ]; + options = [ "subvol=home" "compress=zstd" ]; }; fileSystems."/nix" = { device = "/dev/disk/by-uuid/767a84ad-4157-4e9f-a3db-145449edd3bc"; fsType = "btrfs"; - options = [ "subvol=nix" ]; + options = [ "subvol=nix" "compress=zstd" ]; }; - swapDevices = [ ]; + fileSystems."/swap" = { + device = "/dev/disk/by-uuid/767a84ad-4157-4e9f-a3db-145449edd3bc"; + fsType = "btrfs"; + options = [ "subvol=swap" "noatime" ]; + }; + + swapDevices = [ { device = "/swap/swapfile"; } ]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;