diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck index f2899a2..8135972 100644 --- a/de/home/.config/eww/eww.yuck +++ b/de/home/.config/eww/eww.yuck @@ -6,16 +6,7 @@ (defwidget rightgroup [] (box :class "rightgroup" :orientation "h" :space-evenly false :halign "end" - (metric :label "🔊" - :value volume - :onchange "amixer -D pulse sset Master {}%") - (metric :label "" - :value {EWW_RAM.used_mem_perc} - :onchange "") - (metric :label "💾" - :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)} - :onchange "") - (systeminfo) + (sysmem) {formattime(EWW_TIME,"%b %d, %Y %H:%M")} (systemtray))) @@ -57,15 +48,25 @@ :duration {duration ?: "500ms"} (children :nth 1)))))) -(defvar reveal_systeminfo false) -(defwidget systeminfo [] +(defvar reveal_sysmem false) +(defwidget sysmem [] (revealer-on-hover - :revealvar reveal_systeminfo - :revealvar-name "reveal_systeminfo" + :revealvar reveal_sysmem + :revealvar-name "reveal_sysmem" (metric :label "💾" :value {EWW_RAM.used_mem_perc} :onchange "") - (metric :label "RAM" + (sysmem_children))) + +(defwidget sysmem_children [] + (box :class "sysmem_children" + :orientation "h" + :space-evenly false + :halign "center" + (metric :label "💾${round(EWW_RAM.used_mem_perc,1)}" + :value {EWW_RAM.used_mem_perc} + :onchange "") + (metric :label "💾${round(EWW_RAM.used_mem_perc,1)}" :value {EWW_RAM.used_mem_perc} :onchange ""))) @@ -81,9 +82,12 @@ :class "metric" :space-evenly false (box :class "label" label) - (circular-progress :min 0 + (circular-progress :active {onchange != ""} :value value + :start-at 0 + :thickness 10 + :clockwise true :onchange onchange))) (deflisten music :initial ""