diff --git a/servers/eisen/configuration.nix b/servers/eisen/configuration.nix
index 6c675d9..0c9e074 100644
--- a/servers/eisen/configuration.nix
+++ b/servers/eisen/configuration.nix
@@ -35,7 +35,7 @@ in
     enable = true;
     enableOnBoot = false;
   };
-  hardware.nvidia-container-toolkit.enable = true;
+  # hardware.nvidia-container-toolkit.enable = true;
   services.avahi.enable = true;
 
   services.syncthing = {
@@ -57,12 +57,12 @@ in
     kernel.sysctl."kernel.sysrq" = 1;
 
     kernelParams = [
-        "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915"
         "initcall_blacklist=sysfb_init"
-        "quiet"
-        "splash"
         "boot.shell_on_fail"
         "loglevel=3"
+        "console=tty1"
+        "console=ttyS0"
+        "nomodeset"
         "rd.systemd.show_status=false"
         "rd.udev.log_level=3"
         "udev.log_priority=3"
@@ -74,12 +74,12 @@ in
     initrd.systemd.enable = true;
 
     loader = {
-      # systemd-boot.enable = true;
+      systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
       # timeout = 0;
-      grub.enable = true;
-      grub.device = "nodev";
-      grub.efiSupport = true;
+      # grub.enable = true;
+      # grub.device = "nodev";
+      # grub.efiSupport = true;
     };
   };
 
diff --git a/servers/eisen/hardware-configuration.nix b/servers/eisen/hardware-configuration.nix
index 406a895..27a06d9 100644
--- a/servers/eisen/hardware-configuration.nix
+++ b/servers/eisen/hardware-configuration.nix
@@ -14,18 +14,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/75e11f37-3cc3-495d-b729-4adbb827e3cb";
+    { device = "/dev/disk/by-uuid/fe65265a-b697-465e-adc5-c16fc530120c";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/FBA4-A782";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/f524b04d-6176-45dd-aad4-9f4345b1d8f6"; }
+    [ { device = "/dev/disk/by-uuid/5b8135fa-a393-433f-818f-4feb018d1080"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking