Merge remote-tracking branch 'origin/main'
All checks were successful
/ check (push) Successful in 5m15s

This commit is contained in:
Daniel Flanagan 2024-12-20 11:08:06 -06:00
commit 50c06ebd7f
3 changed files with 14 additions and 11 deletions

View file

@ -38,7 +38,7 @@ $rosewater: #f5e0dc;
font-size: 12.0pt; font-size: 12.0pt;
} }
.sidestuff slider { .leftsidestuff slider {
color: $sapphire; color: $sapphire;
} }

View file

@ -1,8 +1,9 @@
(defwidget bar [] (defwidget bar []
(centerbox :orientation "h" (centerbox :orientation "h"
(sidestuff) (leftsidestuff)
(box) (box)
(music))) (rightsidestuff)
))
(defwindow bar0 (defwindow bar0
:monitor 0 :monitor 0
@ -30,14 +31,16 @@
:anchor "bottom center") :anchor "bottom center")
(bar)) (bar))
(defwidget sidestuff [] (defwidget rightsidestuff []
(box :class "sidestuff" :orientation "h" :space-evenly false :halign "start" :valign "center" :spacing 10 (box :class "rightsidestuff" :orientation "h" :space-evenly false :halign "end" :valign "center" :spacing 10
time (music)
; TODO: indicator/tray/taskbar/toolbar icons and management? (probably should use something standalone?) (systray)
; https://github.com/elkowar/eww/issues/111 ))
(defwidget leftsidestuff []
(box :class "leftsidestuff" :orientation "h" :space-evenly false :halign "start" :valign "center" :spacing 10
time
; TODO: idle inhibitor? ; TODO: idle inhibitor?
; TODO: hyprland workspaces?
; TODO: get these to align properly? icons seem lower than they should be? ; TODO: get these to align properly? icons seem lower than they should be?
(box :class "mic" ( (box :class "mic" (
box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "} box :class {micMuted == "false" ? "live" : "muted"} {micMuted == "false" ? " " : " "}
@ -48,7 +51,7 @@
) {"${volume}%"} ) {"${volume}%"}
) )
{" ${round(EWW_CPU["avg"], 0)}%"} {" ${round(EWW_CPU["avg"], 0)}%"}
{" ${round(EWW_RAM["used_mem_perc"], 0)}%"} {" ${round(EWW_RAM["used_mem_perc"], 0)}%"}
; TODO: have these "widgets" be omitted entirely instead of just empty strings ; TODO: have these "widgets" be omitted entirely instead of just empty strings
{(showBrightness == "true") ? (" ${brightness}%") : ""} {(showBrightness == "true") ? (" ${brightness}%") : ""}
{(showBattery == "true") ? ("󱊣 ${EWW_BATTERY["BAT1"]["capacity"]}% (${batteryTime})") : ""} {(showBattery == "true") ? ("󱊣 ${EWW_BATTERY["BAT1"]["capacity"]}% (${batteryTime})") : ""}

View file

@ -43,7 +43,7 @@
border-color=${urgent} border-color=${urgent}
[urgency=high] [urgency=high]
background-color=${urgent}AA background-color=${urgent}EE
border-color=${urgent} border-color=${urgent}
text-color=${bg} text-color=${bg}
''; '';