diff --git a/modules/nixos/hardware/keyboard.nix b/modules/nixos/hardware/keyboard.nix
index 4c23bee..0cfa11b 100644
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@@ -10,9 +10,12 @@
       autoRepeatDelay = 250;
       autoRepeatInterval = 40;
 
-      # Swap escape key with caps lock key
-      xkbOptions = "eurosign:e,caps:swapescape";
+    };
 
+    # Use capslock as escape and/or control
+    services.keyd = {
+      enable = true;
+      settings = { main = { capslock = "overload(control, esc)"; }; };
     };
 
     # Enable num lock on login