diff --git a/shell.nix b/shell.nix
index 4083d6b3..9903b59a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,5 @@
 {pkgs, ...}:
+# TODO: Use pkgs.mkShell or Navi for this...
 pkgs.devshell.mkShell {
   name = "NixFlake Shell";
 
@@ -31,8 +32,6 @@ pkgs.devshell.mkShell {
       help = "Run NixOS store verification with repair (slow)";
       command = "nix-store --verify --check-contents";
     }
-
-    # TODO: Use navi for this
     {
       name = "help-store-path";
       help = "Display the location of a binary in the nix store";
@@ -48,5 +47,10 @@ pkgs.devshell.mkShell {
       help = "Display the closure of a package";
       command = "echo 'nix path-info --recursive --size --closure-size --human-readable (readlink -f (which <arg>))'";
     }
+    {
+      name = "help-disko";
+      help = "Partition disk using disko";
+      command = ''echo "sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#<target> --disk <disk-name> <disk-device>"'';
+    }
   ];
 }
diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix
index f1b93609..679dca1e 100644
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@@ -42,16 +42,17 @@
   };
 
   fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2";
-      fsType = "ext4";
-      options = ["defaults" "rw" "relatime"];
-    };
-
-    "/boot/efi" = {
-      device = "/dev/disk/by-uuid/36A9-3D74";
-      fsType = "vfat";
-    };
+    # Done by disko
+    # "/" = {
+    #   device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2";
+    #   fsType = "ext4";
+    #   options = ["defaults" "rw" "relatime"];
+    # };
+    #
+    # "/boot/efi" = {
+    #   device = "/dev/disk/by-uuid/36A9-3D74";
+    #   fsType = "vfat";
+    # };
 
     "/home/christoph/Games" = {
       device = "/dev/disk/by-uuid/e57c1831-09d7-4046-9c62-086d3596f825";
@@ -91,12 +92,13 @@
     };
   };
 
-  swapDevices = lib.mkForce [
-    {
-      device = "/var/swap";
-      size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM
-    }
-  ];
+  # Done by disko
+  # swapDevices = lib.mkForce [
+  #   {
+  #     device = "/var/swap";
+  #     size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM
+  #   }
+  # ];
 
   hardware = {
     # Use all redistributable firmware (i.e. nonfree)