diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck index f522b2c..4d9efa5 100644 --- a/de/home/.config/eww/eww.yuck +++ b/de/home/.config/eww/eww.yuck @@ -8,7 +8,6 @@ (include "modules/bar/clock.yuck") - (include "modules/bar/idle_inhibit.yuck") (defwidget revealer-on-hover [revealvar revealvar-name ?class ?duration ?transition] @@ -28,56 +27,9 @@ :duration {duration ?: "500ms"} (children :nth 1)))))) -(defvar reveal_powermenu false) -(defwidget powermenu [] - (revealer-on-hover - :revealvar reveal_powermenu - :revealvar-name "reveal_powermenu" - (button :onclick 'sp-powermenu' - "") - (powermenu_children))) +(include "modules/bar/powermenu.yuck") -(defwidget powermenu_children [] - (box :class "reveal_children" - :orientation "h" - :space-evenly false - :halign "center" - (button :onclick 'sp-powermenu' - "") - (button :onclick 'sp-powermenu' - "") - (button :onclick 'sp-powermenu' - "") - (button :onclick 'sp-powermenu' - ""))) - -(defpoll wireless_active :initial false - :interval "1s" - "scripts/network-status wireless") -(defpoll wired_active :initial false - :interval "1s" - "scripts/network-status wired") -(defvar reveal_network false) -(defwidget network [] - (revealer-on-hover - :revealvar reveal_network - :revealvar-name "reveal_network" - (button :onclick 'nm-connection-editor' - :class {wireless_active || wired_active ? "active" : ""} - "") - (network_children))) - -(defwidget network_children [] - (box :class "reveal_children" - :orientation "h" - :space-evenly false - :halign "center" - (button :onclick {wireless_active ? 'scripts/network-updown wifi down' : 'scripts/network-updown wifi up'} - :class {wireless_active ? "active" : ""} - "") - (button :onclick {wired_active ? 'scripts/network-updown ethernet down' : 'scripts/network-updown ethernet up'} - :class {wired_active ? "active" : ""} - "🖧"))) +(include "modules/bar/network.yuck") (defvar reveal_bluetooth false) (defpoll bluetooth_active :initial true diff --git a/de/home/.config/eww/modules/bar/idle_inhibit.yuck b/de/home/.config/eww/modules/bar/idle_inhibit.yuck index 256e5fe..3a7233e 100644 --- a/de/home/.config/eww/modules/bar/idle_inhibit.yuck +++ b/de/home/.config/eww/modules/bar/idle_inhibit.yuck @@ -3,7 +3,6 @@ "scripts/inhibit-status") (defwidget idleinhibit [] - (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" script> + (button :onclick {inhibit_active ? 'killall eww-idle-inhibit' : 'systemd-inhibit --what="idle" --mode="block" scripts/eww-idle-inhibit'} :class {inhibit_active ? "active" : ""} {inhibit_active ? "" : ""})) - diff --git a/de/home/.config/eww/modules/bar/network.yuck b/de/home/.config/eww/modules/bar/network.yuck new file mode 100644 index 0000000..855c3bf --- /dev/null +++ b/de/home/.config/eww/modules/bar/network.yuck @@ -0,0 +1,27 @@ +(defpoll wireless_active :initial false + :interval "1s" + "scripts/network-status wireless") +(defpoll wired_active :initial false + :interval "1s" + "scripts/network-status wired") +(defvar reveal_network false) +(defwidget network [] + (revealer-on-hover + :revealvar reveal_network + :revealvar-name "reveal_network" + (button :onclick 'nm-connection-editor' + :class {wireless_active || wired_active ? "active" : ""} + "") + (network_children))) + +(defwidget network_children [] + (box :class "reveal_children" + :orientation "h" + :space-evenly false + :halign "center" + (button :onclick {wireless_active ? 'scripts/network-updown wifi down' : 'scripts/network-updown wifi up'} + :class {wireless_active ? "active" : ""} + "") + (button :onclick {wired_active ? 'scripts/network-updown ethernet down' : 'scripts/network-updown ethernet up'} + :class {wired_active ? "active" : ""} + "🖧"))) diff --git a/de/home/.config/eww/modules/bar/powermenu.yuck b/de/home/.config/eww/modules/bar/powermenu.yuck new file mode 100644 index 0000000..cf5df1b --- /dev/null +++ b/de/home/.config/eww/modules/bar/powermenu.yuck @@ -0,0 +1,22 @@ +(defvar reveal_powermenu false) +(defwidget powermenu [] + (revealer-on-hover + :revealvar reveal_powermenu + :revealvar-name "reveal_powermenu" + (button :onclick 'sp-powermenu' + "") + (powermenu_children))) + +(defwidget powermenu_children [] + (box :class "reveal_children" + :orientation "h" + :space-evenly false + :halign "center" + (button :onclick 'sp-powermenu' + "") + (button :onclick 'sp-powermenu' + "") + (button :onclick 'sp-powermenu' + "") + (button :onclick 'sp-powermenu' + "")))