diff --git a/de/home/.config/eww/modules/bar/profile.yuck b/de/home/.config/eww/modules/bar/profile.yuck index f9476f2..8bae545 100644 --- a/de/home/.config/eww/modules/bar/profile.yuck +++ b/de/home/.config/eww/modules/bar/profile.yuck @@ -1,5 +1,6 @@ (deflisten active_profile "scripts/bar/profile") +(deflisten active_profile_name "scripts/bar/profile-name") (defwidget profile [] (button :onclick "sp-profiles next" - :class "profile ${((activeWorkspace > '30') ? 'profile-work' : ((activeWorkspace > '20') ? 'profile-school' : ((activeWorkspace > '10') ? 'profile-development' : ((activeWorkspace > '0') ? 'profile-personal' : ''))))}" + :class "profile ${((active_profile_name == 'Work') ? 'profile-work' : ((active_profile_name == 'Housing') ? 'profile-housing' : ((active_profile_name == 'Development') ? 'profile-development' : ((active_profile_name == 'Personal') ? 'profile-personal' : ''))))}" {active_profile})) diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck index f3ccde1..f914411 100644 --- a/de/home/.config/eww/modules/bar/workspaces.yuck +++ b/de/home/.config/eww/modules/bar/workspaces.yuck @@ -8,7 +8,7 @@ (eventbox :onhover "${EWW_CMD} update wsreveal=true" :onhoverlost "${EWW_CMD} update wsreveal=false" - (box :class "workspaces ${((activeWorkspace > '30') ? 'profile-work' : ((activeWorkspace > '20') ? 'profile-school' : ((activeWorkspace > '10') ? 'profile-development' : ((activeWorkspace > '0') ? 'profile-personal' : ''))))}" + (box :class "workspaces ${((activeWorkspace > '30') ? 'profile-work' : ((activeWorkspace > '20') ? 'profile-housing' : ((activeWorkspace > '10') ? 'profile-development' : ((activeWorkspace > '0') ? 'profile-personal' : ''))))}" :orientation "h" :space-evenly false :halign "start" @@ -42,7 +42,7 @@ (defwidget workspace [ws side ?lastws ?firstws] (button :onclick `swaymsg workspace "${ws.name}"` - :class '${side} ${ws.num == lastws ? "last-workspace" : (ws.num == firstws ? "first-workspace" : "middle-workspace")} ${((ws.num > '30') ? 'profile-work' : ((ws.num > '20') ? 'profile-school' : ((ws.num > '10') ? 'profile-development' : ((ws.num > '0') ? 'profile-personal' : ''))))}' + :class '${side} ${ws.num == lastws ? "last-workspace" : (ws.num == firstws ? "first-workspace" : "middle-workspace")} ${((ws.num > '30') ? 'profile-work' : ((ws.num > '20') ? 'profile-housing' : ((ws.num > '10') ? 'profile-development' : ((ws.num > '0') ? 'profile-personal' : ''))))}' (box '${replace(ws.name,".*:","")}' (label diff --git a/de/home/.config/eww/scripts/bar/profile-name b/de/home/.config/eww/scripts/bar/profile-name index 43a0e80..a60569a 100755 --- a/de/home/.config/eww/scripts/bar/profile-name +++ b/de/home/.config/eww/scripts/bar/profile-name @@ -1,3 +1,3 @@ #!/bin/bash -echo ~/.cache/sway-profiles/active_profile | entr -n sp-profile-icon +echo ~/.cache/sway-profiles/active_profile | entr -n sp-profile diff --git a/de/home/.config/eww/style/bar/workspaces.scss b/de/home/.config/eww/style/bar/workspaces.scss index f627f3c..97a6f16 100644 --- a/de/home/.config/eww/style/bar/workspaces.scss +++ b/de/home/.config/eww/style/bar/workspaces.scss @@ -1,11 +1,10 @@ $personal-color: $bar-bg-color; $development-color: mix($color9, $color12); -$school-color: mix($color5, $color3); +$housing-color: mix($color5, $color3); $work-color: mix($color5, $color4, 30%); .profile, .workspaces { - border: 2px solid $bar-bg-color; font-weight: bold; &.profile-personal { @@ -14,8 +13,8 @@ $work-color: mix($color5, $color4, 30%); &.profile-development { border-color: $development-color; } - &.profile-school { - border-color: $school-color; + &.profile-housing { + border-color: $housing-color; } &.profile-work { border-color: $work-color; @@ -27,8 +26,9 @@ $work-color: mix($color5, $color4, 30%); border-radius: $bar-module-border-radius 0px 0px $bar-module-border-radius; color: $bar-bg-color; padding: 0px 10px; + transition: 0.3s all; &.profile-development, - &.profile-school, + &.profile-housing, &.profile-work { color: $bar-module-fg-color; } @@ -38,8 +38,8 @@ $work-color: mix($color5, $color4, 30%); &.profile-development { background-color: $development-color; } - &.profile-school { - background-color: $school-color; + &.profile-housing { + background-color: $housing-color; } &.profile-work { background-color: $work-color; @@ -60,9 +60,9 @@ $work-color: mix($color5, $color4, 30%); background-color: $development-color; border-color: $development-color; } - &.profile-school { - background-color: $school-color; - border-color: $school-color; + &.profile-housing { + background-color: $housing-color; + border-color: $housing-color; } &.profile-work { background-color: $work-color; @@ -108,9 +108,9 @@ $work-color: mix($color5, $color4, 30%); color: $development-color; border-color: $development-color; } - &.profile-school { - color: $school-color; - border-color: $school-color; + &.profile-housing { + color: $housing-color; + border-color: $housing-color; } &.profile-work { color: $work-color; @@ -124,8 +124,8 @@ $work-color: mix($color5, $color4, 30%); &.profile-development { background-color: rgba($development-color,0.5); } - &.profile-school { - background-color: rgba($school-color,0.5); + &.profile-housing { + background-color: rgba($housing-color,0.5); } &.profile-work { background-color: rgba($work-color,0.5);