From 0e1f3933799c52b195d156790e65f888b5b7c745 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Sat, 20 Jul 2024 14:38:06 +0200
Subject: [PATCH] eww: Improveme stuff

---
 tree/.config/eww/{eww.yuck => eww.yuck.tpl} | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
 rename tree/.config/eww/{eww.yuck => eww.yuck.tpl} (93%)

diff --git a/tree/.config/eww/eww.yuck b/tree/.config/eww/eww.yuck.tpl
similarity index 93%
rename from tree/.config/eww/eww.yuck
rename to tree/.config/eww/eww.yuck.tpl
index 9b79973..bea34ee 100644
--- a/tree/.config/eww/eww.yuck
+++ b/tree/.config/eww/eww.yuck.tpl
@@ -71,6 +71,7 @@
 (defwidget workspace [monitor n]
 	(button :visible {jq(workspaces, '.["${n}"] != null')}
 	        :class 'workspace ${workspaces[n].active && monitor == workspaces[n].monitor ? "active" : ""}'
+	        :onclick 'wmutils switch-workspace ${n}'
 		(label :text n))
 )
 
@@ -139,18 +140,17 @@
 	(box :orientation "v"
 	     :valign "end"
 	     :class "thingy"
-	     :visible {bat_charge != ""}
+	     :visible {EWW_BATTERY.BAT0.capacity != ""}
 		(label :text "BAT")
 		(circular-progress
 			:thickness 4.0
-			:value bat_charge
+			:value {EWW_BATTERY.BAT0.capacity}
 			:class {
-				bat_status == "Charging" ? "battery-gauge charging" :
-				bat_charge < 15          ? "battery-gauge low" :
-				                           "battery-gauge"
+				EWW_BATTERY.BAT0.status == "Charging" ? "battery-gauge charging" :
+				EWW_BATTERY.BAT0.capacity < 15        ? "battery-gauge low" :
+				                                        "battery-gauge"
 			}
 		)
-		;(label :text "${bat_charge}%")
 ))
 
 (defwidget color_scheme []
@@ -230,12 +230,15 @@
 (defpoll workspaces      :interval "1s" "wmutils workspaces")
 (defpoll volume_out      :interval "1s" "pamixer --get-volume")
 (defpoll is_muted        :interval "1s" "pamixer --get-mute")
-(defpoll vpn_status      :interval "1s" "mullvad-status")
 (defpoll current_minute  :interval "1s" "date +%M")
 (defpoll current_hour    :interval "1s" "date +%H")
 (defpoll current_day     :interval "60s" "date +%d")
 (defpoll current_month   :interval "60s" "date +%b")
-(defpoll bat_charge      :interval "15s" "cat /sys/class/power_supply/BAT0/capacity")
-(defpoll bat_status      :interval "15s" "cat /sys/class/power_supply/BAT0/status")
 (defpoll current_temp    :interval "5s"  "cat /sys/class/thermal/thermal_zone*/temp")
 (defpoll color_scheme    :interval "5s"  "get-color-scheme")
+
+{% if disablemullvad %}
+(defvar vpn_status "{'icon': '-', 'class': 'disconnected'}" )
+{% else %}
+(defpoll vpn_status      :interval "1s" "mullvad-status")
+{% end %}