diff --git a/flake.nix b/flake.nix
index 202dda83..dd9ea592 100644
--- a/flake.nix
+++ b/flake.nix
@@ -129,7 +129,7 @@
         packages = pkgs // { inherit home-manager; };
 
         devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [ nixUnstable nixfmt rnix-lsp home-manager ];
+          buildInputs = with pkgs; [ nixUnstable nixfmt rnix-lsp home-manager git ];
         };
       });
 }
diff --git a/hosts/pleione/hardware-configuration.nix b/hosts/pleione/hardware-configuration.nix
index 46414fc6..e29fa73b 100644
--- a/hosts/pleione/hardware-configuration.nix
+++ b/hosts/pleione/hardware-configuration.nix
@@ -15,53 +15,9 @@
 
   fileSystems = {
     "/" = {
-      device = "none";
-      fsType = "tmpfs";
-      options = [ "defaults" "size=4G" "mode=755" ];
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-label/ESP";
-      fsType = "vfat";
-    };
-
-    "/data/etc" = {
       device = "/dev/mapper/pleione";
       fsType = "btrfs";
-      options = [ "subvol=data/etc" "compress=zstd" ];
-      neededForBoot = true;
-    };
-
-    "/data/games" = {
-      device = "/dev/mapper/pleione";
-      fsType = "btrfs";
-      options = [ "subvol=data/games" "compress=zstd" ];
-    };
-
-    "/data/home" = {
-      device = "/dev/mapper/pleione";
-      fsType = "btrfs";
-      options = [ "subvol=data/home" "compress=zstd" ];
-      neededForBoot = true;
-    };
-
-    "/data/srv" = {
-      device = "/dev/mapper/pleione";
-      fsType = "btrfs";
-      options = [ "subvol=data/srv" "compress=zstd" ];
-    };
-
-    "/data/var" = {
-      device = "/dev/mapper/pleione";
-      fsType = "btrfs";
-      options = [ "subvol=data/var" "compress=zstd" ];
-      neededForBoot = true;
-    };
-
-    "/dotfiles" = {
-      device = "/dev/mapper/pleione";
-      fsType = "btrfs";
-      options = [ "subvol=dotfiles" "compress=zstd" ];
+      options = [ "subvol=root" "compress=zstd" ];
     };
 
     "/nix" = {
@@ -70,11 +26,23 @@
       options = [ "subvol=nix" "noatime" "compress=zstd" ];
     };
 
+    "/persist" = {
+      device = "/dev/mapper/pleione";
+      fsType = "btrfs";
+      options = [ "subvol=persist" "compress=zstd" ];
+      neededForBoot = true;
+    };
+
     "/swap" = {
       device = "/dev/mapper/pleione";
       fsType = "btrfs";
       options = [ "subvol=swap" "noatime" "compress=lzo" ];
     };
+
+    "/boot" = {
+      device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+    };
   };
 
   swapDevices = [{