diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/mako/config b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/mako/config index 64eb6fcf..a0df20c6 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/mako/config +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/mako/config @@ -4,8 +4,8 @@ background-color=#f9f5d7 text-color=#3c3836 width=300 height=110 -border-size=3 -border-color=#b16286 +border-size=4 +border-color=#d79921 border-radius=0 icons=0 max-icon-size=64 @@ -14,11 +14,11 @@ ignore-timeout=1 font=Hack Nerd Font Mono 12 [urgency=low] -border-color=#b16286 +border-color=#d79921 [urgency=normal] -border-color=#b16286 +border-color=#d79921 [urgency=high] -border-color=#b16286 +border-color=#d79921 default-timeout=0 \ No newline at end of file diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl index 98c2291a..c7dff891 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/niri/config.kdl @@ -126,7 +126,7 @@ layout { // You can change how the focus ring looks. focus-ring { // Uncomment this line to disable the focus ring. - // off + off // How many logical pixels the ring extends out from the windows. width 4 @@ -137,10 +137,10 @@ layout { // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. // Color of the ring on the active monitor. - active-color "#7fc8ff" + active-color "#d79921" // Color of the ring on inactive monitors. - inactive-color "#505050" + inactive-color "#282828" // You can also use gradients. They take precedence over solid colors. // Gradients are rendered the same as CSS linear-gradient(angle, from, to). @@ -161,11 +161,11 @@ layout { border { // The settings are the same as for the focus ring. // If you enable the border, you probably want to disable the focus ring. - off + // off width 4 - active-color "#ffc87f" - inactive-color "#505050" + active-color "#d79921" + inactive-color "#282828" // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" @@ -277,8 +277,8 @@ binds { Alt+Up { focus-window-up; } Alt+Right { focus-column-right; } Alt+H { focus-column-left; } - Alt+J { focus-window-down; } - Alt+K { focus-window-up; } + Alt+Ctrl+J { focus-window-down; } + Alt+Ctrl+K { focus-window-up; } Alt+L { focus-column-right; } Alt+Shift+Left { move-column-left; } @@ -286,8 +286,8 @@ binds { Alt+Shift+Up { move-window-up; } Alt+Shift+Right { move-column-right; } Alt+Shift+H { move-column-left; } - Alt+Shift+J { move-window-down; } - Alt+Shift+K { move-window-up; } + Alt+Shift+Ctrl+J { move-window-down; } + Alt+Shift+Ctrl+K { move-window-up; } Alt+Shift+L { move-column-right; } // Alternative commands that move across workspaces when reaching @@ -297,10 +297,10 @@ binds { // Alt+Ctrl+J { move-window-down-or-to-workspace-down; } // Alt+Ctrl+K { move-window-up-or-to-workspace-up; } - Alt+Home { focus-column-first; } - Alt+End { focus-column-last; } - Alt+Ctrl+Home { move-column-to-first; } - Alt+Ctrl+End { move-column-to-last; } + // Alt+Home { focus-column-first; } + // Alt+End { focus-column-last; } + // Alt+Ctrl+Home { move-column-to-first; } + // Alt+Ctrl+End { move-column-to-last; } // Alt+Shift+Left { focus-monitor-left; } // Alt+Shift+Down { focus-monitor-down; } @@ -328,12 +328,12 @@ binds { // Alt+Shift+Ctrl+Left { move-workspace-to-monitor-left; } // ... - Alt+Page_Down { focus-workspace-down; } - Alt+Page_Up { focus-workspace-up; } + Alt+J { focus-workspace-down; } + Alt+K { focus-workspace-up; } // Alt+U { focus-workspace-down; } // Alt+I { focus-workspace-up; } - Alt+Shift+Page_Down { move-column-to-workspace-down; } - Alt+Shift+Page_Up { move-column-to-workspace-up; } + Alt+Shift+J { move-column-to-workspace-down; } + Alt+Shift+K { move-column-to-workspace-up; } // Alt+Ctrl+U { move-column-to-workspace-down; } // Alt+Ctrl+I { move-column-to-workspace-up; } @@ -354,20 +354,20 @@ binds { // You can set a cooldown on any bind, but it's most useful for the wheel. Alt+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } Alt+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Alt+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Alt+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + Alt+Shift+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Alt+Shift+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } Alt+WheelScrollRight { focus-column-right; } Alt+WheelScrollLeft { focus-column-left; } - Alt+Ctrl+WheelScrollRight { move-column-right; } - Alt+Ctrl+WheelScrollLeft { move-column-left; } + Alt+Shift+WheelScrollRight { move-column-right; } + Alt+Shift+WheelScrollLeft { move-column-left; } // Usually scrolling up and down with Shift in applications results in // horizontal scrolling; these binds replicate that. - Alt+Shift+WheelScrollDown { focus-column-right; } - Alt+Shift+WheelScrollUp { focus-column-left; } - Alt+Ctrl+Shift+WheelScrollDown { move-column-right; } - Alt+Ctrl+Shift+WheelScrollUp { move-column-left; } + // Alt+Shift+WheelScrollDown { focus-column-right; } + // Alt+Shift+WheelScrollUp { focus-column-left; } + // Alt+Ctrl+Shift+WheelScrollDown { move-column-right; } + // Alt+Ctrl+Shift+WheelScrollUp { move-column-left; } // Similarly, you can bind touchpad scroll "ticks". // Touchpad scrolling is continuous, so for these binds it is split into @@ -411,8 +411,8 @@ binds { // Switches focus between the current and the previous workspace. // Alt+Tab { focus-workspace-previous; } - Alt+Comma { consume-window-into-column; } - Alt+Period { expel-window-from-column; } + // Alt+Comma { consume-window-into-column; } + // Alt+Period { expel-window-from-column; } // There are also commands that consume or expel a single window to the side. // Alt+BracketLeft { consume-or-expel-window-left; } diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css index 22427d3d..e84fb2e7 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/waybar/style.css @@ -75,7 +75,7 @@ window#waybar { } #tray { - margin: 3px 3px 3px 3px; + margin: 3px 3px 3px 0px; padding: 5px 7px 5px 5px; background: @background-color; color: @foreground-color;