diff --git a/hosts/nb-epicenter/configuration.nix b/hosts/nb-epicenter/configuration.nix
index f1a56fd..e5cafea 100644
--- a/hosts/nb-epicenter/configuration.nix
+++ b/hosts/nb-epicenter/configuration.nix
@@ -35,9 +35,9 @@
   # nixos cross building qemu
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   boot.supportedFilesystems = [ "ntfs" ];
-  boot.plymouth.enable = true;
-  boot.plymouth.theme = "breeze";
-  boot.kernelParams = ["quiet"];
+  # boot.plymouth.enable = true;
+  # boot.plymouth.theme = "breeze";
+  # boot.kernelParams = ["quiet"];
   # boot.loader.systemd-boot.netbootxyz.enable = true;
   # boot.plymouth.themePackages = [ pkgs.nixos-bgrt-plymouth ];
   # boot.plymouth.theme = "nixos-bgrt";
diff --git a/hosts/nb-epicenter/hardware-configuration.nix b/hosts/nb-epicenter/hardware-configuration.nix
index bf3cde7..7f7c20f 100644
--- a/hosts/nb-epicenter/hardware-configuration.nix
+++ b/hosts/nb-epicenter/hardware-configuration.nix
@@ -8,36 +8,33 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi"; # ← use the same mount point here.
-    };
-    grub = {
-     device = "nodev";
-    };
-  };
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ];
   boot.extraModulePackages = [ ];
+# Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Setup keyfile
+  boot.initrd.secrets = {
+    "/crypto_keyfile.bin" = null;
+  };
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/15351aae-3efa-469f-aa3f-47f2b0ee44f7";
+    { device = "/dev/disk/by-uuid/7c6a872a-457c-40db-9426-d9137aea48a1";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."luks-bfd1b7ac-b7b8-4d86-b9d6-222e96ae66ec".device = "/dev/disk/by-uuid/bfd1b7ac-b7b8-4d86-b9d6-222e96ae66ec";
+  boot.initrd.luks.devices."luks-4a2ed977-1753-469b-b0d4-6d75996f21fc".device = "/dev/disk/by-uuid/4a2ed977-1753-469b-b0d4-6d75996f21fc";
 
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/711C-5E27";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/F4F2-7864";
       fsType = "vfat";
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d218dec3-1980-44c9-b39d-59136494f184"; }
-    ];
+  swapDevices = [ ];
 
   # 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