1 files changed, 13 insertions, 38 deletions
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 23d8826..d19ed54 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -15,12 +15,10 @@
     // "custom/packages",
     "custom/news",
     "custom/torrent",
+    "custom/weather",
     "cpu#usage",
     // "cpu#bars",
     "custom/memory",
-    "custom/leftsep",
-    "custom/rainchance",
-    "custom/weather",
     "custom/mailbox",
     "wireplumber#source",
     "wireplumber#sink",
@@ -132,6 +130,18 @@
     "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/bin/statusbar/src/sttorrent.c"
   },
 
+  "custom/weather" : {
+    "cursor": false,
+    "tooltip": false,
+    "format": "[ {} ]",
+    "signal": 5,
+    "exec" : "stweath",
+    "interval" : 400,
+    "on-click-right": "notify-send \" Weather module\" \"\\- Middle click to update forecast.\n: Chance of rain/snow\n: Current temperature\"",
+    "on-click-middle": "WEATHERFORCEUPDATE=1 stweath",
+    "on-click-backward": "setsid -f \"$TERMINAL\" -e $EDITOR ~/.local/bin/statusbar/src/stweath.c"
+  },
+
   "cpu#usage" : {
     "cursor": false,
     "tooltip": false,
@@ -182,41 +192,6 @@
     "on-click-backward": "BLOCK_BUTTON=8 sb-doppler"
   },
 
-  "custom/leftsep" : {
-    "cursor": false,
-    "tooltip": false,
-    "format": "[ "
-  },
-
-  "custom/rainchance" : {
-    "cursor": false,
-    "tooltip": false,
-    "hide-empty-text": true,
-    "format": "{}",
-    "signal": 5,
-    "exec" : "sb-weather rain",
-    "interval" : 18000,
-    "on-click": "BLOCK_BUTTON=1 sb-weather rain",
-    "on-click-right": "BLOCK_BUTTON=3 sb-weather rain",
-    "on-click-middle": "BLOCK_BUTTON=2 sb-weather rain",
-    "on-click-backward": "BLOCK_BUTTON=8 sb-weather rain",
-    "return-type": "json"
-  },
-
-  "custom/weather" : {
-    "cursor": false,
-    "tooltip": false,
-    "format": "{} ]",
-    "signal": 5,
-    "exec" : "sb-weather weather",
-    "interval" : 400,
-    "on-click": "BLOCK_BUTTON=1 sb-weather weather",
-    "on-click-right": "BLOCK_BUTTON=3 sb-weather weather",
-    "on-click-middle": "BLOCK_BUTTON=2 sb-weather weather",
-    "on-click-backward": "BLOCK_BUTTON=8 sb-weather weather",
-    "return-type": "json"
-  },
-
   "custom/mailbox" : {
     "cursor": false,
     "tooltip": false,