From 390fd260371dd0464d060b7b4ac02dc7c5cb997b Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Sun, 21 Jun 2026 21:16:18 +0200
Subject: [PATCH] feat: write, import weather module, correct volume text

---
 modules/home/waybar/default.nix | 16 +++++++++-------
 modules/home/waybar/scripts.nix | 21 +++++++++------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index f09e2f0..ddb45d2 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -28,6 +28,7 @@
             "sway/workspaces",
             "hyprland/workspaces",
             "sway/mode",
+            "custom/weather",
             "tray",
           ],
 
@@ -60,6 +61,13 @@
             "separate-outputs": true
           },
 
+          "custom/weather": {
+            "format": "{text}",
+            "return-type": "text",
+            "exec": "~/.local/bin/waybar-weather",
+            "interval": 1800
+          },
+
           "sway/workspaces": {
             "all-outputs": true,
             "disable-scroll": true,
@@ -263,11 +271,9 @@
           },
 
           "wireplumber": {
-            "format": "{icon}  {node_name}/{volume}",
-            "format-muted": "",
+            "format": "<span color='#aaaaaa'>VOL:</span> {node_name}/{volume}",
             "on-click": "pavucontrol-qt",
             "on-click-right": "helvum",
-            "format-icons": ["", "", ""]
           },
 
           "custom/audio-internal": {
@@ -365,10 +371,6 @@
           "clock#time": {
             "interval": 60,
             "format": "<span color='#aaaaaa'>CEST:</span> {:%I:%M %p}",
-            "actions":  {
-              "on-scroll-up": "tz_up",
-              "on-scroll-down": "tz_down"
-            }
           },
 
           "custom/clock#minutes": {
diff --git a/modules/home/waybar/scripts.nix b/modules/home/waybar/scripts.nix
index 9a2627f..33a521d 100644
--- a/modules/home/waybar/scripts.nix
+++ b/modules/home/waybar/scripts.nix
@@ -218,18 +218,7 @@
       text = ''
         #!/usr/bin/env zsh
 
-        if [[ -f /sys/class/power_supply/BAT1/status && "$(cat /sys/class/power_supply/BAT1/status)" == "Discharging" ]]; then; cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'; fi
-      '';
-    };
-    "/home/${username}/.local/bin/waybar-vpn" = {
-      # unused nowadays
-      executable = true;
-      text = ''
-        #!/usr/bin/env bash
-
-        ip route | grep -q '10.7.0.0' \
-        && echo '{"text":"Connected","class":"connected","percentage":100}' \
-        || echo '{"text":"Disconnected","class":"disconnected","percentage":0}'
+        cat /sys/class/power_supply/*/current_now /sys/class/power_supply/*/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'
       '';
     };
     "/home/${username}/.local/bin/waybar-mullvad" = {
@@ -249,6 +238,14 @@
         echo "$TEXT"
       '';
     };
+    "/home/${username}/.local/bin/waybar-weather" = {
+      executable = true;
+      text = ''
+        #!/usr/bin/env sh
+
+        mullvad-exclude curl 'wttr.is?format=%c+(%p)+%t+(%f)+%w+(%S,+%s)\n'
+      '';
+    };
   };
   home.packages = with pkgs; [
     wf-recorder