waybar: replace mullvad module with generic vpn module

can also detect if we use tailscale exit node

1 files changed, 24 insertions, 6 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index d30d87a..ae3f54c 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -104,9 +104,18 @@
     "return-type": "json"
   },
 
+  "custom/hotspots": {
+    "format": "{}",
+    "exec": "$HOME/.config/waybar/modules/hotspots.sh",
+    "on-click": "$HOME/.config/waybar/modules/hotspots.sh click",
+    "escape": true,
+    "interval": 600,
+    "return-type": "json"
+  },
+
   // ------------------------------------------------------------------------ //
   // "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "custom/gamma", "pulseaudio", "network#mullvad", "network#tailscale", "network", "battery"],
-  "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "custom/gamma", "pulseaudio", "network#mullvad", "network#tailscale", "network", "battery"],
+  "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "custom/gamma", "pulseaudio", "custom/vpn", "network#tailscale", "network", "battery"],
 
   "tray": {
     "spacing": 10
@@ -206,15 +215,24 @@
     "on-click": "swx -t -F '0.4' pulsemixer"
   },
 
-  "network#mullvad": {
-    "interface": "mlvd*",
-    "format": "󰒃",
-    "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
-    "tooltip-format-disconnected": "disconnected",
+  "custom/vpn": {
+    "exec": "${HOME}/.config/waybar/modules/vpn.sh",
+    "interval": 600,
+    "return-type": "json"
   },
+
+  // "network#mullvad": {
+  //   "interface": "mlvd*",
+  //   "format": "󰒃",
+  //   "format-disconnected": "",
+  //   "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
+  //   "tooltip-format-disconnected": "disconnected",
+  // },
+
   "network#tailscale": {
     "interface": "tailscale0",
     "format": "󰌆",
+    "format-disconnected": "",
     "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
     "tooltip-format-disconnected": "disconnected",
     "on-click": "doas rc-service tailscale start",