diff --git a/modules/desktop/hyprland/general.nix b/modules/desktop/hyprland/general.nix
index 8ddb0d2..7050314 100644
--- a/modules/desktop/hyprland/general.nix
+++ b/modules/desktop/hyprland/general.nix
@@ -38,9 +38,6 @@
         mouse_refocus = false;
         # keep-sorted end
 
-        # Swap caps lock and escape.
-        kb_options = "caps:swapescape";
-
         touchdevice.enable = false;
       };
 
diff --git a/modules/desktop/keyd.nix b/modules/desktop/keyd.nix
new file mode 100644
index 0000000..f002d70
--- /dev/null
+++ b/modules/desktop/keyd.nix
@@ -0,0 +1,14 @@
+{
+  flake.modules.nixos.keyd = {
+    services.keyd = {
+      enable = true;
+      keyboards.default = {
+        ids = ["*"];
+        settings.main = {
+          capslock = "esc";
+          esc = "capslock";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix
index d724e11..db8b1fd 100644
--- a/modules/profiles/personal.nix
+++ b/modules/profiles/personal.nix
@@ -11,6 +11,7 @@
       # Desktop
       # keep-sorted start block=yes
       hyprland
+      keyd
       noctalia
       polkit
       tablet