6 files changed, 25 insertions, 20 deletions
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
index 91bc737e1968..ab38b9a770f6 100644
--- a/modules/workstation/default.nix
+++ b/modules/workstation/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../nix ../locale ../shell ../users ../ssh
-    ./windowing ./fonts ./yubikey ./hardware
+    ./windowing ./fonts ./hardware
     ./dict ./gnupg ./mail ./podman ./weechat
   ];
 
diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix
index 9f66bdba99c4..dfb9d6c1b7c5 100644
--- a/modules/workstation/hardware/default.nix
+++ b/modules/workstation/hardware/default.nix
@@ -1,24 +1,7 @@
-{ pkgs, config, ... }:
+{ ... }:
 
-let
-  xcfg = config.services.xserver;
-
-in
 {
-  i18n.consoleUseXkbConfig = true;
-  services.xserver.layout = "dvorak";
-  services.xserver.xkbOptions = "ctrl:nocaps,compose:menu";
-
-  environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout;
-  environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions;
-
-  services.evscript.enable = true;
-  services.evscript.script = ./events.dyon;
-
-  boot.postBootCommands = ''
-    # Remap tab to left super
-    /run/current-system/sw/bin/setkeycodes 0f 125
-  '';
+  imports = [ ./keyboard ./yubikey ];
 
   sound.enable = true;
 }
diff --git a/modules/workstation/hardware/MAPPINGS b/modules/workstation/hardware/keyboard/MAPPINGS
index 60ded39c8cf1..60ded39c8cf1 100644
--- a/modules/workstation/hardware/MAPPINGS
+++ b/modules/workstation/hardware/keyboard/MAPPINGS
diff --git a/modules/workstation/hardware/keyboard/default.nix b/modules/workstation/hardware/keyboard/default.nix
new file mode 100644
index 000000000000..d2b13640277c
--- /dev/null
+++ b/modules/workstation/hardware/keyboard/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, config, ... }:
+
+let
+  xcfg = config.services.xserver;
+
+in
+{
+  i18n.consoleUseXkbConfig = true;
+  services.xserver.layout = "dvorak";
+  services.xserver.xkbOptions = "ctrl:nocaps,compose:menu";
+
+  environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout;
+  environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions;
+
+  services.evscript.enable = true;
+  services.evscript.script = ./events.dyon;
+
+  boot.postBootCommands = ''
+    # Remap tab to left super
+    /run/current-system/sw/bin/setkeycodes 0f 125
+  '';
+}
diff --git a/modules/workstation/hardware/events.dyon b/modules/workstation/hardware/keyboard/events.dyon
index 96cc15450e46..96cc15450e46 100644
--- a/modules/workstation/hardware/events.dyon
+++ b/modules/workstation/hardware/keyboard/events.dyon
diff --git a/modules/workstation/yubikey/default.nix b/modules/workstation/hardware/yubikey/default.nix
index 7f314bd5cbee..7f314bd5cbee 100644
--- a/modules/workstation/yubikey/default.nix
+++ b/modules/workstation/hardware/yubikey/default.nix