From c1c454612f0f0dd8549bff346964d3342f8c828b Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Sun, 24 Mar 2024 14:30:16 +0000
Subject: [PATCH] eww rework, add battery

---
 .config/eww/eww.scss |  4 ++++
 .config/eww/eww.yuck | 21 +++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss
index e1675a5..a264a97 100644
--- a/.config/eww/eww.scss
+++ b/.config/eww/eww.scss
@@ -45,3 +45,7 @@
 .current {
   color: #D65D0E;
 }
+
+.battery, .ram, .disk {
+  padding-right: 20px;
+}
diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck
index bea1d5c..1a4ad7e 100644
--- a/.config/eww/eww.yuck
+++ b/.config/eww/eww.yuck
@@ -6,15 +6,15 @@
 
 (defwidget sidestuff []
  (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end"
+  (box :class "battery" :orientation "h" :space-evenly false
+   {battery != "" ? "󰁹 ${battery}" : ""})
+  (box :class "ram" :orientation "h"
+   "󰍛 ${ram}%")
+  (box :class "disk" :orientation "h"
+   " ${disk}")
   (metric :label "󰕾"
    :value { volume * 100 }
    :onchange "VOL=$(bc -l <<<\"scale=2; {} / 100\") ; wpctl set-volume @DEFAULT_AUDIO_SINK@ $VOL")
-  (metric :label "󰍛"
-   :value {EWW_RAM.used_mem_perc}
-   :onchange "")
-  (metric :label ""
-   :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)}
-   :onchange "")
   time))
 
 (deflisten workspaces :initial "[]" "bash ~/.config/eww/scripts/get-workspaces")
@@ -61,6 +61,15 @@
 (defpoll volume :interval "1s"
   "scripts/getvol")
 
+(defpoll battery :interval "1s"
+   "upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}'")
+
+(defpoll ram :interval "1s"
+   "MEM=$(free | grep Mem | awk '{print $3/$2 * 100.0}') ; echo \${MEM%.*}")
+
+(defpoll disk :interval "1s"
+   "df | grep '/$' | awk '{print $5}'")
+
 (defpoll time :interval "10s"
   "date '+%H:%M %F'")