hosts/Dimaga/hardware-configuration.nix

@@ -7,8 +7,7 @@
 }:
 
 let
-  luksUUID = "9fdc521b-a037-4070-af47-f54da03675e4"; # The UUID of the locked LUKS partition.
+  luksUUID = "9fdc521b-a037-4070-af47-f54da03675e4";
-  rootUUID = "dfb4fc8f-e82b-43a1-91c1-a77acb6337cb"; # The UUID of the unlocked filesystem partition.
 in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -36,7 +35,7 @@ in
     enable = true;
     devices = {
       boot = "/dev/disk/by-uuid/FC20-D155";
-      btrfs = "/dev/disk/by-uuid/${rootUUID}";
+      btrfs = "/dev/disk/by-uuid/${luksUUID}";
     };
     swapFile = {
       enable = true;

hosts/Shura/hardware-configuration.nix

@@ -6,10 +6,6 @@
   modulesPath,
   ...
 }:
-let
-  luksUUID = "bcf67e34-339e-40b9-8ffd-bec8f7f55248"; # The UUID of the locked LUKS partition.
-  rootUUID = "b801fbea-4cb5-4255-bea9-a2ce77d1a1b7"; # The UUID of the unlocked filesystem partition.
-in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -28,8 +24,8 @@ in
         "sd_mod"
         "rtsx_pci_sdmmc"
       ];
-      luks.devices."luks-${luksUUID}" = {
+      luks.devices."luks-bcf67e34-339e-40b9-8ffd-bec8f7f55248" = {
-        device = "/dev/disk/by-uuid/${luksUUID}";
+        device = "/dev/disk/by-uuid/bcf67e34-339e-40b9-8ffd-bec8f7f55248";
         crypttabExtraOpts = [ "tpm2-device=auto" ]; # Enable TPM auto-unlocking
       };
     };
@@ -37,16 +33,25 @@ in
     kernelModules = [ "kvm-amd" ];
   };
 
-  # Configure the main filesystem.
+  fileSystems = {
-  aux.system.filesystem.btrfs = {
+    "/" = {
-    enable = true;
+      device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
-    devices = {
+      fsType = "btrfs";
-      boot = "/dev/disk/by-uuid/FC20-D155";
+      options = [ "subvol=@,compress=zstd,discard" ];
-      btrfs = "/dev/disk/by-uuid/${rootUUID}";
     };
-    swapFile = {
+    "/home" = {
-      enable = true;
+      device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
-      size = 16384;
+      fsType = "btrfs";
+      options = [ "subvol=@home,compress=zstd,discard" ];
+    };
+    "/swap" = {
+      device = "/dev/disk/by-uuid/b801fbea-4cb5-4255-bea9-a2ce77d1a1b7";
+      fsType = "btrfs";
+      options = [ "subvol=@swap" ];
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/AFCB-D880";
+      fsType = "vfat";
     };
   };
 

modules/system/filesystem.nix

@@ -2,7 +2,11 @@
 let
   cfg = config.aux.system.filesystem.btrfs;
 
-  standardMountOpts = [ "compress=zstd" ];
+  standardMountOpts = [
+    "compress=zstd"
+    "discard=async"
+    "noatime"
+  ];
 in
 {
   options = {
@@ -20,16 +24,6 @@ in
           default = "";
         };
       };
-      subvolumes = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "Which subvolumes to mount. Leave as the default to create all standard subvolumes.";
-        default = [
-          "/"
-          "/home"
-          "/nix"
-          "/var/log"
-        ];
-      };
       swapFile = {
         enable = lib.mkEnableOption (lib.mdDoc "Enables the creation of a swap file.");
         size = lib.mkOption {
@@ -56,52 +50,36 @@ in
     ];
     fileSystems =
       {
-        "/" = lib.mkIf (builtins.elem "/" cfg.subvolumes) {
+        "/" = {
           device = cfg.devices.btrfs;
           fsType = "btrfs";
-          options = [
+          options = [ "subvol=@" ] ++ standardMountOpts;
-            "subvol=@"
-            "compress=zstd"
-          ];
         };
         "/boot" = {
           device = cfg.devices.boot;
           fsType = "vfat";
         };
-        "/home" = lib.mkIf (builtins.elem "/home" cfg.subvolumes) {
+        "/home" = {
           device = cfg.devices.btrfs;
           fsType = "btrfs";
-          options = [
+          options = [ "subvol=@home" ] ++ standardMountOpts;
-            "subvol=@home"
-            "compress=zstd"
-          ];
         };
-        "/var/log" = lib.mkIf (builtins.elem "/var/log" cfg.subvolumes) {
+        "/var/log" = {
           device = cfg.devices.btrfs;
           fsType = "btrfs";
-          options = [
+          options = [ "subvol=@log" ] ++ standardMountOpts;
-            "subvol=@log"
-            "compress=zstd"
-          ];
         };
-        "/nix" = lib.mkIf (builtins.elem "/nix" cfg.subvolumes) {
+        "/nix" = {
           device = cfg.devices.btrfs;
           fsType = "btrfs";
-          options = [
+          options = [ "subvol=@nix" ] ++ standardMountOpts;
-            "subvol=@nix"
-            "compress=zstd"
-            "noatime"
-          ];
         };
       }
       // lib.optionalAttrs cfg.swapFile.enable {
         "/swap" = {
           device = cfg.devices.btrfs;
           fsType = "btrfs";
-          options = [
+          options = [ "subvol=@swap" ];
-            "subvol=@swap"
-            "noatime"
-          ];
         };
       };