diff --git a/config/Sway.nix b/config/Sway.nix
index bf86572..c2dc225 100644
--- a/config/Sway.nix
+++ b/config/Sway.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
@@ -21,7 +20,7 @@ in
     };
     programs.sway = {
       enable = true;
-      extraPackages = with pkgs; [ swaykbdd ];
+      xwayland.enable = true;
       wrapperFeatures = {
         base = true;
         gtk = true;
diff --git a/package/default.nix b/package/default.nix
index a7fa691..95ff664 100644
--- a/package/default.nix
+++ b/package/default.nix
@@ -100,6 +100,7 @@
     slurp # Screen selection.
     swappy # Screenshot editing.
     sway # Sway WM.
+    swaykbdd # Keyboard layout per-window.
     waybar # Sway bar.
     wf-recorder # Screen recording.