From 28645f7175740f4487340077706c92f5a339e9e7 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Sun, 18 Dec 2022 06:10:10 -0600
Subject: [PATCH] some visibility of the mem, cpu, and bat bars

---
 eww/eww.scss | 25 +++++++++++----
 eww/eww.yuck | 90 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/eww/eww.scss b/eww/eww.scss
index ab21e36..d369e10 100644
--- a/eww/eww.scss
+++ b/eww/eww.scss
@@ -153,16 +153,27 @@ tooltip label {
 }
 .iconmem {
     color: $base0A;
+    padding: 9px 12px 8px 8px;
 }
 .iconbat {
-    color: $base0B;
+    color: $base0E;
+    margin: 10px 10px 8px 10px;
 }
 .iconcpu {
-    color: $base0B;
+    color: $base0D;
+    margin: 8px 11px 8px 8px;
 }
 .iconbat, .iconmem, .iconcpu {
-    font-size: 15;
-    margin: 10px;
+    font-size: 12;
+}
+.mem_label {
+    color: $base0A;
+}
+.cpu_label {
+    color: $base0D;
+}
+.bat_label {
+    color: $base0E;
 }
 .bright_icon {
     font-size: 18;
@@ -185,19 +196,19 @@ tooltip label {
 .mem_module {
     background-color: rgba(00, 00, 00, 0.0);
     border-radius: 16px;
-    margin: 0px 10px 0px 10px;
+    margin: 0px 0px 0px 5px;
   }
 
 .bat_module {
     background-color: rgba(00, 00, 00, 0.0);
     border-radius: 16px;
-    margin: 0px 10px 0px 10px;
+    margin: 0px 5px 0px 0px;
   }
 
 .cpu_module {
     background-color: rgba(00, 00, 00, 0.0);
     border-radius: 16px;
-    margin: 0px 10px 0px 10px;
+    margin: 0px 5px 0px 5px;
   }
 
 .works {
diff --git a/eww/eww.yuck b/eww/eww.yuck
index 689b0b3..3e53fee 100644
--- a/eww/eww.yuck
+++ b/eww/eww.yuck
@@ -132,49 +132,61 @@
       WLAN_ICON))))
 
 (defwidget bat []
-		(box
-		    :class "bat_module"
-		    :vexpand "false"
-		    :hexpand "false" 
-        (circular-progress
-            :value {EWW_BATTERY["BAT1"].capacity}
-            :class "batbar"
-            :thickness 4
-            (button 
-                :onclick "scripts/pop system"
-                :class "iconbat"
-                :tooltip "${EWW_BATTERY["BAT1"].capacity}% battery left"
-                " "))))
+	   (box
+	    :class "bat_module"
+	    :vexpand "false"
+	    :hexpand "false" 
+            :spacing 5
+            (circular-progress
+             :value {EWW_BATTERY["BAT1"].capacity}
+             :class "batbar"
+             :thickness 3
+             (button 
+              :onclick "scripts/pop system"
+              :class "iconbat"
+              :tooltip "${EWW_BATTERY["BAT1"].capacity}% battery left"
+              ""))
+            (label
+             :text "${round(EWW_BATTERY['BAT1'].capacity, 0)}%"
+             :class "bat_label")))
 
 (defwidget cpu []
-		(box
-		    :class "cpu_module"
-		    :vexpand "false"
-		    :hexpand "false" 
-        (circular-progress
-            :value {EWW_CPU.avg}
-            :class "cpubar"
-            :thickness 4
-            (button 
-                :onclick "scripts/pop system"
-                :class "iconcpu"
-                :tooltip "using ${EWW_CPU.avg}% of cpu"
-                " "))))
+	   (box
+	    :class "cpu_module"
+	    :vexpand "false"
+	    :hexpand "false" 
+            :spacing 5
+            (circular-progress
+             :value {EWW_CPU.avg}
+             :class "cpubar"
+             :thickness 3
+             (button 
+              :onclick "scripts/pop system"
+              :class "iconcpu"
+              :tooltip "using ${EWW_CPU.avg}% of cpu"
+              ""))
+            (label
+             :text "${round(EWW_CPU.avg, 0)}%"
+             :class "cpu_label")))
 
 (defwidget mem []
-		(box 
-        :class "mem_module" 
-        :vexpand "false" 
-        :hexpand "false" 
-        (circular-progress 
-            :value {EWW_RAM.used_mem_perc}
-            :class "membar"
-            :thickness 4
-            (button 
-                :onclick "scripts/pop system"
-                :class "iconmem"
-                :tooltip "using ${EWW_RAM.used_mem_perc}% ram"
-                " "))))
+	   (box 
+            :class "mem_module" 
+            :vexpand "false" 
+            :hexpand "false" 
+            :spacing 5
+            (circular-progress 
+             :value {EWW_RAM.used_mem_perc}
+             :class "membar"
+             :thickness 3
+             (button 
+              :onclick "scripts/pop system"
+              :class "iconmem"
+              :tooltip "using ${EWW_RAM.used_mem_perc}% ram"
+              ""))
+            (label
+             :text "${round(EWW_RAM.used_mem_perc, 0)}%"
+             :class "mem_label")))
 
 (defwidget kdeconnect []
            (box