testing

modules/nixos/disko/default.nix

@@ -37,14 +37,14 @@ let
     size = "100%";
     content = {
       type = cfg.filesystem;
-      # Subvolumes must set a mountpoint in order to be mounted,
-      # unless their parent is mounted
-      subvolumes = subvolumes;
     }
     // (
       if cfg.filesystem == "btrfs" then
         {
           extraArgs = [ "-f" ]; # Override existing partition
+          # Subvolumes must set a mountpoint in order to be mounted,
+          # unless their parent is mounted
+          subvolumes = subvolumes;
         }
       else
         {
@@ -79,14 +79,14 @@ let
       };
       content = {
         type = cfg.filesystem;
-        # Subvolumes must set a mountpoint in order to be mounted,
-        # unless their parent is mounted
-        subvolumes = subvolumes;
       }
       // (
         if cfg.filesystem == "btrfs" then
           {
             extraArgs = [ "-f" ]; # Override existing partition
+            # Subvolumes must set a mountpoint in order to be mounted,
+            # unless their parent is mounted
+            subvolumes = subvolumes;
           }
         else
           {
@@ -185,7 +185,7 @@ in
         bcachefs_filesystems = lib.mkIf (cfg.filesystem == "bcachefs") {
           mounted_subvolumes_in_multi = {
             type = "bcachefs_filesystem";
-            # passwordFile = "/etc/nixos/pool.jwe";
+            passwordFile = "/etc/nixos/test.key";
             extraFormatArgs = [
               "--compression=${cfg.compression}"
             ];

modules/nixos/disko/options.nix

@@ -26,7 +26,7 @@ in
 
     swapSize = mkOpt types.str "16G" "size of swap part";
 
-    rootDisk = mkOpt types.str "/dev/nvme0n1" "Root disk";
+    rootDisk = mkOpt types.str "/dev/sdd" "Root disk";
 
     compression = mkOpt types.str "zstd" "Type of compression to enable";