diff --git a/hosts/nb/configuration.nix b/hosts/nb/configuration.nix
index baa3b22..2236ff3 100644
--- a/hosts/nb/configuration.nix
+++ b/hosts/nb/configuration.nix
@@ -179,6 +179,8 @@ in {
     extraGroups = [ "wheel" "disk" "video" "audio" "mysql" "docker" "vboxusers" "networkmanager" "onepassword" "onepassword-cli" "dialout" ]; # Enable ‘sudo’ for the user.
   };
 
+  users.groups.dominik = {};
+
   environment.systemPackages = with pkgs; [
     alsa-utils
     sshpass
diff --git a/hosts/nb/hardware-configuration.nix b/hosts/nb/hardware-configuration.nix
index 2b0553e..abc1edd 100644
--- a/hosts/nb/hardware-configuration.nix
+++ b/hosts/nb/hardware-configuration.nix
@@ -17,32 +17,58 @@
   boot.kernelModules = [ "amdgpu" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    {
-      device = "none";
-      fsType = "tmpfs";
-      options = [ "size=16G" "mode=755" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/856e1ebe-832f-422d-8d91-d43a5d852abb";
-      fsType = "f2fs";
-    };
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [ "size=16G" "mode=755" ];
+  };
 
   boot.initrd = {
-    luks.devices."enc" = {
+    luks.devices."root" = {
       crypttabExtraOpts = [ "fido2-device=auto" ];
-      device = "/dev/disk/by-uuid/08897ecb-23ce-4352-a1fc-fa442b9e0f72";
+      device = "/dev/disk/by-label/root";
     };
     systemd.enable = true;
   };
 
+  fileSystems."/nix"  = {
+    device = "/dev/mapper/root";
+    fsType = "btrfs";
+    neededForBoot = true;
+    options = [
+      "subvol=@"
+      "ssd"
+      "compress=zstd:3"
+      "discard=async"
+      "noatime"
+    ];
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1521-B173";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/nix/store" = {
+    device = "/dev/mapper/root";
+    fsType = "btrfs";
+    neededForBoot = true;
+    options = [
+      "subvol=@nix-store"
+      "ssd"
+      "compress=zstd:3"
+      "discard=async"
+      "noatime"
+    ];
+  };
+
+  fileSystems."/nix/persist"  = {
+    device = "/dev/mapper/root";
+    fsType = "btrfs";
+    neededForBoot = true;
+    options = [
+      "subvol=@nix-persist"
+      "ssd"
+      "compress=zstd:3"
+      "discard=async"
+      "noatime"
+    ];
+  };
 
   swapDevices = [ ];