From 3a4bf7d82de09e3fdae06293537b08fd82e30919 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Sun, 2 Jun 2024 13:15:21 +0200
Subject: [PATCH] eww: Tweaks

---
 tree/.config/eww/eww.yuck | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tree/.config/eww/eww.yuck b/tree/.config/eww/eww.yuck
index c5ae107..b469ec1 100644
--- a/tree/.config/eww/eww.yuck
+++ b/tree/.config/eww/eww.yuck
@@ -14,7 +14,7 @@
 (defwindow bar1
 	:monitor 1
 	:geometry (geometry :height "100%"
-	                    :width "50px"
+	                    :width "40px"
 	                    :anchor "center left")
 	:stacking "fg"
 	:exclusive true
@@ -41,6 +41,7 @@
 		(temperature)
 		(battery)
 		(box :class "thingy" (systray :orientation "v"))
+		(kb_layout)
 		(date)
 		(clock)
 		(pwr)
@@ -94,7 +95,7 @@
 					(button :class "clickable" :onclick "ba bluetoothctl disconnect" (label :text "---"))
 				)
 			)
-			(label :text "BLT")
+			(label :text "BLU")
 			(revealer :transition "slideup"
 			          :reveal {!show_bluetooth}
 				(label :text "---")
@@ -120,7 +121,7 @@
 			(label :text "VOL")
 			(revealer :transition "slideup"
 			          :reveal {!show_volume}
-				(label :text volume_out)
+				(label :text {is_muted ? "MM" : volume_out})
 			)
 )))
 
@@ -129,7 +130,7 @@
 	     :valign "end"
 	     :class "battery thingy"
 	     :visible {current_temp != ""}
-		(label :text "TMP")
+		(label :text "TEM")
 		(label :text "${current_temp / 1000}°")
 ))
 
@@ -151,6 +152,13 @@
 		;(label :text "${bat_charge}%")
 ))
 
+(defwidget kb_layout []
+	(button :onclick "niri msg action switch-layout next"
+			:hexpand true
+			:class "thingy clickable"
+		(label :text "KBL")
+))
+
 (defwidget date []
 	(tooltip :halign "fill"
 		(calendar :class "calendar")
@@ -197,8 +205,9 @@
 (defvar show_volume false)
 (defvar show_bluetooth false)
 
-(defpoll workspaces      :interval "1s" "eww-workspaces")
+(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")