diff --git a/flake.nix b/flake.nix
index c4d061d..44f0352 100644
--- a/flake.nix
+++ b/flake.nix
@@ -269,10 +269,7 @@
           ./modules/linux/nixos
           # Still no specific modules here
           # ./modules/cross-platform/nixos
-          # Use agenix for secrets
           agenix.nixosModules.default
-          # Use disko for creating filesystem
-          disko.nixosModules.disko
           # Setup home manager for my user
           home-manager.nixosModules.home-manager
           {
diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index ffb06f3..ed86ac3 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -7,7 +7,6 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ./disk-config.nix
     inputs.home-manager.nixosModules.home-manager
   ];
 
diff --git a/hosts/ymir/disk-config.nix b/hosts/ymir/disk-config.nix
deleted file mode 100644
index f061911..0000000
--- a/hosts/ymir/disk-config.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  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 = "crypt";
-                passwordFile = "/tmp/secret.key"; # Interactive
-                settings = {
-                  allowDiscards = true;
-                  keyFile = "/tmp/secret.key";
-                };
-                content = {
-                  type = "btrfs";
-                  extraArgs = ["-f"];
-                  subvolumes = {
-                    "@" = {
-                      mountpoint = "/";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                    "@home" = {
-                      mountpoint = "/home";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                    "@nix" = {
-                      mountpoint = "/nix";
-                      mountOptions = [
-                        "compress=zstd"
-                        "noatime"
-                      ];
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}