diff --git a/common/base.nix b/common/base.nix index 584cc74..b594747 100644 --- a/common/base.nix +++ b/common/base.nix @@ -88,4 +88,6 @@ fwupd.enable = true; tailscale.enable = true; }; + + zramSwap.enable = true; } diff --git a/hosts/cave/configuration.nix b/hosts/cave/configuration.nix index 1f5c819..90289b6 100644 --- a/hosts/cave/configuration.nix +++ b/hosts/cave/configuration.nix @@ -20,7 +20,7 @@ in { # Hardware # ../../common/hardware/tpm2.nix ../../common/hardware/wireless.nix - ../../common/hardware/ssd.nix + # ../../common/hardware/ssd.nix ../../common/hardware/btrfs.nix ../../common/components/lanzaboote.nix diff --git a/hosts/cave/hardware-configuration.nix b/hosts/cave/hardware-configuration.nix index 8bc7151..24ba1e9 100644 --- a/hosts/cave/hardware-configuration.nix +++ b/hosts/cave/hardware-configuration.nix @@ -20,7 +20,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/cee0ceca-3ea6-43d8-a483-00882f9ae6bb"; fsType = "btrfs"; - options = ["subvol=@"]; + options = ["subvol=@" "compress=zstd:5" "discard=async"]; }; boot.initrd.luks.devices."luks-ab9bf3d3-8c4f-415b-944e-a8e8d355d11c".device = "/dev/disk/by-uuid/ab9bf3d3-8c4f-415b-944e-a8e8d355d11c"; @@ -28,7 +28,7 @@ fileSystems."/home" = { device = "/dev/disk/by-uuid/cee0ceca-3ea6-43d8-a483-00882f9ae6bb"; fsType = "btrfs"; - options = ["subvol=@home"]; + options = ["subvol=@home" "compress=zstd:5" "discard=async"]; }; fileSystems."/boot" = { diff --git a/hosts/jo/hardware-configuration.nix b/hosts/jo/hardware-configuration.nix index 7f611fc..c6b8f9e 100644 --- a/hosts/jo/hardware-configuration.nix +++ b/hosts/jo/hardware-configuration.nix @@ -20,7 +20,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/e867382a-7ecb-4a93-bf7c-c972be061180"; fsType = "btrfs"; - options = ["subvol=@"]; + options = ["subvol=@" "compress=zstd:5" "discard=async"]; }; boot.initrd.luks.devices."luks-7aa6742e-020d-49aa-a458-78ea5c3b85f8".device = "/dev/disk/by-uuid/7aa6742e-020d-49aa-a458-78ea5c3b85f8"; diff --git a/hosts/phoenix/hardware-configuration.nix b/hosts/phoenix/hardware-configuration.nix index b6dc63b..53fd984 100644 --- a/hosts/phoenix/hardware-configuration.nix +++ b/hosts/phoenix/hardware-configuration.nix @@ -17,7 +17,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/469da268-3ac1-4591-9209-26c89afb2e59"; fsType = "btrfs"; - options = ["subvol=@"]; + options = ["subvol=@" "compress=zstd:5" "discard=async"]; }; boot.initrd.luks.devices."luks-06613ddd-abd6-409e-9a33-889cb9d15d11".device = "/dev/disk/by-uuid/06613ddd-abd6-409e-9a33-889cb9d15d11"; @@ -37,7 +37,7 @@ fileSystems."/home" = { device = "/dev/disk/by-uuid/469da268-3ac1-4591-9209-26c89afb2e59"; fsType = "btrfs"; - options = ["subvol=@home"]; + options = ["subvol=@home" "compress=zstd:5" "discard=async"]; }; swapDevices = []; diff --git a/hosts/stuff/hardware-configuration.nix b/hosts/stuff/hardware-configuration.nix index e4ab3d4..b2fdcc1 100644 --- a/hosts/stuff/hardware-configuration.nix +++ b/hosts/stuff/hardware-configuration.nix @@ -17,7 +17,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/699da114-1ef6-4887-9083-a03eb9e51049"; fsType = "btrfs"; - options = ["subvol=@"]; + options = ["subvol=@" "compress=zstd:5" "discard=async"]; }; fileSystems."/boot" = { diff --git a/hosts/theseus/hardware-configuration.nix b/hosts/theseus/hardware-configuration.nix index 8db83fb..4943e64 100644 --- a/hosts/theseus/hardware-configuration.nix +++ b/hosts/theseus/hardware-configuration.nix @@ -20,7 +20,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/223771ac-0c08-4b1e-bfbd-0e6a35868732"; fsType = "btrfs"; - options = ["subvol=@"]; + options = ["subvol=@" "compress=zstd:5" "discard=async"]; }; boot.initrd.luks.devices."luks-9977dbf8-b4f4-44cd-8246-5c9c4e1f9084".device = "/dev/disk/by-uuid/9977dbf8-b4f4-44cd-8246-5c9c4e1f9084"; diff --git a/hosts/vulpecula-vps/configuration.nix b/hosts/vulpecula-vps/configuration.nix index b069dd5..04b3677 100644 --- a/hosts/vulpecula-vps/configuration.nix +++ b/hosts/vulpecula-vps/configuration.nix @@ -84,7 +84,6 @@ in { }; boot.tmp.cleanOnBoot = true; - zramSwap.enable = true; networking.domain = "vulpecula.zone"; # users.users.root.openssh.authorizedKeys.keys = [''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLyDLtqUhEQwIsPx0XgQ9OJb2+XxL+2ra4goNJEgwf0 tasia@cave'' ]; system.stateVersion = "24.05";