From 9160fdc03fd867a52b7ec5f64032983b9eeeaaa4 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <support@pogmom.me>
Date: Tue, 4 Mar 2025 01:00:02 -0800
Subject: [PATCH] New backup 2025-03-04 01:00:02

---
 de/home/.config/eww/eww.scss       |  1 +
 de/home/.config/eww/eww.yuck       |  7 +++++--
 de/home/.config/eww/scripts/getvol | 12 ++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 de/home/.config/eww/scripts/getvol

diff --git a/de/home/.config/eww/eww.scss b/de/home/.config/eww/eww.scss
index 465329b..f24e5b2 100644
--- a/de/home/.config/eww/eww.scss
+++ b/de/home/.config/eww/eww.scss
@@ -17,6 +17,7 @@
 }
 .rightgroup>* {
   margin: 10px 0px 10px 5px;
+  min-width: 25px;
 }
 scale trough {
   background-color: $color1;
diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck
index 54290a6..2eae9a6 100644
--- a/de/home/.config/eww/eww.yuck
+++ b/de/home/.config/eww/eww.yuck
@@ -82,9 +82,12 @@
     :revealvar reveal_volume
     :revealvar-name "reveal_volume"
     (button :onclick 'pavucontrol-qt --tab 3'
-      "")
+      {(volume_level == 0) ? "" : ((volume_level > 50) ? "" : "")})
     (volume_children)))
 
+(defpoll volume_level :initial false
+                    :interval "1s"
+  "scripts/getvol")
 (defwidget volume_children []
   (box :class "reveal_children"
     :orientation "h"
@@ -93,7 +96,7 @@
     (scale
       :min 0
       :max 100
-      :value 50
+      :value {volume_level}
       :orientation "h"
       :onchange "wpctl set-volume @DEFAULT_AUDIO_SINK@ {}%")))
 
diff --git a/de/home/.config/eww/scripts/getvol b/de/home/.config/eww/scripts/getvol
old mode 100644
new mode 100755
index 4e4275d..dc1857a
--- a/de/home/.config/eww/scripts/getvol
+++ b/de/home/.config/eww/scripts/getvol
@@ -1,12 +1,8 @@
 #!/bin/sh
 
-if command -v pamixer &>/dev/null; then
-    if [ true == $(pamixer --get-mute) ]; then
-        echo 0
-        exit
-    else
-        pamixer --get-volume
-    fi
+if [ "$(pactl get-sink-mute @DEFAULT_SINK@)" = "Mute: yes" ]; then
+  echo 0
+  exit
 else
-    amixer -D pulse sget Master | awk -F '[^0-9]+' '/Left:/{print $3}'
+  echo "$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | sed 's/[^0-9]//g')"
 fi