From e974cceec67e83c6125f8f4351cad86741e3b8e8 Mon Sep 17 00:00:00 2001
From: ulve <johansson.olov@gmail.com>
Date: Sat, 13 Jun 2026 22:38:41 +0200
Subject: [PATCH] niri: refine keybindings and add focus-follows-mouse

---
 config/niri/config.kdl | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/config/niri/config.kdl b/config/niri/config.kdl
index f86cafa..d1c814b 100644
--- a/config/niri/config.kdl
+++ b/config/niri/config.kdl
@@ -12,6 +12,8 @@ input {
         natural-scroll
         scroll-factor 0.3
     }
+
+    focus-follows-mouse
 }
 
 layout {
@@ -53,23 +55,33 @@ binds {
     Mod+Shift+Q { spawn "wlogout"; }
 
     Mod+Q { close-window; }
+    Mod+F1 { show-hotkey-overlay; }
+    Mod+Tab { toggle-overview; }
 
     Mod+H { focus-column-left; }
     Mod+L { focus-column-right; }
     Mod+J { focus-window-down; }
     Mod+K { focus-window-up; }
+    Mod+U { focus-workspace-down; }
+    Mod+I { focus-workspace-up; }
 
     Mod+Shift+H { move-column-left; }
     Mod+Shift+L { move-column-right; }
-    Mod+Shift+J { move-window-down; }
-    Mod+Shift+K { move-window-up; }
+    Mod+Ctrl+U { move-column-to-workspace-down; }
+    Mod+Ctrl+I { move-column-to-workspace-up; }
 
-    Mod+F { fullscreen-window; }
+    Mod+C hotkey-overlay-title="Center column" { center-column; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
     Mod+Space { switch-preset-column-width; }
     Mod+Shift+Space { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
 
-    Mod+Minus { set-column-width "-10%"; }
-    Mod+Equal { set-column-width "+10%"; }
+    Mod+Comma { consume-or-expel-window-left; }
+    Mod+Period { consume-or-expel-window-right; }
+
+    Mod+Minus hotkey-overlay-title="Shrink column" { set-column-width "-10%"; }
+    Mod+Shift+Minus hotkey-overlay-title="Grow column" { set-column-width "+10%"; }
 
     Mod+1 { focus-workspace 1; }
     Mod+2 { focus-workspace 2; }
@@ -80,14 +92,14 @@ binds {
     Mod+7 { focus-workspace 7; }
     Mod+8 { focus-workspace 8; }
 
-    Mod+Shift+1 { move-window-to-workspace 1; }
-    Mod+Shift+2 { move-window-to-workspace 2; }
-    Mod+Shift+3 { move-window-to-workspace 3; }
-    Mod+Shift+4 { move-window-to-workspace 4; }
-    Mod+Shift+5 { move-window-to-workspace 5; }
-    Mod+Shift+6 { move-window-to-workspace 6; }
-    Mod+Shift+7 { move-window-to-workspace 7; }
-    Mod+Shift+8 { move-window-to-workspace 8; }
+    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+WheelScrollDown cooldown-ms=150 { focus-workspace-down; }
     Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; }
@@ -99,6 +111,6 @@ binds {
     XF86MonBrightnessUp { spawn "brightnessctl" "set" "5%+"; }
     XF86MonBrightnessDown { spawn "brightnessctl" "set" "5%-"; }
 
-    Mod+Shift+S { spawn "sh" "-c" "grim -l 0 -g \"$(slurp)\" - | wl-copy"; }
-    Mod+Alt+S { spawn "sh" "-c" "mkdir -p ~/Pictures/Screenshots && grim -l 0 -g \"$(slurp)\" - | satty --filename - --output-filename ~/Pictures/Screenshots/$(date +\"%Y-%m-%d_%H-%M-%S\").png"; }
+    Mod+Shift+S hotkey-overlay-title="Screenshot region to clipboard" { spawn "sh" "-c" "grim -l 0 -g \"$(slurp)\" - | wl-copy"; }
+    Mod+Alt+S hotkey-overlay-title="Screenshot region → annotate → save" { spawn "sh" "-c" "mkdir -p ~/Pictures/Screenshots && grim -l 0 -g \"$(slurp)\" - | satty --filename - --output-filename ~/Pictures/Screenshots/$(date +\"%Y-%m-%d_%H-%M-%S\").png"; }
 }