diff --git a/modules/desktop-environment/home/niri/style.nix b/modules/desktop-environment/home/niri/style.nix index d9d9a61..99c5a69 100644 --- a/modules/desktop-environment/home/niri/style.nix +++ b/modules/desktop-environment/home/niri/style.nix @@ -50,6 +50,8 @@ is-floating = true; }]; shadow = { + offset.y = 0; + offset.x = 0; softness = 40; color = "#bab9e5af"; inactive-color = "#fa9d99af"; diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/workspaces.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/workspaces.yuck index 96e37a5..16215ff 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/workspaces.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/workspaces.yuck @@ -3,8 +3,8 @@ :class "workspaces" (for workspace in workspaces (button - :style "border-bottom: 4px solid ${workspace.color}" - :class "${workspace.active ? "focused" : 0}" + :style "border-bottom: 4px solid ${workspace.color}${workspace.active ? "; background-color: #3c3836" : ""}" + :class "${workspace.focused ? "focused" : ""}" :onclick "swaymsg workspace ${workspace.name}" (label :text "${workspace.idx}") ) diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.css b/modules/desktop-environment/home/panels/eww/configDir/eww.css index a61a23f..81a6604 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/eww.css +++ b/modules/desktop-environment/home/panels/eww/configDir/eww.css @@ -10,10 +10,6 @@ label { border: 0px; } -.workspaces button.urgent { - background-color: #cc241d; -} - .workspaces button.focused { background-color: #504935; } @@ -37,4 +33,4 @@ label { .traveldingsWindow { border-radius: 15px; -} +} \ No newline at end of file diff --git a/modules/shell/nu/aliases.nu b/modules/shell/nu/aliases.nu index 72d528d..3d6bfab 100644 --- a/modules/shell/nu/aliases.nu +++ b/modules/shell/nu/aliases.nu @@ -36,4 +36,5 @@ alias gunim = cd ~/Docs/uni/mathe1-3; # typos alias juts = just; +alias miau = meow; alias shut = shutdown now; diff --git a/modules/shell/nu/custom_commands.nu b/modules/shell/nu/custom_commands.nu index d777349..fc22cba 100644 --- a/modules/shell/nu/custom_commands.nu +++ b/modules/shell/nu/custom_commands.nu @@ -75,8 +75,6 @@ def meow [ n = 1 ] { "m{rr,r,}{e,ee,{,e,aa}o}w{,w,ww}" | str expand | shuffle | first $n | str join ' ' } -alias miau = meow; - def bars [display_name?: string] { print $display_name; pkill eww @@ -92,7 +90,6 @@ def bars [display_name?: string] { def "dp ccchh" [] { layaway "hdmi2 + edp/bottom,center" - pkill eww bars "25BL56WY" } @@ -100,6 +97,5 @@ def "dp gay" [] { layaway "dp3 + edp1/bottom,center + dp5/right,top" # manual fix for lack of frequency in layaway, else monitor just turns off swaymsg "output DP-3 position 0 0 scale 1 transform normal resolution 1920x1080@60Hz" - pkill eww bars "LEN G27c-10" } diff --git a/programs/bar-ws-monitor/src/main.rs b/programs/bar-ws-monitor/src/main.rs index 23cfb6e..31d7d34 100644 --- a/programs/bar-ws-monitor/src/main.rs +++ b/programs/bar-ws-monitor/src/main.rs @@ -46,6 +46,7 @@ fn main() -> Result<(), std::io::Error> { .values() .map(|it| it.clone()) .collect::>(); + workspaces.sort_by(|a, b| a.idx.cmp(&b.idx)); workspaces.sort_by(|a, b| { a.output @@ -71,13 +72,21 @@ fn main() -> Result<(), std::io::Error> { let results = workspaces .iter() - .map(|ws| WsData { - color: output_colors_lut[&ws.output.clone().expect("unreachable")] - [if ws.is_active { 1 } else { 0 }], - idx: ws.idx, - focused: ws.is_focused, - active: ws.is_active, - }) + .map( + |Workspace { + idx, + output, + is_active, + is_focused, + .. + }| WsData { + color: output_colors_lut[&output.clone().expect("unreachable")] + [if *is_active { 1 } else { 0 }], + idx: *idx, + focused: *is_focused, + active: *is_active, + }, + ) .collect::>(); println!("{}", serde_json::to_string(&results).unwrap());