1 files changed, 22 insertions, 41 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 050f3fe..70ab60f 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,5 +1,5 @@
 {
-  "modules-left": ["sway/mode", "sway/workspaces", "river/tags", "mpris"],
+  "modules-left": ["sway/mode", "sway/workspaces", "mpris"],
 
   "sway/workspaces": {
     "format": "{icon}",
@@ -23,25 +23,17 @@
     "max-width": 60,
     "format": "{player_icon} {dynamic}",
     "format-paused": "{status_icon} <i>{dynamic}</i>",
-    "format-icons": {
+    "player-icons": {
       "default": "󰲸",
-
+      // "firefox": "X",
+      // "mpv": "XX",
+    },
+    "status-icons": {
       "paused": "󰏤",
       "playing": "",
       "stopped": "",
     }
   },
-  // "custom/mpris": {
-  //   "max-width": 60,
-  //   "on-click": "playerctl play-pause",
-  //   "on-click-right": "playerctl next",
-  //   // "exec": "env YAEGI_SYSCALL=1 YAEGI_UNRESTRICTED=1 ${HOME}/.config/waybar/modules/mpris.go",
-  //   // "interval": "once",
-  //   "retart-interval": 1,
-  //   "exec": "${HOME}/.config/waybar/modules/mpris.sh",
-  //   "return-type": "json",
-  //   "signal": 4,
-  // },
 
   // ------------------------------------------------------------------------ //
 
@@ -119,8 +111,7 @@
   },
 
   // ------------------------------------------------------------------------ //
-  // "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", "custom/vpn", "network#tailscale", "network", "battery"],
+  "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "pulseaudio", "custom/vpn", "network#tailscale", "network", "battery"],
 
   "tray": {
     "icon-size": 15,
@@ -156,20 +147,20 @@
 
   "cpu": {
     "format": "{icon} {usage}%",
-    "format-icons": ["󰊚"],
+    "format-icons": ["󰊚", "󰀦"],
     "on-click": "$HOME/bin/swx -t -- btop"
   },
 
   "memory": {
     "format": "{icon} {percentage}%",
-    "format-icons": ["󰍛"],
+    "format-icons": ["󰘚", "󰀦"], // 󰍛
     "on-click": "$HOME/bin/swx -t -- btop"
   },
 
   "temperature": {
     "critical-threshold": 100,
     "format": "{icon} {temperatureC}℃",
-    "format-icons": ["󱃃", "󰔏", "󱃂", "󰸁"]
+    "format-icons": ["󱃃", "󰔏", "󰸁", "󱜜"]
   },
 
   "idle_inhibitor": {
@@ -181,8 +172,9 @@
   },
 
   "backlight": {
+    "device": "auto",
     "format": "{icon}",
-    "format-icons": ["󰹐", "󰌶", "󰛩"],
+    "format-icons": ["󰹐", "󰌶", "󰛩", "󰖧"],
     "on-scroll-down": "light -A 5",
     "on-scroll-up": "light -U 5",
     // save current level
@@ -206,10 +198,8 @@
 
   "pulseaudio": {
     "format": "{icon} {volume}%",
-    "format-bluetooth": "{icon} {volume}%",
+    "format-bluetooth": "{icon}󰂯 {volume}%",
     "format-muted": "󰝟 {volume}%",
-    "format-source": "󰍬 {volume}%",
-    "format-source-muted": " {volume}%",
     "format-icons": {
       "easyeffects_sink": "󰺢",
       "headphones": "󰋋",
@@ -228,49 +218,40 @@
   "custom/vpn": {
     "exec": "${HOME}/.config/waybar/modules/vpn.sh",
     "interval": 600,
-    "return-type": "json"
+    "return-type": "json",
+    "on-click": "${HOME}/.config/waybar/modules/vpn.sh toggle",
   },
 
-  // "network#mullvad": {
-  //   "interface": "mlvd*",
-  //   "format": "󰒃",
-  //   "format-disconnected": "",
-  //   "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
-  //   "tooltip-format-disconnected": "disconnected",
-  // },
-
   "network#tailscale": {
     "interface": "tailscale0",
     "format": "󰌆",
-    "format-disconnected": "",
+    "format-disconnected": "󰌊",
     "tooltip-format": "{ifname}: {bandwidthUpBits} {bandwidthDownBits}",
     "tooltip-format-disconnected": "disconnected",
-    "on-click": "doas rc-service tailscale start",
-    "on-click-right": "doas rc-service tailscale stop"
+    "on-click": "${HOME}/.config/waybar/modules/tailscale.sh toggle",
   },
 
   "network": {
-    "format-wifi": "{icon} ({signalStrength}%)",
+    "format-wifi": "{icon} {signalStrength}%",
     "format-icons": ["󰤫", "󰤟", "󰤢", "󰤥", "󰤨"],
     "format-ethernet": "󰌗",
     "format-linked": "󰈀 {ifname}",
     "format-disconnected": "󰌙 ",
     "tooltip-format": "{ifname}: {ipaddr}/{cidr}\ngateway: {gwaddr}\nssid: {essid}\nsignal: {signaldBm} dbm\ndown: {bandwidthDownBits}\nup: {bandwidthUpBits}",
     "tooltip-format-disconnected": "disconnected",
-    "on-click": "notify-send 'Connecting...' && doas rc-service iwd start && swx -t -f iwctl",
+    // cycles through wifi/ethernet/off
+    // "on-click": "${HOME}/.config/waybar/modules/network.sh toggle",
   },
 
   "battery": {
     "states": {
-      "good": 95,
+      "good": 90,
       "warning": 30,
       "critical": 15
     },
     "format": "{icon} {capacity}%",
     "format-charging": "󰗱 {capacity}%",
-    "format-plugged": "󰚥 {capacity}%",
-    "format-alt": "{icon} {time}",
-    "format-full": "󱊦",
+    "format-full-charging": "󱊦",
     "format-icons": ["󱃍", "󱊡", "󱊢", "󱊣"]
   },
 }