Compare commits

...

4 commits

6 changed files with 22 additions and 18 deletions

View file

@ -50,6 +50,8 @@
is-floating = true; is-floating = true;
}]; }];
shadow = { shadow = {
offset.y = 0;
offset.x = 0;
softness = 40; softness = 40;
color = "#bab9e5af"; color = "#bab9e5af";
inactive-color = "#fa9d99af"; inactive-color = "#fa9d99af";

View file

@ -3,8 +3,8 @@
:class "workspaces" :class "workspaces"
(for workspace in workspaces (for workspace in workspaces
(button (button
:style "border-bottom: 4px solid ${workspace.color}" :style "border-bottom: 4px solid ${workspace.color}${workspace.active ? "; background-color: #3c3836" : ""}"
:class "${workspace.active ? "focused" : 0}" :class "${workspace.focused ? "focused" : ""}"
:onclick "swaymsg workspace ${workspace.name}" :onclick "swaymsg workspace ${workspace.name}"
(label :text "${workspace.idx}") (label :text "${workspace.idx}")
) )

View file

@ -10,10 +10,6 @@ label {
border: 0px; border: 0px;
} }
.workspaces button.urgent {
background-color: #cc241d;
}
.workspaces button.focused { .workspaces button.focused {
background-color: #504935; background-color: #504935;
} }
@ -37,4 +33,4 @@ label {
.traveldingsWindow { .traveldingsWindow {
border-radius: 15px; border-radius: 15px;
} }

View file

@ -36,4 +36,5 @@ alias gunim = cd ~/Docs/uni/mathe1-3;
# typos # typos
alias juts = just; alias juts = just;
alias miau = meow;
alias shut = shutdown now; alias shut = shutdown now;

View file

@ -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 ' ' "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] { def bars [display_name?: string] {
print $display_name; print $display_name;
pkill eww pkill eww
@ -92,7 +90,6 @@ def bars [display_name?: string] {
def "dp ccchh" [] { def "dp ccchh" [] {
layaway "hdmi2 + edp/bottom,center" layaway "hdmi2 + edp/bottom,center"
pkill eww
bars "25BL56WY" bars "25BL56WY"
} }
@ -100,6 +97,5 @@ def "dp gay" [] {
layaway "dp3 + edp1/bottom,center + dp5/right,top" layaway "dp3 + edp1/bottom,center + dp5/right,top"
# manual fix for lack of frequency in layaway, else monitor just turns off # 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" swaymsg "output DP-3 position 0 0 scale 1 transform normal resolution 1920x1080@60Hz"
pkill eww
bars "LEN G27c-10" bars "LEN G27c-10"
} }

View file

@ -46,6 +46,7 @@ fn main() -> Result<(), std::io::Error> {
.values() .values()
.map(|it| it.clone()) .map(|it| it.clone())
.collect::<Vec<Workspace>>(); .collect::<Vec<Workspace>>();
workspaces.sort_by(|a, b| a.idx.cmp(&b.idx)); workspaces.sort_by(|a, b| a.idx.cmp(&b.idx));
workspaces.sort_by(|a, b| { workspaces.sort_by(|a, b| {
a.output a.output
@ -71,13 +72,21 @@ fn main() -> Result<(), std::io::Error> {
let results = workspaces let results = workspaces
.iter() .iter()
.map(|ws| WsData { .map(
color: output_colors_lut[&ws.output.clone().expect("unreachable")] |Workspace {
[if ws.is_active { 1 } else { 0 }], idx,
idx: ws.idx, output,
focused: ws.is_focused, is_active,
active: ws.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::<Vec<_>>(); .collect::<Vec<_>>();
println!("{}", serde_json::to_string(&results).unwrap()); println!("{}", serde_json::to_string(&results).unwrap());