modules/desktop-environment/home/niri/style.nix

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

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}${workspace.active ? "; background-color: #3c3836" : ""}"
+        :style "border-bottom: 4px solid ${workspace.color}"
-        :class "${workspace.focused ? "focused" : ""}"
+        :class "${workspace.active ? "focused" : 0}"
         :onclick "swaymsg workspace ${workspace.name}"
         (label :text "${workspace.idx}")
       )

modules/desktop-environment/home/panels/eww/configDir/eww.css

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

modules/shell/nu/aliases.nu

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

modules/shell/nu/custom_commands.nu

@@ -75,6 +75,8 @@ 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
@@ -90,6 +92,7 @@ def bars [display_name?: string] {
 
 def "dp ccchh" [] {
     layaway "hdmi2 + edp/bottom,center"
+    pkill eww
     bars "25BL56WY"
 }
 
@@ -97,5 +100,6 @@ 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"
 }

programs/bar-ws-monitor/src/main.rs

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