diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 27f01e0..ebad6d5 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,4 +3,7 @@
 {
   imports = [ ./apps ./bspwm ./polybar ./gtk.nix ];
   home-manager.users.moritz = { services.unclutter.enable = true; };
+  # Remap capslock to esc and shift + capslock to capslock
+  services.xserver.xkbOptions =
+    "terminate:ctrl_alt_bksp,caps:escape_shifted_capslock";
 }