1 files changed, 21 insertions, 27 deletions

diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index 3c3c00e..9ede74e 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -16,43 +16,52 @@ in
   };
   "Mod+Slash".action = show-hotkey-overlay;
 
-  # Audio
   XF86AudioRaiseVolume.action = playerctl "volume" "0.03+";
   XF86AudioLowerVolume.action = playerctl "volume" "0.03-";
-  # microphone
-  XF86AudioMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
-  # # headphones
-  "Mod+XF86AudioMute".action = spawn "sh" "-c" ''
+  XF86AudioMute.action = spawn "sh" "-c" ''
     wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \
     wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
   '';
+  XF86Tools.action = spawn "sh" "-c" ''
+    wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \
+    wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+  '';
+
+  "Mod+WheelScrollDown".action = focus-column-right;
+  "Mod+WheelScrollUp".action = focus-column-left;
+  "Mod+Shift+WheelScrollDown".action = move-column-right;
+  "Mod+Shift+WheelScrollUp".action = move-column-left;
+
+  "Super+WheelScrollDown".action = focus-workspace-down;
+  "Super+WheelScrollUp".action = focus-workspace-up;
+  "Super+Shift+WheelScrollDown".action = move-window-down-or-to-workspace-down;
+  "Super+Shift+WheelScrollUp".action = move-window-up-or-to-workspace-up;
+
+  XF86Launch5.action = consume-or-expel-window-right;
+  XF86Launch6.action = consume-or-expel-window-left;
+  XF86Launch7.action = switch-preset-column-width;
 
   "Super+Shift+L".action = spawn "swaylock" "-f";
-  # Media keys
   XF86AudioPlay.action = playerctl "play-pause";
   XF86AudioPrev.action = playerctl "previous";
   XF86AudioNext.action = playerctl "next";
 
-  # Column sizing
   "Mod+Minus".action = set-column-width "-10%";
   "Mod+Equal".action = set-column-width "+10%";
 
-  # Finer height adjustments when in column with other windows.
   "Mod+Shift+Minus".action = set-window-height "-10%";
   "Mod+Shift+Equal".action = set-window-height "+10%";
 
-  # Misc
   "Mod+Shift+V".action = toggle-window-floating;
-  "Mod+Shift+P".action = power-off-monitors;
   "Mod+W".action = toggle-column-tabbed-display;
 
-  "Mod+S" = {
+  "Mod+XF86Launch7" = {
     action = spawn "sh" "-c" ''
       grim -g "$(slurp)" - | tee ${ss}.png | wl-copy
     '';
     repeat = false;
   };
-  "Mod+Shift+S" = {
+  "Mod+Shift+XF86Launch7" = {
     action = spawn "sh" "-c" ''
       grim -g "$(slurp)" ${ss}.png
       satty --filename "${ss}.png" --output-filename "${ss}-edited.png"
@@ -64,24 +73,12 @@ in
     cliphist list | fuzzel --dmenu | cliphist decode | wl-copy
   '';
 
-  # --- System / General ---
   "Mod+Return".action = spawn "foot";
   "Mod+D".action = spawn "fuzzel";
   "Mod+C".action = spawn "qalculate-gtk";
   "Mod+BracketLeft".action = consume-or-expel-window-left;
   "Mod+BracketRight".action = consume-or-expel-window-right;
 
-  # "XF86Tools" = {
-  #   action = spawn "sh" "-c" ''
-  #     pkill -9 firefox || true
-  #     swaylock -f
-  #     wpctl set-mute @DEFAULT_AUDIO_SINK@ 1
-  #     wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1
-  #     niri msg action power-off-monitors
-  #   '';
-  #   repeat = false;
-  # };
-
   "Mod+R".action = switch-preset-column-width;
   "Mod+Shift+R".action = reset-window-height;
   "Mod+F".action = maximize-column;
@@ -92,19 +89,16 @@ in
 
   "Mod+Shift+E".action = quit;
 
-  # --- Window Navigation (Focus) ---
   "Mod+H".action = focus-column-left;
   "Mod+L".action = focus-column-right;
   "Mod+J".action = focus-workspace-down;
   "Mod+K".action = focus-workspace-up;
 
-  # --- Window Management (Move) ---
   "Mod+Shift+H".action = move-column-left;
   "Mod+Shift+L".action = move-column-right;
   "Mod+Shift+J".action = move-window-down-or-to-workspace-down;
   "Mod+Shift+K".action = move-window-up-or-to-workspace-up;
 
-  # --- Window State ---
   "Mod+Shift+Q".action = close-window;
 
   "Super+Return".action = spawn "obs-cmd" "replay" "save";