diff --git a/devices/ellaca/default.nix b/devices/ellaca/default.nix
index e8a2e4b..8203bf7 100644
--- a/devices/ellaca/default.nix
+++ b/devices/ellaca/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ./hardware-config.nix
+    ./disko.nix
     ./nvidia.nix
     ./options.nix
   ];
diff --git a/devices/ellaca/hardware-config.nix b/devices/ellaca/hardware-config.nix
index c805605..c0cbc1f 100644
--- a/devices/ellaca/hardware-config.nix
+++ b/devices/ellaca/hardware-config.nix
@@ -1,30 +1,9 @@
-{ config, lib, modulesPath, ... }: {
-  imports = [ 
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
+{ config, lib, ... }: {
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = { 
-    device = "/dev/disk/by-uuid/95b15244-c97c-42a5-9be1-ed5df6872dcb";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/BF87-B3DE";
-    fsType = "vfat";
-  };
-
-  fileSystems."/ext" = {
-    device = "/dev/disk/by-uuid/31608388-1043-47a0-a5da-e92250e821f8";
-    fsType = "ext4";
-  };
-
-  swapDevices =[ { device = "/dev/disk/by-uuid/b6445ced-1cc2-461f-a81f-6e8409c10f48"; } ];
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/flake.nix b/flake.nix
index cbc14ef..37d6ff8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,11 @@
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs: import ./outputs.nix inputs;
diff --git a/outputs.nix b/outputs.nix
index 3aa3f1e..661379e 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,10 +1,11 @@
-{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }@inputs: {
+{ nixpkgs, home-manager, nixos-hardware, nur, niri, disko, ... }@inputs: {
   nixosConfigurations = let
 
     clientModules = [
         ./modules/system
         ./options.nix
         niri.nixosModules.niri
+        disko.nixosModules.disko
         home-manager.nixosModules.home-manager {
           nixpkgs.overlays = [
             nur.overlay