4 files changed, 39 insertions, 10 deletions
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index cc7c62e..0df79ea 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -1,5 +1,5 @@
 {
-  "height": 32,
+  "height": 38,
   "position": "top",
   "modules-left": [
     "niri/workspaces",
@@ -12,11 +12,12 @@
     "idle_inhibitor",
     "custom/mullvad",
     "custom/tailscale",
-    "pulseaudio",
+    "wireplumber",
     "custom/builds",
     "power-profiles-daemon",
     "battery",
     "network",
+    "bluetooth",
     "clock",
     "tray",
     "custom/power"
@@ -54,6 +55,12 @@
     "format-icons": ["․", ":", "⸪", "⁛"],
     "on-click-right": "kitty nmtui"
   },
+  "bluetooth": {
+    "format": "",
+    "format-disabled": "⌿",
+    "format-off": "⌿",
+    "on-click": "blueman-manager"
+  },
   "custom/builds": {
     "format": "{text}",
     "exec": "~/AppConfig/waybar/sourcehut.sh",
@@ -72,7 +79,7 @@
       "power-saver": "⊟"
     }
   },
-  "pulseaudio": {
+  "wireplumber": {
       // "scroll-step": 1, // %, can be a float
       "format": "{volume} {icon} {format_source}",
       "format-bluetooth": "{volume} {icon} {format_source}",
@@ -109,6 +116,7 @@
     "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}STP",
     "unknown-tag": "N/A",
     "interval": 5,
+    "timeout": "5",
     "consume-icons": {
       "on": " "
     },
@@ -129,6 +137,9 @@
     "tooltip-format": "{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}%",
     "tooltip-format-disconnected": "MPD (disconnected)"
   },
+  "niri/language": {
+    "format": "{short}"
+  },
   "custom/tailscale" : {
     "exec": "~/.config/waybar/scripts/tailscale.sh --status",
     "on-click": "exec ~/.config/waybar/scripts/tailscale.sh --toggle",
@@ -144,7 +155,7 @@
   },
   "custom/mullvad" : {
     "exec": "~/.config/waybar/scripts/mullvad.sh --status",
-    "on-click": "exec ~/.config/waybar/scripts/mullvad.sh --toggle",
+    "on-click": "~/.config/waybar/scripts/mullvad.sh --toggle",
     "exec-on-event": true,
     "format": "<span font-weight='900'>  {icon}  </span>",
     "format-icons": {
diff --git a/config/waybar/scripts/mullvad.sh b/config/waybar/scripts/mullvad.sh
index f73cf5b..e02bb2f 100755
--- a/config/waybar/scripts/mullvad.sh
+++ b/config/waybar/scripts/mullvad.sh
@@ -17,7 +17,6 @@ toggle_status () {
     else
         mullvad connect
     fi
-    sleep 5
 }
 
 case $1 in
diff --git a/config/waybar/scripts/tailscale.sh b/config/waybar/scripts/tailscale.sh
index e2e1deb..29fd055 100755
--- a/config/waybar/scripts/tailscale.sh
+++ b/config/waybar/scripts/tailscale.sh
@@ -17,7 +17,6 @@ toggle_status () {
     else
         tailscale up
     fi
-    sleep 5
 }
 
 case $1 in
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 31aa341..64600b4 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -4,14 +4,15 @@
 }
 
 window#waybar {
-  background-color: #FFFFFA;
   color: #0F261F;
+  background: rgba(0,0,0,0);
   transition-property: background-color;
   transition-duration: .5s;
 }
 
 #waybar > box {
   border-bottom: 1px solid #000000;
+  background-color: #FFFFFA;
 }
 
 window #waybar.hidden {
@@ -19,18 +20,19 @@ window #waybar.hidden {
 }
 
 button {
+    border: 0;
     border-radius: 0;
+    padding: 0 8px;
     transition-property: background-color;
     transition-duration: .1s;
 }
 
 button:hover {
-    background: #4F8FE6;
+    box-shadow: none;
 }
 
 #workspaces button {
     color: #8096A2;
-    padding: 0 8px;
     background-color: transparent;
 }
 
@@ -51,6 +53,7 @@ button:hover {
 
 #clock,
 #battery,
+#bluetooth,
 #cpu,
 #memory,
 #disk,
@@ -66,6 +69,7 @@ button:hover {
 #idle_inhibitor,
 #scratchpad,
 #power-profiles-daemon,
+#language,
 #mpd {
     padding: 0 8px;
 }
@@ -85,7 +89,7 @@ button:hover {
 }
 
 #power-profiles-daemon {
-  padding-right: 10px;
+  padding: 0 9px;
 }
 
 #power-profiles-daemon.performance {
@@ -110,13 +114,25 @@ button:hover {
 
 #idle_inhibitor.activated {
     background: #4F8FE6;
+    color: #FFF;
+}
+
+#language {
+  color: #0F261F;
+  background-color: #FFFFFF;
 }
+
 #mpd {
   color: #0F261F;
   background-color: #FAED8F;
   margin-right: 8px;
 }
 
+#custom-mullvad,
+#custom-tailscale {
+  padding: 0 2px;
+}
+
 #custom-tailscale.connected {
   color: #0F261F;
   background-color: #80FFCC;
@@ -127,6 +143,10 @@ button:hover {
   background-color: #90A6A2;
 }
 
+#custom-mullvad {
+  padding-bottom: 3px;
+}
+
 #custom-mullvad.connected {
   color: #0F261F;
   background-color: #FFB4F0;