diff --git a/programs/sway.nix b/programs/sway.nix
index df86375..c29d0b6 100644
--- a/programs/sway.nix
+++ b/programs/sway.nix
@@ -27,7 +27,7 @@ in {
         click_method = "clickfinger";
         scroll_factor = "0.5";
       };
-      "*" = {
+      "type:keyboard" = {
         xkb_layout = "ca,ca";
         xkb_variant = ",eng";
       };
diff --git a/programs/waybar.nix b/programs/waybar.nix
index 21bcd11..abc93bc 100644
--- a/programs/waybar.nix
+++ b/programs/waybar.nix
@@ -79,11 +79,11 @@ in {
       icon-size = 20;
       spacing = 5;
     };
-    "sway/language" = {
-      format = "eriuu";
-      tooltip-format = "boofer";
-      on-click = ''swaymsg input "*" xkb_switch_layout next'';
-    };
+    # "sway/language" = {
+    #   format = "eriuu";
+    #   tooltip-format = "boofer";
+    #   on-click = ''swaymsg input "*" xkb_switch_layout next'';
+    # };
     clock = {
       interval = 1;
       format = "<span size='10pt' font='Red Hat Mono'>{:L%H:%M:%S %a %F}</span>";