From 67b3160ae2c9c00005e033d4482d29e319b2912c Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Mon, 30 Dec 2024 20:45:44 +0100 Subject: [PATCH] niri: revert config to before formatter (it fucked up lots of stuff) --- modules/home/niri/config.kdl | 572 +++++++++++++---------------------- 1 file changed, 203 insertions(+), 369 deletions(-) diff --git a/modules/home/niri/config.kdl b/modules/home/niri/config.kdl index 667069f..641f71c 100644 --- a/modules/home/niri/config.kdl +++ b/modules/home/niri/config.kdl @@ -6,23 +6,29 @@ input { } track-layout "global" } + touchpad { tap natural-scroll scroll-method "two-finger" click-method "button-areas" } + mouse { accel-speed -0.8 } + focus-follows-mouse max-scroll-amount="5%" } + output "HDMI-A-1" { variable-refresh-rate } + layout { gaps 16 center-focused-column "never" + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. preset-column-widths { // Proportion sets the width as a fraction of the output width, taking gaps into account. @@ -31,16 +37,19 @@ layout { proportion 0.33333 proportion 0.5 proportion 0.66667 -// Fixed sets the width in logical pixels exactly. -// fixed 1920 } + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. // preset-window-heights { } + // You can change the default width of the new windows. - default-column-width { - proportion 0.5 - } + default-column-width { proportion 0.5; } // If you leave the brackets empty, the windows themselves will decide their initial width. // default-column-width {} + // By default focus ring and border are rendered as a solid background rectangle // behind windows. That is, they will show up through semitransparent windows. // This is because windows using client-side decorations can have an arbitrary shape. @@ -51,318 +60,205 @@ layout { // // Alternatively, you can override it with a window rule called // `draw-border-with-background`. + // You can change how the focus ring looks. focus-ring { + // How many logical pixels the ring extends out from the windows. width 4 + // Colors can be set in a variety of ways: // - CSS named colors: "red" // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + // Color of the ring on the active monitor. active-color "#8d4eef" + // Color of the ring on inactive monitors. inactive-color "#505050" -// You can also use gradients. They take precedence over solid colors. -// Gradients are rendered the same as CSS linear-gradient(angle, from, to). -// The angle is the same as in linear-gradient, and is optional, -// defaulting to 180 (top-to-bottom gradient). -// You can use any CSS linear-gradient tool on the web to set these up. -// Changing the color space is also supported, check the wiki for more info. -// -// active-gradient from="#80c8ff" to="#bbddff" angle=45 -// You can also color the gradient relative to the entire view -// of the workspace, rather than relative to just the window itself. -// To do that, set relative-to="workspace-view". -// -// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" } + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#bbddff" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + // You can also add a border. It's similar to the focus ring, but always visible. 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 + width 4 active-color "#ffc87f" inactive-color "#505050" -// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" -// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" } + + // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + // Struts shrink the area occupied by windows, similarly to layer-shell panels. // You can think of them as a kind of outer gaps. They are set in logical pixels. // Left and right struts will cause the next window to the side to always be visible. // Top and bottom struts will simply add outer gaps in addition to the area occupied by // layer-shell panels and regular gaps. struts { -// left 64 -// right 64 -// top 64 -// bottom 64 + // left 64 + // right 64 + // top 64 + // bottom 64 } } + spawn-at-startup "wpaperd" + prefer-no-csd + screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + animations { -// Uncomment to turn off all animations. -// off -// Slow down all animations by this factor. Values below 1 speed them up instead. -// slowdown 3.0 + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 } + window-rule { // This regular expression is intentionally made as specific as possible, // since this is the default config, and we want no false positives. // You can get away with just app-id="wezterm" if you want. - match app-id=r"^org\.wezfurlong\.wezterm$" - default-column-width { - - } + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} } + window-rule { geometry-corner-radius 8 clip-to-geometry true } + binds { - Mod+Shift+Backslash { - show-hotkey-overlay - } - Mod+T { - spawn "wezterm" "start" - } - Mod+D { - spawn "fuzzel" - } - Super+Alt+L { - spawn "swaylock" - } - XF86AudioRaiseVolume allow-when-locked=true { - spawn "swayosd-client" "--output-volume=raise" - } - XF86AudioLowerVolume allow-when-locked=true { - spawn "swayosd-client" "--output-volume=lower" - } - XF86AudioMute allow-when-locked=true { - spawn "swayosd-client" "--output-volume=mute-toggle" - } - XF86AudioMicMute allow-when-locked=true { - spawn "swayosd-client" "--input-volume=mute-toggle" - } - XF86MonBrightnessUp allow-when-locked=true { - spawn "swayosd-client" "--brightness=raise" - } - XF86MonBrightnessDown allow-when-locked=true { - spawn "swayosd-client" "--brightness=lower" - } - XF86AudioPlay allow-when-locked=true { - spawn "playerctl" "play-pause" - } - XF86AudioStop allow-when-locked=true { - spawn "playerctl" "stop" - } - XF86AudioPrev allow-when-locked=true { - spawn "playerctl" "previous" - } - XF86AudioNext allow-when-locked=true { - spawn "playerctl" "next" - } - Mod+Q { - close-window - } - Mod+Left { - focus-column-left - } - Mod+Down { - focus-window-down - } - Mod+Up { - focus-window-up - } - Mod+Right { - focus-column-right - } - Mod+H { - focus-column-left - } - Mod+J { - focus-window-down - } - Mod+K { - focus-window-up - } - Mod+L { - focus-column-right - } - Mod+Ctrl+Left { - move-column-left - } - Mod+Ctrl+Down { - move-window-down - } - Mod+Ctrl+Up { - move-window-up - } - Mod+Ctrl+Right { - move-column-right - } - Mod+Ctrl+H { - move-column-left - } - Mod+Ctrl+J { - move-window-down - } - Mod+Ctrl+K { - move-window-up - } - Mod+Ctrl+L { - move-column-right - } - Mod+Home { - focus-column-first - } - Mod+End { - focus-column-last - } - Mod+Ctrl+Home { - move-column-to-first - } - Mod+Ctrl+End { - move-column-to-last - } - Mod+Shift+Left { - focus-monitor-left - } - Mod+Shift+Down { - focus-monitor-down - } - Mod+Shift+Up { - focus-monitor-up - } - Mod+Shift+Right { - focus-monitor-right - } - Mod+Shift+H { - focus-monitor-left - } - Mod+Shift+J { - focus-monitor-down - } - Mod+Shift+K { - focus-monitor-up - } - Mod+Shift+L { - focus-monitor-right - } - Mod+Shift+Ctrl+Left { - move-column-to-monitor-left - } - Mod+Shift+Ctrl+Down { - move-column-to-monitor-down - } - Mod+Shift+Ctrl+Up { - move-column-to-monitor-up - } - Mod+Shift+Ctrl+Right { - move-column-to-monitor-right - } - Mod+Shift+Ctrl+H { - move-column-to-monitor-left - } - Mod+Shift+Ctrl+J { - move-column-to-monitor-down - } - Mod+Shift+Ctrl+K { - move-column-to-monitor-up - } - Mod+Shift+Ctrl+L { - move-column-to-monitor-right - } + Mod+Shift+Backslash { show-hotkey-overlay; } + + Mod+T { spawn "wezterm" "start"; } + Mod+D { spawn "fuzzel"; } + Super+Alt+L { spawn "swaylock"; } + + XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume=raise"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume=lower"; } + XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume=mute-toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume=mute-toggle"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "swayosd-client" "--brightness=raise"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "swayosd-client" "--brightness=lower"; } + + XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } + XF86AudioStop allow-when-locked=true { spawn "playerctl" "stop"; } + XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } + XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } + + Mod+Q { close-window; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down; } + Mod+Ctrl+Up { move-window-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down; } + Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+L { move-column-right; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + Mod+Shift+J { focus-monitor-down; } + Mod+Shift+K { focus-monitor-up; } + Mod+Shift+L { focus-monitor-right; } + + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + Mod+Shift+Ctrl+J { move-column-to-monitor-down; } + Mod+Shift+Ctrl+K { move-column-to-monitor-up; } + Mod+Shift+Ctrl+L { move-column-to-monitor-right; } + // Alternatively, there are commands to move just a single window: // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } // ... + // And you can also move a whole workspace to another monitor: // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } // ... - Mod+Page_Down { - focus-workspace-down - } - Mod+Page_Up { - focus-workspace-up - } - Mod+U { - focus-workspace-down - } - Mod+I { - focus-workspace-up - } - Mod+Ctrl+Page_Down { - move-column-to-workspace-down - } - Mod+Ctrl+Page_Up { - move-column-to-workspace-up - } - Mod+Ctrl+U { - move-column-to-workspace-down - } - Mod+Ctrl+I { - move-column-to-workspace-up - } + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + // Alternatively, there are commands to move just a single window: // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } // ... - Mod+Shift+Page_Down { - move-workspace-down - } - Mod+Shift+Page_Up { - move-workspace-up - } - Mod+Shift+U { - move-workspace-down - } - Mod+Shift+I { - move-workspace-up - } + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + // You can bind mouse wheel scroll ticks using the following syntax. // These binds will change direction based on the natural-scroll setting. // // To avoid scrolling through workspaces really fast, you can use // the cooldown-ms property. The bind will be rate-limited to this value. // You can set a cooldown on any bind, but it's most useful for the wheel. - Mod+WheelScrollDown cooldown-ms=150 { - focus-workspace-down - } - Mod+WheelScrollUp cooldown-ms=150 { - focus-workspace-up - } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { - move-column-to-workspace-down - } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { - move-column-to-workspace-up - } - Mod+WheelScrollRight { - focus-column-right - } - Mod+WheelScrollLeft { - focus-column-left - } - Mod+Ctrl+WheelScrollRight { - move-column-right - } - Mod+Ctrl+WheelScrollLeft { - move-column-left - } + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + // Usually scrolling up and down with Shift in applications results in // horizontal scrolling; these binds replicate that. - Mod+Shift+WheelScrollDown { - focus-column-right - } - Mod+Shift+WheelScrollUp { - focus-column-left - } - Mod+Ctrl+Shift+WheelScrollDown { - move-column-right - } - Mod+Ctrl+Shift+WheelScrollUp { - move-column-left - } + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+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 // discrete intervals. @@ -371,6 +267,7 @@ binds { // touchpads by default. // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + // You can refer to workspaces by index. However, keep in mind that // niri is a dynamic workspace system, so these commands are kind of // "best effort". Trying to refer to a workspace index bigger than @@ -379,97 +276,47 @@ binds { // // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on // will all refer to the 3rd workspace. - Mod+1 { - focus-workspace 1 - } - Mod+2 { - focus-workspace 2 - } - Mod+3 { - focus-workspace 3 - } - Mod+4 { - focus-workspace 4 - } - Mod+5 { - focus-workspace 5 - } - Mod+6 { - focus-workspace 6 - } - Mod+7 { - focus-workspace 7 - } - Mod+8 { - focus-workspace 8 - } - Mod+9 { - focus-workspace 9 - } - Mod+Ctrl+1 { - move-column-to-workspace 1 - } - Mod+Ctrl+2 { - move-column-to-workspace 2 - } - Mod+Ctrl+3 { - move-column-to-workspace 3 - } - Mod+Ctrl+4 { - move-column-to-workspace 4 - } - Mod+Ctrl+5 { - move-column-to-workspace 5 - } - Mod+Ctrl+6 { - move-column-to-workspace 6 - } - Mod+Ctrl+7 { - move-column-to-workspace 7 - } - Mod+Ctrl+8 { - move-column-to-workspace 8 - } - Mod+Ctrl+9 { - move-column-to-workspace 9 - } + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+1 { move-column-to-workspace 1; } + Mod+Ctrl+2 { move-column-to-workspace 2; } + Mod+Ctrl+3 { move-column-to-workspace 3; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + // Alternatively, there are commands to move just a single window: // Mod+Ctrl+1 { move-window-to-workspace 1; } + // Switches focus between the current and the previous workspace. // Mod+Tab { focus-workspace-previous; } + // Consume one window from the right into the focused column. - Mod+Comma { - consume-window-into-column - } + Mod+Comma { consume-window-into-column; } // Expel one window from the focused column to the right. - Mod+Period { - expel-window-from-column - } + Mod+Period { expel-window-from-column; } + // There are also commands that consume or expel a single window to the side. - Mod+BracketLeft { - consume-or-expel-window-left - } - Mod+BracketRight { - consume-or-expel-window-right - } - Mod+R { - switch-preset-column-width - } - Mod+Shift+R { - switch-preset-window-height - } - Mod+Ctrl+R { - reset-window-height - } - Mod+F { - maximize-column - } - Mod+Shift+F { - fullscreen-window - } - Mod+C { - center-column - } + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + Mod+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+C { center-column; } + // Finer width adjustments. // This command can also: // * set width in pixels: "1000" @@ -478,19 +325,13 @@ binds { // * adjust width as a percentage of screen width: "-10%" or "+10%" // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, // set-column-width "100" will make the column occupy 200 physical screen pixels. - Mod+Minus { - set-column-width "-10%" - } - Mod+Equal { - set-column-width "+10%" - } + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + // Finer height adjustments when in column with other windows. - Mod+Shift+Minus { - set-window-height "-10%" - } - Mod+Shift+Equal { - set-window-height "+10%" - } + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + // Actions to switch layouts. // Note: if you uncomment these, make sure you do NOT have // a matching layout switch hotkey configured in xkb options above. @@ -498,22 +339,15 @@ binds { // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). // Mod+Space { switch-layout "next"; } // Mod+Shift+Space { switch-layout "prev"; } - Print { - screenshot - } - Ctrl+Print { - screenshot-screen - } - Alt+Print { - screenshot-window - } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + // The quit action will show a confirmation dialog to avoid accidental exits. - Mod+Shift+E { - quit - } + Mod+Shift+E { quit; } + // Powers off the monitors. To turn them back on, do any input like // moving the mouse or pressing any other key. - Mod+Shift+P { - power-off-monitors - } -} + Mod+Shift+P { power-off-monitors; } +} \ No newline at end of file