diff --git a/de/home/.config/eww/modules/bar/network.yuck b/de/home/.config/eww/modules/bar/network.yuck index 8a563a0..67e54cf 100644 --- a/de/home/.config/eww/modules/bar/network.yuck +++ b/de/home/.config/eww/modules/bar/network.yuck @@ -1,4 +1,5 @@ (defvar reveal_network false) + (defwidget network [] (revealer-on-hover :class "${reveal_network} networks" @@ -11,16 +12,12 @@ (network_children :array "${network_manager.interfaces}"))) (defwidget network_children [array] - (box :class "reveal-children" - :orientation "h" - :space-evenly false - :halign "center" + (box :class "reveal-children" + :orientation "h" + :space-evenly false + :halign "center" (for interface in array (button :onclick "nmcli device ${( interface.state == 'connected' ? 'down' : 'up' )} ${interface.device}" - :class {( interface.state == "connected" ? 'active' : 'inactive' )} - :tooltip "${interface.connection} (${interface.device})" - {( interface.type == "wifi" ? "" : ( interface.type == "ethernet" ? "󰈀" : "" ))} - ) - ) - ) -) + :class {( interface.state == "connected" ? 'active' : 'inactive' )} + :tooltip "${interface.connection} (${interface.device})" + {( interface.type == "wifi" ? "" : ( interface.type == "ethernet" ? "󰈀" : "" ))})))) diff --git a/de/home/.config/eww/modules/bar/notification-center.yuck b/de/home/.config/eww/modules/bar/notification-center.yuck index 9e69b5c..3337308 100644 --- a/de/home/.config/eww/modules/bar/notification-center.yuck +++ b/de/home/.config/eww/modules/bar/notification-center.yuck @@ -2,8 +2,7 @@ "swaync-client -s") (defwidget notification_center [] - (box - :class "notification-center ${(jq(notification_center_info,'.count','r') > 0 ) ? 'active' : 'inactive'}" + (box :class "notification-center ${(jq(notification_center_info,'.count','r') > 0 ) ? 'active' : 'inactive'}" (button :onclick 'swaync-client -t' :onrightclick 'swaync-client -d' :tooltip "${jq(notification_center_info,'.count','r')} unread notifications" diff --git a/de/home/.config/eww/modules/bar/powermenu.yuck b/de/home/.config/eww/modules/bar/powermenu.yuck index b1f04b3..e4ad2f0 100644 --- a/de/home/.config/eww/modules/bar/powermenu.yuck +++ b/de/home/.config/eww/modules/bar/powermenu.yuck @@ -1,29 +1,29 @@ (defvar reveal_powermenu false) + (defwidget powermenu [] - (revealer-on-hover - :revealvar reveal_powermenu - :class "powermenu ${reveal_powermenu}" - :revealvar-name "reveal_powermenu" + (revealer-on-hover :revealvar reveal_powermenu + :class "powermenu ${reveal_powermenu}" + :revealvar-name "reveal_powermenu" (button :onclick 'sdu power shutdown' - :class "revealer-preview" - :tooltip "Shutdown" - "") + :class "revealer-preview" + :tooltip "Shutdown" + "") (powermenu_children))) (defwidget powermenu_children [] - (box :class "reveal-children" - :orientation "h" - :space-evenly false - :halign "center" + (box :class "reveal-children" + :orientation "h" + :space-evenly false + :halign "center" (button :onclick 'sdu power reboot' - :tooltip "Reboot" + :tooltip "Reboot" "") (button :onclick 'sdu power suspend' - :tooltip "Suspend" + :tooltip "Suspend" "󰤄") (button :onclick 'sdu power lock' - :tooltip "Lock" + :tooltip "Lock" "") (button :onclick 'sdu power logout' - :tooltip "Logout" + :tooltip "Logout" ""))) diff --git a/de/home/.config/eww/modules/bar/profile.yuck b/de/home/.config/eww/modules/bar/profile.yuck index f290eb2..3d6cd26 100644 --- a/de/home/.config/eww/modules/bar/profile.yuck +++ b/de/home/.config/eww/modules/bar/profile.yuck @@ -1,5 +1,5 @@ (defwidget profile [] (button :onclick "sdu profile switch next" :tooltip {jq(profile_info,'.name','r')} - :class "profile profile-${(jq(profile_info,'.name','r'))}" + :class "profile profile-${(jq(profile_info,'.name','r'))}" {jq(profile_info,'.icon','r')})) diff --git a/de/home/.config/eww/modules/bar/revealer-on-hover.yuck b/de/home/.config/eww/modules/bar/revealer-on-hover.yuck index bd40391..162e125 100644 --- a/de/home/.config/eww/modules/bar/revealer-on-hover.yuck +++ b/de/home/.config/eww/modules/bar/revealer-on-hover.yuck @@ -1,16 +1,12 @@ (defwidget revealer-on-hover [revealvar revealvar-name ?class ?duration ?transition] - (box - :class "${class} revealer-on-hover" - :orientation "h" - :space-evenly false - (eventbox - :onscroll "if test '{}' = 'down';then ${EWW_CMD} update ${revealvar-name}=true;else ${EWW_CMD} update ${revealvar-name}=false;fi" - :onhoverlost "${EWW_CMD} update ${revealvar-name}=false" - (box - :space-evenly false - (children :nth 0) - (revealer - :reveal revealvar - :transition {transition ?: "slideright"} - :duration {duration ?: "500ms"} + (box :class "${class} revealer-on-hover" + :orientation "h" + :space-evenly false + (eventbox :onscroll "if test '{}' = 'down';then ${EWW_CMD} update ${revealvar-name}=true;else ${EWW_CMD} update ${revealvar-name}=false;fi" + :onhoverlost "${EWW_CMD} update ${revealvar-name}=false" + (box :space-evenly false + (children :nth 0) + (revealer :reveal revealvar + :transition {transition ?: "slideright"} + :duration {duration ?: "500ms"} (children :nth 1)))))) diff --git a/de/home/.config/eww/modules/bar/scratchpad.yuck b/de/home/.config/eww/modules/bar/scratchpad.yuck index 34849cb..8bdc2da 100644 --- a/de/home/.config/eww/modules/bar/scratchpad.yuck +++ b/de/home/.config/eww/modules/bar/scratchpad.yuck @@ -1,45 +1,29 @@ (defvar reveal_scratchpad false) (defwidget scratchpad [] -; (revealer-on-hover -; :class "${reveal_scratchpad} scratchpad" -; :revealvar reveal_scratchpad -; :revealvar-name "reveal_scratchpad" -; (label -; :class "revealer-preview" -; :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}" -; :text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}") -; (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')}))) -; -(box - :class "${reveal_scratchpad} scratchpad revealer-on-hover" - :orientation "h" - :space-evenly false - (eventbox - :onhover "${EWW_CMD} update reveal_scratchpad=true" - :onhoverlost "${EWW_CMD} update reveal_scratchpad=false" - (box + +(box :class "${reveal_scratchpad} scratchpad revealer-on-hover" + :orientation "h" :space-evenly false -; (children :nth 0) - (label - :class "revealer-preview" - :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}" - :text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}") - (revealer - :reveal reveal_scratchpad - :transition "slideright" - :duration "500ms" + (eventbox :onhover "${EWW_CMD} update reveal_scratchpad=true" + :onhoverlost "${EWW_CMD} update reveal_scratchpad=false" + (box :space-evenly false + (label :class "revealer-preview" + :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}" + :text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}") + (revealer :reveal reveal_scratchpad + :transition "slideright" + :duration "500ms" (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')})))))) (defwidget scratchpad_children [array] (box :orientation "h" :class "reveal-children" :space-evenly false - (for entry in array - (button :onclick 'swaymsg [con_id=${entry.window_id}] scratchpad show' - :class "scratchpad-item ${(entry.visible == 'true') ? 'active' : 'inactive'}" - :tooltip "${entry.title} + (for entry in array + (button :onclick 'swaymsg [con_id=${entry.window_id}] scratchpad show' + :class "scratchpad-item ${(entry.visible == 'true') ? 'active' : 'inactive'}" + :tooltip "${entry.title} ${entry.name}" - (image :path {entry.icon} - :image-width 20 - :image-height 20) - )))) + (image :path {entry.icon} + :image-width 20 + :image-height 20)))))