diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck index 0e3b5aa..de94ec1 100644 --- a/de/home/.config/eww/modules/bar/workspaces.yuck +++ b/de/home/.config/eww/modules/bar/workspaces.yuck @@ -18,12 +18,12 @@ (for entry in array (literal :visible {(entry.num < activeWorkspace) ? true : false} - :content {(entry.num < activeWorkspace) ? "(workspace :ws entry)" : "(box :visible false)"})))) + :content {(entry.num < activeWorkspace) ? "(workspace :ws entry :side 'left')" : "(box :visible false)"})))) (box (for entry in array (literal :visible {entry.focused ? true : false} - :content {entry.focused ? "(workspace :ws entry)" : "(box :visible false)"}))) + :content {entry.focused ? "(workspace :ws entry :side 'center')" : "(box :visible false)"}))) (revealer :reveal wsreveal :transition "slideright" @@ -32,7 +32,7 @@ (for entry in array (literal :visible {(entry.num > activeWorkspace) ? true : false} - :content {(entry.num > activeWorkspace) ? "(workspace :ws entry)" : "(box :visible false)"})))))) + :content {(entry.num > activeWorkspace) ? "(workspace :ws entry :side 'right')" : "(box :visible false)"})))))) ; (for entry in array ; {entry.focused ? (workspace :ws entry) : ""}))) @@ -57,9 +57,10 @@ ; :class "workspace-number" ; :text {jq(captures(entry.num, '[0-9]$'),'.[].[]','r')})))))) -(defwidget workspace [ws] +(defwidget workspace [ws side] (button :onclick `swaymsg workspace "${ws.name}"` - :class {ws.focused ? "focused" : ""} +; :class {ws.focused ? "focused" : ""} + :class side (box '${replace(ws.name,".*:","")}' (label diff --git a/de/home/.config/eww/style/bar.scss b/de/home/.config/eww/style/bar.scss index c4f41fb..41467f0 100644 --- a/de/home/.config/eww/style/bar.scss +++ b/de/home/.config/eww/style/bar.scss @@ -8,7 +8,7 @@ .rightgroup { background-color: $bar-bg-color; border-radius: $bar-module-border-radius; - &>box, + &>box:not(.workspaces), &>button, &>label { background-color: $bar-bg-color; @@ -26,8 +26,14 @@ }*/ .workspaces { + border-radius: $bar-module-border-radius; + margin: 0px 5px; + min-width: $bar-module-width; + border: 1px solid $bar-module-fg-color; + background-color: $bar-module-bg-color; + button { - border-left: 2px solid blue; +// border-left: 2px solid blue; // background-color: blue; label { padding: 0px 5px;