diff --git a/disko.nix b/disko.nix
index 8d848e9..b6cf22a 100644
--- a/disko.nix
+++ b/disko.nix
@@ -9,16 +9,9 @@
           partitions = {
             ESP = {
               label = "fake_EFI";
-              name = "ESP";
+              name = "fake_ESP";
               size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountOptions = [
-                  "defaults"
-                ];
-              };
+              type = "8300";
             };
             luks = {
               end = "-256G";
diff --git a/hardware.nix b/hardware.nix
index 1d91b53..16a30f3 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -10,31 +10,14 @@
   ];
 
   boot = {
-    # Bootloader.
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
 
     initrd = {
-      # Setup keyfile
-      secrets = {
-        "/crypto_keyfile.bin" = null;
-      };
-
-      # modules
       availableKernelModules = ["nvme" "xhci_pci" "uas" "usbhid" "usb_storage" "sd_mod"];
       kernelModules = [];
-
-      # Enable swap on luks
-      # luks = {
-      #   # Root
-      #   devices."luks-0ebc7402-5f50-4549-a407-b1f859285102".device = "/dev/disk/by-uuid/0ebc7402-5f50-4549-a407-b1f859285102";
-
-      #   # Swap
-      #   devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".device = "/dev/disk/by-uuid/fa1e760a-71a3-4a79-a791-684cd82d9c3c";
-      #   devices."luks-fa1e760a-71a3-4a79-a791-684cd82d9c3c".keyFile = "/crypto_keyfile.bin";
-      # };
     };
 
     kernelModules = ["kvm-amd" "amdgpu"];
@@ -43,21 +26,6 @@
 
   services.xserver.videoDrivers = ["amdgpu"];
 
-  # fileSystems = {
-  #   "/" = {
-  #     device = "/dev/disk/by-uuid/6ae6ea01-72d5-4cee-a512-7aab551577a0";
-  #     fsType = "ext4";
-  #   };
-  #   "/boot" = {
-  #     device = "/dev/disk/by-uuid/B471-B193";
-  #     fsType = "vfat";
-  #   };
-  # };
-
-  # swapDevices = [
-  #   {device = "/dev/disk/by-uuid/5b3a6fa6-bdec-4bfb-914d-48d870776a53";}
-  # ];
-
   networking = {
     useDHCP = lib.mkDefault true;
     interfaces = {