From 67f674ac680860ce1251f2043af85ffccb1787d1 Mon Sep 17 00:00:00 2001
From: Andre Ramnitz <tux.rising@gmail.com>
Date: Sat, 2 Nov 2024 00:04:14 +0100
Subject: [PATCH] waybar: minimize usage of <span>-tags in format strings

until we find a way to dynamically select between dark and light
foreground when running a non-dark theme.
---
 dot-config/waybar/config.jsonc | 63 +++++++++++++---------------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/dot-config/waybar/config.jsonc b/dot-config/waybar/config.jsonc
index ca72ce44..b315b29d 100644
--- a/dot-config/waybar/config.jsonc
+++ b/dot-config/waybar/config.jsonc
@@ -77,7 +77,8 @@
     "tooltip": false
   },
   "hyprland/language": {
-    "format": " <span color='#efefef'>󰌌</span> {} ",
+    //"format": " <span color='#efefef'>󰌌</span> {} ",
+    "format": " 󰌌 {} ",
     "format-en": "en",
     "format-de": "de"
   },
@@ -158,35 +159,41 @@
     "spacing": 8
   },
   "cpu": {
-    "format": "<span color='#efefef'>{usage:2}%</span> ",
+    //"format": "<span color='#efefef'>{usage:2}%</span> ",
+    "format": "{usage:2}% ",
     "on-click": "footclient -a popup btop -p 3",
     "interval": 1
   },
   "memory": {
-    "format": "<span color='#efefef'>{percentage:2}%</span> 󰳿",
+    //"format": "<span color='#efefef'>{percentage:2}%</span> 󰳿",
+    "format": "{percentage:2}% 󰳿",
     "on-click": "footclient -a popup btop -p 4",
     "interval": 1
   },
   "temperature#water": {
     "hwmon-path": "/dev/sensors/aquastream/temp2_input",
     "critical-threshold": 42,
-    "format": "<span color='#efefef'>{temperatureC}°C</span> 󰞍",
+    //"format": "<span color='#efefef'>{temperatureC}°C</span> 󰞍",
+    "format": "{temperatureC}°C 󰞍",
     "on-click-right": "foot -a popup /usr/local/bin/fan2go-tui"
   },
   "temperature#cpu": {
     "hwmon-path": "/dev/sensors/k10temp/temp1_input",
     "critical-threshold": 95,
-    "format": "<span color='#efefef'>{temperatureC}°C</span> "
+    //"format": "<span color='#efefef'>{temperatureC}°C</span> "
+    "format": "{temperatureC}°C "
   },
   "temperature#board": {
     "hwmon-path": "/dev/sensors/nct6799/temp1_input",
     "critical-threshold": 85,
-    "format": "<span color='#efefef'>{temperatureC}°C</span> 󰇅"
+    //"format": "<span color='#efefef'>{temperatureC}°C</span> 󰇅"
+    "format": "{temperatureC}°C 󰇅"
   },
   "temperature#gpu": {
     "hwmon-path": "/dev/sensors/gpudedicated/temp1_input",
     "critical-threshold": 110,
-    "format": "<span color='#efefef'>{temperatureC}°C</span> 󰍹"
+    //"format": "<span color='#efefef'>{temperatureC}°C</span> 󰍹"
+    "format": "{temperatureC}°C 󰍹"
   },
   "network": {
     "interface": "wlan0*",
@@ -197,32 +204,10 @@
     "format-disconnected": "⚠ ",
     "format-alt": "{ifname}: {ipaddr}/{cidr}"
   },
-  "pulseaudio": {
-    "scroll-step": 5,
-    "format": "{volume} {icon} {format_source}",
-    "format-bluetooth": "{icon} {volume}% {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
-    "format-muted": "  {format_source}",
-    "format-source": "{volume} ",
-    "format-source-muted": "",
-    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": [
-        "",
-        "",
-        ""
-      ]
-    },
-    "on-click": "pavucontrol"
-  },
   "wireplumber": {
     "scroll-step": 5,
-    "format": "<span color='#efefef'>{volume}</span> {icon}",
+    //"format": "<span color='#efefef'>{volume}</span> {icon}",
+    "format": "{volume} {icon}",
     "format-bluetooth": "{icon} {volume}%",
     "format-bluetooth-muted": " {icon}",
     "format-muted": " ",
@@ -301,29 +286,27 @@
     "tooltip": false,
     "interval": "once"
   },
-  "custom/spacer": {
-    "format": " ",
-    "max-length": 30,
-    "tooltip": false
-  },
   "custom/gammarelay-temperature": {
-    "format": "<span color='#efefef'>{}</span> ",
+    //"format": "<span color='#efefef'>{}</span> ",
+    "format": "{} ",
     "exec": "wl-gammarelay-rs watch {t}",
     "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n +100",
     "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100",
-    "on-click-middle": "$HOME/.config/hypr/scripts/gammarelay-auto-temp.py > /dev/null 2>&1 &",
+    "on-click-middle": "/home/andy/.config/hypr/scripts/gammarelay-auto-temp.py > /dev/null 2>&1 &",
     "on-click-right": "pkill -f '/usr/lib/python-exec/python3.12/python /home/andy/.config/hypr/scripts/gammarelay-auto-temp.py'",
     "interval": "2"
   },
   "custom/gammarelay-brightness": {
-    "format": "<span color='#efefef'>{}%</span> ",
+    //"format": "<span color='#efefef'>{}%</span> ",
+    "format": "{}% ",
     "exec": "wl-gammarelay-rs watch {bp}",
     "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d +0.02",
     "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d -0.02",
     "interval": "2"
   },
   "custom/gammarelay-gamma": {
-    "format": "<span color='#efefef'>{}</span> 𝛄",
+    //"format": "<span color='#efefef'>{}</span> 𝛄",
+    "format": "{} 𝛄",
     "exec": "wl-gammarelay-rs watch {g}",
     "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d +0.02",
     "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d -0.02",
-- 
2.51.2