From 03ed77a40574e83dfe319ce86aa34c0c07b1a534 Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Mon, 7 Oct 2024 18:30:12 -0600
Subject: [PATCH] Added keyboard layout to Waybar in Sway

---
 .config/waybar/config    | 2 +-
 .config/waybar/modules   | 8 ++++++++
 .config/waybar/style.css | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.config/waybar/config b/.config/waybar/config
index 80213e9..ceb4385 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -6,7 +6,7 @@
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
     //"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
-    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "network", "battery", "clock", "tray"],
+    "modules-right": ["sway/language", "pulseaudio", "backlight", "idle_inhibitor", "network", "battery", "clock", "tray"],
 
     "include": "~/.config/waybar/modules",
 }
diff --git a/.config/waybar/modules b/.config/waybar/modules
index 45aea3f..ea680aa 100644
--- a/.config/waybar/modules
+++ b/.config/waybar/modules
@@ -13,6 +13,14 @@
         "tooltip": false
     },
 
+    "sway/language": {
+        "format": "[{short}-{shortDescription}{variant}]",
+        "tooltip-format": "{long}",
+        "on-click": "swaymsg input type:keyboard xkb_switch_layout next",
+        "max-length": 15,
+        "tooltip": true
+    },
+
     "hyprland/window": {
         "max-length": 80,
         "tooltip": false
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index f276f8d..4b088ef 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -46,7 +46,7 @@ window#waybar.solo {
     color:      rgba(238, 46, 36, 1);
 }
 
-#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-spotify, #custom-weather, #custom-mail {
+#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-spotify, #custom-weather, #custom-mail, #language {
     margin:     0px 6px 0px 10px;
     min-width:  15px;
 }