diff --git a/hardware/home-pc.nix b/hardware/home-pc.nix
index d8aab7a..9c7f0e8 100644
--- a/hardware/home-pc.nix
+++ b/hardware/home-pc.nix
@@ -22,42 +22,6 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/5830e9b3-260b-451c-bfee-2028c64c6199";
-    fsType = "btrfs";
-    options = [
-      "subvol=@"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/1dd848b6-cd7f-4959-8500-a03ffdaeae66";
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/5830e9b3-260b-451c-bfee-2028c64c6199";
-    fsType = "btrfs";
-    options = [
-      "subvol=@home"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/.snapshots" = {
-    device = "/dev/disk/by-uuid/5830e9b3-260b-451c-bfee-2028c64c6199";
-    fsType = "btrfs";
-    options = [
-      "subvol=@snapshots"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/17B2-42C2";
-    fsType = "vfat";
-  };
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hardware/lattepanda.nix b/hardware/lattepanda.nix
index 0239167..626774a 100644
--- a/hardware/lattepanda.nix
+++ b/hardware/lattepanda.nix
@@ -16,43 +16,6 @@
   boot.kernelParams = [ "i915.enable_guc=3" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/70f03d67-e248-42f6-a204-c02e4f180531";
-    fsType = "btrfs";
-    options = [
-      "subvol=@"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/d3b12d0e-7e8e-4130-9a8f-680abcdc9682";
-
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/70f03d67-e248-42f6-a204-c02e4f180531";
-    fsType = "btrfs";
-    options = [
-      "subvol=@home"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/.snapshots" = {
-    device = "/dev/disk/by-uuid/70f03d67-e248-42f6-a204-c02e4f180531";
-    fsType = "btrfs";
-    options = [
-      "subvol=@snapshots"
-      "compress-force=zstd:1"
-      "noatime"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/95FC-D4E5";
-    fsType = "vfat";
-  };
-
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/flake-module.nix b/hosts/flake-module.nix
index 8b5bc1c..02aa847 100644
--- a/hosts/flake-module.nix
+++ b/hosts/flake-module.nix
@@ -2,12 +2,15 @@
 {
   flake = {
     diskoConfigurations = {
+      home-pc = import ./home-pc/disk-config.nix;
+      home-server = import ./home-server/disk-config.nix;
       cmdframe = import ./cmdframe/disk-config.nix;
     };
     nixosConfigurations = {
       home-pc = inputs.nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          inputs.disko.nixosModules.disko
           inputs.nixpkgs.nixosModules.notDetected
           inputs.nixos-hardware.nixosModules.common-pc
           inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -46,6 +49,7 @@
       home-server = inputs.nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          inputs.disko.nixosModules.disko
           inputs.nixpkgs.nixosModules.notDetected
           inputs.nixos-hardware.nixosModules.common-pc
           inputs.nixos-hardware.nixosModules.common-pc-ssd
diff --git a/hosts/home-pc/default.nix b/hosts/home-pc/default.nix
index 5e32deb..0cbba48 100644
--- a/hosts/home-pc/default.nix
+++ b/hosts/home-pc/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./disk-config.nix
     ../../hardware/base.nix
     ../../hardware/bluetooth.nix
     ../../hardware/xbox.nix
diff --git a/hosts/home-pc/disk-config.nix b/hosts/home-pc/disk-config.nix
new file mode 100644
index 0000000..82ad757
--- /dev/null
+++ b/hosts/home-pc/disk-config.nix
@@ -0,0 +1,62 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "enc";
+                settings = {
+                  allowDiscards = true;
+                };
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "@" = {
+                      mountpoint = "/";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@home" = {
+                      mountpoint = "/home";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@snapshots" = {
+                      mountpoint = "/.snapshots";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/home-server/default.nix b/hosts/home-server/default.nix
index 0a8c4bd..931d571 100644
--- a/hosts/home-server/default.nix
+++ b/hosts/home-server/default.nix
@@ -18,6 +18,7 @@ let
 in
 {
   imports = [
+    ./disk-config.nix
     ../../hardware/base.nix
     ../../desktop/x11.nix
     ../../system/server.nix
diff --git a/hosts/home-server/disk-config.nix b/hosts/home-server/disk-config.nix
new file mode 100644
index 0000000..82ad757
--- /dev/null
+++ b/hosts/home-server/disk-config.nix
@@ -0,0 +1,62 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "enc";
+                settings = {
+                  allowDiscards = true;
+                };
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "@" = {
+                      mountpoint = "/";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@home" = {
+                      mountpoint = "/home";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@snapshots" = {
+                      mountpoint = "/.snapshots";
+                      mountOptions = [
+                        "compress-force=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}