diff --git a/flakes/de_plasma/de_plasma.nix b/flakes/de_plasma/de_plasma.nix
index 42bba548..87958a8b 100644
--- a/flakes/de_plasma/de_plasma.nix
+++ b/flakes/de_plasma/de_plasma.nix
@@ -39,8 +39,6 @@ in
       description = "Enable SDDM Wayland and Plasma Wayland session.";
     };
 
-    disableKeyd = lib.mkEnableOption "Disable keyd service for Plasma";
-
     appearance.dark.enable = mkOption {
       type = types.bool;
       default = true;
@@ -158,14 +156,9 @@ in
       services.xserver.xkb = {
         layout = "us";
       };
-      services.keyd = mkIf (!cfg.disableKeyd) {
-        enable = true;
-        keyboards.default.settings = {
-          main = {
-            capslock = "escape";
-          };
-        };
-      };
+
+      # CapsLock → Escape remap (works on Plasma Wayland)
+      services.xserver.xkb.options = lib.mkDefault "caps:escape";
 
       # Home Manager modules (plasma-manager + our HM layer)
       home-manager.sharedModules = [
diff --git a/flakes/opencode/flake.lock b/flakes/opencode/flake.lock
index 9821db5b..ad4c4d81 100644
--- a/flakes/opencode/flake.lock
+++ b/flakes/opencode/flake.lock
@@ -21,11 +21,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1767556352,
-        "narHash": "sha256-iYP/fa9guprb2hn8ONJrJe6U076zbeKHdqyyL0gvH8s=",
+        "lastModified": 1767719914,
+        "narHash": "sha256-xAQhyRB/tDIH7nkWdJVYCP6xFFfHoOP29RF8T6bmYDI=",
         "owner": "sst",
         "repo": "opencode",
-        "rev": "c545fa2a289518fda35be66d1c81936a54962702",
+        "rev": "1016a52cf1c28656ddd5c66689cf97b6d028c2f6",
         "type": "github"
       },
       "original": {
diff --git a/hosts/juni/flake.lock b/hosts/juni/flake.lock
index 6c939097..fb8036e5 100644
--- a/hosts/juni/flake.lock
+++ b/hosts/juni/flake.lock
@@ -6,11 +6,11 @@
       },
       "locked": {
         "dir": "flakes/beszel",
-        "lastModified": 1767575724,
-        "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
-        "revCount": 1041,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -39,11 +39,11 @@
     "common": {
       "locked": {
         "dir": "flakes/common",
-        "lastModified": 1767678258,
-        "narHash": "sha256-UIbi/8BEJnasj3yVK+I4Y2Gqxq7Li86rb8iuzWrNfco=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "d04f85587471ab83afeb18bc94e7e01dcfc3135b",
-        "revCount": 1062,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -59,11 +59,11 @@
       },
       "locked": {
         "dir": "flakes/de_plasma",
-        "lastModified": 1767575724,
-        "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
-        "revCount": 1041,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -79,11 +79,11 @@
       },
       "locked": {
         "dir": "flakes/flatpaks",
-        "lastModified": 1767575724,
-        "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
-        "revCount": 1041,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
@@ -120,11 +120,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1767514898,
-        "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=",
+        "lastModified": 1767619900,
+        "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f",
+        "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
         "type": "github"
       },
       "original": {
@@ -1147,11 +1147,11 @@
       },
       "locked": {
         "dir": "flakes/opencode",
-        "lastModified": 1767575724,
-        "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
-        "revCount": 1041,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },
diff --git a/hosts/juni/flake.nix b/hosts/juni/flake.nix
index 9449070e..194790ed 100644
--- a/hosts/juni/flake.nix
+++ b/hosts/juni/flake.nix
@@ -19,8 +19,8 @@
     flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks";
     # beszel.url = "path:../../flakes/beszel";
     beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
-    # de_plasma.url = "path:../../flakes/de_plasma";
-    de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
+    de_plasma.url = "path:../../flakes/de_plasma";
+    # de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
     # opencode.url = "path:../../flakes/opencode";
     opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode";
 
diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock
index 7d0e93e7..e8796861 100644
--- a/hosts/lio/flake.lock
+++ b/hosts/lio/flake.lock
@@ -1237,11 +1237,11 @@
       },
       "locked": {
         "dir": "flakes/opencode",
-        "lastModified": 1767587784,
-        "narHash": "sha256-xHZwNiDUshkQg1yUu+RFdkFAa8jj0XkAFpZjuUqi0wo=",
+        "lastModified": 1767719747,
+        "narHash": "sha256-1ISVytokGTCP7MvZPpMBO2bT+/VY3mxjZdWx9BcdzlE=",
         "ref": "refs/heads/master",
-        "rev": "effa01310bfe91ef7a39a035f021a0dc4e345e58",
-        "revCount": 1042,
+        "rev": "c90766c206e859d3eb2b273b43ef713426849d48",
+        "revCount": 1067,
         "type": "git",
         "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
       },