nixos

commit c4fa2edbc4252d4b0649fefc34cb6d5939279128
parent 65fdb7eef45c58cbc7fcb9aeb16e70d77c6c2ec3
Author: Toni Brown <me@tb148.net>
Date:   Fri, 30 Jan 2026 22:12:47 +0800

update file system options

Diffstat:
M
configuration.nix
 | 
16
+++++++++++-----
M
hardware-configuration.nix
 | 
7
+------

2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -14,18 +14,26 @@
 	];
 
 	fileSystems."/".options = [
-		"subvol=root"
 		"compress=zstd"
 	];
 	fileSystems."/home".options = [
-		"subvol=home"
 		"compress=zstd"
 	];
 	fileSystems."/nix".options = [
-		"subvol=nix"
 		"compress=zstd"
 		"noatime"
 	];
+	fileSystems."/swap".options = [
+		"noatime"
+	];
+	swapDevices = [
+		{
+			device = "/swap/swapfile";
+			size = 24 * 1024;
+		}
+	];
+	services.btrfs.autoScrub.enable = true;
+
 	boot.loader.grub = {
 		enable = true;
 		efiSupport = true;
@@ -34,8 +42,6 @@
 	boot.loader.efi.canTouchEfiVariables = true;
 	boot.kernelPackages = pkgs.linuxPackages_latest;
 
-	services.btrfs.autoScrub.enable = true;
-
 	nixpkgs.config.allowUnfree = true;
 
 	hardware.graphics.enable = true;
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
@@ -47,12 +47,7 @@
 		options = ["subvol=swap"];
 	};
 
-	swapDevices = [
-		{
-			device = "/swap/swapfile";
-			size = 24 * 1024;
-		}
-	];
+	swapDevices = [];
 
 	# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
 	# (the default) this is the recommended approach. When using systemd-networkd it's