diff --git a/checks/disksnstuff.sh b/checks/disksnstuff.sh
old mode 100644
new mode 100755
index cba6a8e..22dcf00
--- a/checks/disksnstuff.sh
+++ b/checks/disksnstuff.sh
@@ -1,13 +1,52 @@
-sudo mount -t tmpfs -o mode=755 none /mnt
-sudo mkdir -p /mnt/{boot,home,root,etc,nix,var/log}
-sudo mount /dev/mmcblk0p2 /mnt/boot
-sudo mkdir -p /mnt/boot/firmware
-sudo mount /dev/mmcblk0p1 /mnt/boot/firmware
-sudo mount /dev/mmcblk0p3 -o compress=zstd,subvol=home /mnt/home
-sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=root /mnt/root
-sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=etc /mnt/etc
-sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=nix /mnt/nix
-sudo mount /dev/mmcblk0p3 -o compress=zstd,noatime,subvol=log /mnt/var/log
+#!/usr/bin/env bash
+
+disk=/dev/sdd
+
+# sudo mkfs.vfat "$disk"1
+# sudo bcachefs format --encrypted "$disk"2
+
+# sudo mount -t tmpfs -o mode=755 none /mnt
+# sudo mkdir -p /mnt/{boot,home,root,etc,nix,var/log,tmp,persist}
+# sudo mount "$disk"1 /mnt/boot
+# sudo mkdir -p /mnt/boot/firmware
+# sudo mount "$disk"2 /mnt/boot/firmware
+# sudo mount "$disk"2 -o compress=zstd,subvol=home /mnt/home
+# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=root /mnt/root
+# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=etc /mnt/etc
+# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=nix /mnt/nix
+# sudo mount "$disk"2 -o compress=zstd,noatime,subvol=log /mnt/var/log
+
+# sudo bcachefs unlock -k session "$disk"2
+# sudo mount "$disk"2 /mnt/tmp
+# cd /mnt/tmp
+# sudo bcachefs subvolume create nix
+# sudo bcachefs subvolume create etc
+# sudo bcachefs subvolume create log
+# sudo bcachefs subvolume create root
+# sudo bcachefs subvolume create persist
+# sudo bcachefs subvolume create home
+# cd /etc/nixos
+# sudo umount /mnt/tmp
+
+# sudo mount -o noatime,X-mount.subdir=nix "$disk"2 /mnt/nix
+# sudo mount -o noatime,X-mount.subdir=etc "$disk"2 /mnt/etc
+# sudo mount -o noatime,X-mount.subdir=log "$disk"2 /mnt/var/log
+# sudo mount -o noatime,X-mount.subdir=root "$disk"2 /mnt/root
+# sudo mount -o noatime,X-mount.subdir=persist "$disk"2 /mnt/persist
+# sudo mount -o X-mount.subdir=home "$disk"2 /mnt/home
+
+# tree /mnt
+
+# sudo nixos-install --flake /etc/nixos#nuc-nixos
+
+sudo umount /mnt/boot
+sudo umount /mnt/var/log
+sudo umount /mnt/persist
+sudo umount /mnt/home
+sudo umount /mnt/root
+sudo umount /mnt/etc
+sudo umount /mnt/nix
+sudo umount /mnt
 
 # wpa_passphrase "Joey's Jungle 5G" "kR8v&3Qd" > 5g.conf
 # wpa_supplicant -i wlp6s0 -c 5g.conf -B
diff --git a/modules/nixos/disko/default.nix b/modules/nixos/disko/default.nix
index 9cac1f9..a448fcb 100644
--- a/modules/nixos/disko/default.nix
+++ b/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}"
             ];
diff --git a/modules/nixos/disko/options.nix b/modules/nixos/disko/options.nix
index f6554b0..abfd25c 100644
--- a/modules/nixos/disko/options.nix
+++ b/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";
 
diff --git a/systems/x86_64-linux/nuc-nixos/default.nix b/systems/x86_64-linux/nuc-nixos/default.nix
index 4cf7b55..40633ae 100644
--- a/systems/x86_64-linux/nuc-nixos/default.nix
+++ b/systems/x86_64-linux/nuc-nixos/default.nix
@@ -17,7 +17,7 @@
 
     hardware.disko = {
       enable = true;
-      filesystem = "btrfs";
+      filesystem = "bcachefs";
     };
 
     headless.enable = true;
diff --git a/test.key b/test.key
new file mode 100644
index 0000000..31fd523
--- /dev/null
+++ b/test.key
@@ -0,0 +1 @@
+Lucifer008!