waybar: various updates

* add extension to config file
* covid: use tail vs head for historical data
* remove network.vpn
* gamma: change name from gammastep

1 files changed, 18 insertions, 20 deletions

diff --git a/.config/waybar/config b/.config/waybar/config.jsonc
index 544661d..b117c3b 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config.jsonc
@@ -1,13 +1,13 @@
-// vim: ft=json commentstring=//\ %s
 {
     "layer": "top",
     "position": "top",
     "height": 25,
     "gtk-layer-shell": true,
 
-    "modules-left": ["sway/mode", "sway/workspaces", "sway/window", "custom/mpris"],
+    // "modules-left": ["sway/mode", "sway/workspaces", "sway/window", "custom/mpris"],
+    "modules-left": ["sway/mode", "sway/workspaces", "custom/mpris"],
     "modules-center": ["custom/weather", "clock#local", "clock#utc", "custom/toggl", "custom/todo"],
-    "modules-right": ["tray", "custom/covid", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "custom/gammastep", "pulseaudio", "network#vpn", "network#tailscale", "network", "battery"],
+    "modules-right": ["tray", "custom/covid", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "custom/gamma", "pulseaudio", "network#tailscale", "network", "battery"],
 
     "sway/workspaces": {
         "disable-scroll": true,
@@ -103,18 +103,10 @@
         "tooltip-format-disconnected": "disconnected",
         "on-click": "swx -t -f iwctl"
     },
-    "network#vpn": {
-        "interface": "wg0",
-        "format": "󰌆",
-        "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-        "tooltip-format-disconnected": "disconnected",
-        "on-click": "doas wg-quick up wg0",
-        "on-click-right": "doas wg-quick down wg0"
-    },
     "network#tailscale": {
         "interface": "tailscale0",
-        "format": "󰀘",
-        "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
+        "format": "󰌆",
+        "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
         "tooltip-format-disconnected": "disconnected",
         "on-click": "doas rc-service tailscale start",
         "on-click-right": "doas rc-service tailscale stop"
@@ -163,17 +155,17 @@
         "escape": true,
         "return-type": "json"
     },
-    "custom/gammastep": {
+    "custom/gamma": {
         "format": "{icon}",
         "format-icons": {
             "day": "󰱌",
             "night": "󰱊"
         },
-        "exec-if": "pgrep gammastep",
-        "exec": "$HOME/.config/waybar/modules/waybar-gammastep",
+        "exec-if": "pgrep wlsunset",
+        "exec": "env GAMMA_COMMAND='wlsunset -l $HOME_LAT -L $HOME_LON -p' $HOME/.config/waybar/modules/waybar-gamma",
         "return-type": "json",
-        "on-click": "pkill -x -USR1 gammastep",
-        "on-click-right": "pkill -x -HUP waybar-gammastep"
+        "on-click": "pkill -x -USR1 gamma",
+        "on-click-right": "pkill -x -HUP waybar-gamma"
     },
     "custom/weather": {
         "format": "{icon} {percentage}℃",
@@ -197,7 +189,7 @@
         "tooltip": true,
         // "signal": 4,
         // "on-click-right": "pkill -SIGRTMIN+5 waybar",
-        "on-click": "swx -t env REPORT=1 $HOME/.config/waybar/modules/weather.sh Berlin"
+        "on-click": "swx -t env REPORT=1 $HOME/.config/waybar/modules/weather.sh"
     },
     "custom/covid": {
         "format": "{icon} {}",
@@ -214,5 +206,11 @@
         "interval": 86400,
         "tooltip": true,
         "return-type": "json"
-    }
+    },
+    // "custom/im": {
+    //     "format": "{}",
+    //     "exec": "printf '󱌵󱌴'",
+    //     "exec-if": "pgrep anthywl",
+    //     "interval": 5
+    // }
 }