hosts: *: remove tmpfs and add swap
This commit is contained in:
		
							parent
							
								
									00f3044fdd
								
							
						
					
					
						commit
						5153fb8150
					
				@ -35,7 +35,8 @@
 | 
				
			|||||||
#  };
 | 
					#  };
 | 
				
			||||||
  boot.kernelModules = [ "kvm-intel" ];
 | 
					  boot.kernelModules = [ "kvm-intel" ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
  boot.tmp.useTmpfs = true;
 | 
					  boot.tmp.useTmpfs = false;
 | 
				
			||||||
 | 
					  boot.tmp.cleanOnBoot = true;
 | 
				
			||||||
  zramSwap.enable = true;
 | 
					  zramSwap.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.btrfs.autoScrub = {
 | 
					  services.btrfs.autoScrub = {
 | 
				
			||||||
@ -126,6 +127,12 @@
 | 
				
			|||||||
      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  fileSystems."/swap" =
 | 
				
			||||||
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
 | 
					      fsType = "btrfs";
 | 
				
			||||||
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fileSystems."/mnt/snapshots/root" =
 | 
					    fileSystems."/mnt/snapshots/root" =
 | 
				
			||||||
    { device = "/dev/disk/by-label/NIXROOT";
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
@ -171,7 +178,7 @@
 | 
				
			|||||||
      options = [ "bind" ];
 | 
					      options = [ "bind" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
  swapDevices = [ ];
 | 
					  swapDevices = [ { device = "/swap/swapfile"; } ];
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  networking = {
 | 
					  networking = {
 | 
				
			||||||
    vswitches = {
 | 
					    vswitches = {
 | 
				
			||||||
 | 
				
			|||||||
@ -35,7 +35,8 @@
 | 
				
			|||||||
  };
 | 
					  };
 | 
				
			||||||
  boot.kernelModules = [ "kvm-intel" ];
 | 
					  boot.kernelModules = [ "kvm-intel" ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
  boot.tmp.useTmpfs = true;
 | 
					  boot.tmp.useTmpfs = false;
 | 
				
			||||||
 | 
					  boot.tmp.cleanOnBoot = true;
 | 
				
			||||||
  zramSwap.enable = true;
 | 
					  zramSwap.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.btrfs.autoScrub = {
 | 
					  services.btrfs.autoScrub = {
 | 
				
			||||||
@ -126,6 +127,12 @@
 | 
				
			|||||||
      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  fileSystems."/swap" =
 | 
				
			||||||
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
 | 
					      fsType = "btrfs";
 | 
				
			||||||
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fileSystems."/mnt/snapshots/root" =
 | 
					    fileSystems."/mnt/snapshots/root" =
 | 
				
			||||||
    { device = "/dev/disk/by-label/NIXROOT";
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
@ -171,7 +178,7 @@
 | 
				
			|||||||
      options = [ "bind" ];
 | 
					      options = [ "bind" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
  swapDevices = [ ];
 | 
					  swapDevices = [ { device = "/swap/swapfile"; } ];
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  networking = {
 | 
					  networking = {
 | 
				
			||||||
    vswitches = {
 | 
					    vswitches = {
 | 
				
			||||||
 | 
				
			|||||||
@ -21,7 +21,8 @@
 | 
				
			|||||||
  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
 | 
					  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
 | 
				
			||||||
  boot.kernelModules = [ "kvm-amd" ];
 | 
					  boot.kernelModules = [ "kvm-amd" ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
  boot.tmp.useTmpfs = true;
 | 
					  boot.tmp.useTmpfs = false;
 | 
				
			||||||
 | 
					  boot.tmp.cleanOnBoot = true;
 | 
				
			||||||
  zramSwap.enable = true;
 | 
					  zramSwap.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  services.btrfs.autoScrub = {
 | 
					  services.btrfs.autoScrub = {
 | 
				
			||||||
@ -83,6 +84,12 @@
 | 
				
			|||||||
      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  fileSystems."/swap" =
 | 
				
			||||||
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
 | 
					      fsType = "btrfs";
 | 
				
			||||||
 | 
					      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ];
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  fileSystems."/mnt/snapshots/root" =
 | 
					  fileSystems."/mnt/snapshots/root" =
 | 
				
			||||||
    { device = "/dev/disk/by-label/NIXROOT";
 | 
					    { device = "/dev/disk/by-label/NIXROOT";
 | 
				
			||||||
      fsType = "btrfs";
 | 
					      fsType = "btrfs";
 | 
				
			||||||
@ -90,7 +97,7 @@
 | 
				
			|||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  swapDevices = [ ];
 | 
					  swapDevices = [ { device = "/swap/swapfile"; } ];
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  networking = {
 | 
					  networking = {
 | 
				
			||||||
    useDHCP = false;                        # Deprecated
 | 
					    useDHCP = false;                        # Deprecated
 | 
				
			||||||
 | 
				
			|||||||
@ -21,9 +21,9 @@
 | 
				
			|||||||
  boot.initrd.kernelModules = [ ];
 | 
					  boot.initrd.kernelModules = [ ];
 | 
				
			||||||
  boot.kernelModules = [ "kvm-amd" ];
 | 
					  boot.kernelModules = [ "kvm-amd" ];
 | 
				
			||||||
  boot.extraModulePackages = [ ];
 | 
					  boot.extraModulePackages = [ ];
 | 
				
			||||||
  boot.kernelParams = [  ];
 | 
					  boot.tmp.useTmpfs = false;
 | 
				
			||||||
  boot.tmp.useTmpfs = true;
 | 
					  boot.tmp.cleanOnBoot = true;
 | 
				
			||||||
#  zramSwap.enable = true;
 | 
					  zramSwap.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#  services.btrfs.autoScrub = {
 | 
					#  services.btrfs.autoScrub = {
 | 
				
			||||||
#    enable = true;
 | 
					#    enable = true;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user