diff --git a/de/home/.config/eww/modules/bar/bluetooth.yuck b/de/home/.config/eww/modules/bar/bluetooth.yuck index 07de837..39cd13f 100644 --- a/de/home/.config/eww/modules/bar/bluetooth.yuck +++ b/de/home/.config/eww/modules/bar/bluetooth.yuck @@ -1,22 +1,21 @@ (defvar reveal_bluetooth false) + (defwidget bluetooth [] - (revealer-on-hover - :class "${reveal_bluetooth} bluetooth" - :revealvar reveal_bluetooth - :revealvar-name "reveal_bluetooth" + (revealer-on-hover :class "${reveal_bluetooth} bluetooth" + :revealvar reveal_bluetooth + :revealvar-name "reveal_bluetooth" (button :onclick 'blueman-manager' :class "revealer-preview ${matches(jq(bluetooth_status,'.[].connected'),'yes') ? 'active' : 'inactive'}" "") (bluetooth_children :array bluetooth_status))) (defwidget bluetooth_children [array] -(box :class "reveal-children" - :orientation "h" - :space-evenly true - :halign "start" - - (for device in array - (button :onclick {(device.connected == "yes") ? 'bluetoothctl disconnect "${device.address}"' : 'bluetoothctl connect "${device.address}"'} - :class {(device.connected == "yes") ? "active" : "inactive"} - :tooltip "${device.name}" - "${device.icon}")))) +(box :class "reveal-children" + :orientation "h" + :space-evenly true + :halign "start" + (for device in array + (button :onclick {(device.connected == "yes") ? 'bluetoothctl disconnect "${device.address}"' : 'bluetoothctl connect "${device.address}"'} + :class {(device.connected == "yes") ? "active" : "inactive"} + :tooltip "${device.name}" + "${device.icon}")))) diff --git a/de/home/.config/eww/modules/bar/clock.yuck b/de/home/.config/eww/modules/bar/clock.yuck index 66daa64..940e975 100644 --- a/de/home/.config/eww/modules/bar/clock.yuck +++ b/de/home/.config/eww/modules/bar/clock.yuck @@ -1,4 +1,3 @@ (defwidget clock [] - (label - :class "datetime" - :text {formattime(EWW_TIME,"%b %d, %Y | %H:%M")})) + (label :class "datetime" + :text {formattime(EWW_TIME,"%b %d, %Y | %H:%M")})) diff --git a/de/home/.config/eww/modules/bar/idle_inhibit.yuck b/de/home/.config/eww/modules/bar/idle_inhibit.yuck index 396edea..f4627c2 100644 --- a/de/home/.config/eww/modules/bar/idle_inhibit.yuck +++ b/de/home/.config/eww/modules/bar/idle_inhibit.yuck @@ -1,8 +1,7 @@ (defvar inhibit_active false) (defwidget idleinhibit [] - (box - :class "idle-inhibitor ${inhibit_active ? 'active' : 'inactive'}" + (box :class "idle-inhibitor ${inhibit_active ? 'active' : 'inactive'}" (button :onclick {inhibit_active ? 'killall eww-idle-inhibit;eww update inhibit_active=false' : 'systemd-inhibit --what="idle" --mode="block" scripts/bar/eww-idle-inhibit & eww update inhibit_active=true'} :tooltip "Idling is ${inhibit_active ? '' : 'not '}inhibited" {inhibit_active ? "" : ""}))) diff --git a/de/home/.config/eww/modules/home.yuck b/de/home/.config/eww/modules/home.yuck index 1e52e43..c0e2670 100644 --- a/de/home/.config/eww/modules/home.yuck +++ b/de/home/.config/eww/modules/home.yuck @@ -1,58 +1,41 @@ (defvar homewidgets_reveal false) (defwidget home [] -; (box :height 27) - (revealer - :transition "slideright" - :reveal homewidgets_reveal - :duration "250ms" + (revealer :transition "slideright" + :reveal homewidgets_reveal + :duration "250ms" - (box - :orientation 'v' - :space-evenly false - (box :height 27) - (scroll - :vscroll true - :hscroll false - :vexpand true - :height 400 - (box :class "home" - :orientation "v" - :spacing 10 - :width 300 + (box :orientation 'v' :space-evenly false + (box :height 27) + (scroll :vscroll true + :hscroll false + :vexpand true + :height 400 + (box :class "home" + :orientation "v" + :spacing 10 + :width 300 + :space-evenly false (nowplayingbar) (rat) (shortcuts_revealer) (weather_revealer) (mcstatus_revealer) -; (box -; :visible {(jq(workspacesArray, '.[]\|select(.focused==true).num') <= 20) && (jq(workspacesArray, '.[]\|select(.focused==true).num') >= 11)} -; (software_revealer) -; ) (box -; :visible {jq(workspacesArray, '.[]\|select(.focused==true).num') <= 9} - (notes_revealer) - ) + (notes_revealer)) (box -; :visible {jq(workspacesArray, '.[]\|select(.focused==true).num') <= 9} - (reminders_revealer) - ) - ) - ) -;(box :height 10) - ) - ) -) + (reminders_revealer)) + ))))) ;widget templates (include "modules/home/revealer-on-press.yuck") +;module imports (include "modules/home/nowplayingart.yuck") (include "modules/home/rat.yuck") (include "modules/home/weather.yuck") (include "modules/home/shortcuts.yuck") (include "modules/home/notes.yuck") -;(include "modules/home/softwareupdates.yuck") (include "modules/home/reminders.yuck") (include "modules/home/mcstatus.yuck")