diff --git a/flake.lock b/flake.lock
index 1160ba5..b693604 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,6 +141,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
@@ -923,6 +943,7 @@
     },
     "root": {
       "inputs": {
+        "disko": "disko",
         "flake-parts": "flake-parts",
         "ghostty": "ghostty",
         "git-hooks-nix": "git-hooks-nix",
diff --git a/flake.nix b/flake.nix
index 3e4b271..c766709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Disk management
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Boot
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
diff --git a/modules/system/default.nix b/modules/system/default.nix
index aeefa4e..a16f8ce 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -3,6 +3,7 @@
     ./audio.nix
     ./boot
     ./camera.nix
+    ./disko.nix
     ./fingerprint.nix
     ./fonts.nix
     ./gc.nix
diff --git a/modules/system/disko.nix b/modules/system/disko.nix
new file mode 100644
index 0000000..29bc2b4
--- /dev/null
+++ b/modules/system/disko.nix
@@ -0,0 +1,10 @@
+{ inputs, ... }:
+{
+  imports = [
+    inputs.disko.nixosModules.disko
+  ];
+
+  config = {
+    disko.enableConfig = true;
+  };
+}