diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index a7fbf56..20a2c27 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -48,8 +48,6 @@ in
     };
   };
   specialisation = {
-    shell-only.configuration = {
-    };
     gnome.configuration = {
       imports = [ ../../environments/gnome.nix ];
       services.flatpak.enable = true;
diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix
index c525cc8..965769f 100644
--- a/hosts/workstation/hardware-configuration.nix
+++ b/hosts/workstation/hardware-configuration.nix
@@ -24,25 +24,18 @@ in
       cpuModelId = "00A50F00";
     };
   };
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings.General = {
-        Enable = "Source,Sink,Media,Socket";
-        Experimental = true;
-      };
-    };
-    opentabletdriver = {
-      enable = true;
-      daemon.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    settings.General = {
+      Enable = "Source,Sink,Media,Socket";
+      Experimental = true;
     };
   };
   boot = {
     plymouth.enable = true;
     consoleLogLevel = 0;
-    loader.timeout = 0;
+    loader.timeout = 5;
     kernelParams = [
-      "quiet"
       "splash"
       "boot.shell_on_fail"
       "loglevel=3"
@@ -84,17 +77,11 @@ in
         "usb_storage"
         "sd_mod"
       ];
-      luks.devices =
-        let
-          decryptLuks = uuid: {
-            device = getUUID uuid;
-            keyFile = "/keyfile";
-            preLVM = true;
-          };
-        in
-        {
-          nvme = decryptLuks "e9618e85-a631-4374-b2a4-22c376d6e41b";
-        };
+      luks.devices.nvme = {
+        device = getUUID "e9618e85-a631-4374-b2a4-22c376d6e41b";
+        keyFile = "/keyfile";
+        preLVM = true;
+      };
     };
   };
   fileSystems =