alot

2 files changed, 17 insertions, 22 deletions

diff --git a/home/wayland/niri/binds.nix b/home/wayland/niri/binds.nix
index 0277e50..8e9f1d0 100644
--- a/home/wayland/niri/binds.nix
+++ b/home/wayland/niri/binds.nix
@@ -1,17 +1,11 @@
 { config, pkgs, ... }:
-
-let
-  # helpers
-  actions = config.lib.niri.actions;
-  spawn = actions.spawn;
-
-  # common action factories
-  set-volume = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@";
-  playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
-in
 {
-  programs.niri.settings.binds = with actions; {
-
+  programs.niri.settings.binds = with config.lib.niri.actions;    
+  let
+    set-volume = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@";
+    playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
+  in
+  {
     # Overview / help
     "Mod+O" = {
       action = toggle-overview;
@@ -20,14 +14,15 @@ in
     "Mod+Slash".action = show-hotkey-overlay;
 
     # Audio
-    XF86AudioRaiseVolume.action = set-volume "2%+";
-    XF86AudioLowerVolume.action = set-volume "2%-";
+    # XF86AudioRaiseVolume.action = set-volume "2%+";
+    # XF86AudioLowerVolume.action = set-volume "2%-";
+    XF86AudioRaiseVolume.action = playerctl "volume" "0.02+";
+    XF86AudioLowerVolume.action = playerctl "volume" "0.02-";
     XF86AudioMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
     XF86AudioMicMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
 
     # Media keys
     XF86AudioPlay.action = playerctl "play-pause";
-    XF86AudioStop.action = playerctl "pause";
     XF86AudioPrev.action = playerctl "previous";
     XF86AudioNext.action = playerctl "next";
 
@@ -76,7 +71,6 @@ in
     "Mod+Shift+R".action = reset-window-height;
     "Mod+F".action = maximize-column;
     "Mod+Shift+F".action = fullscreen-window;
-    "Mod+C".action = center-column;
 
     "Mod+Comma".action = consume-window-into-column;
     "Mod+Period".action = expel-window-from-column;
@@ -105,11 +99,11 @@ in
     "Mod+5".action = focus-workspace 5;
     "Mod+6".action = focus-workspace 6;
 
-    "Mod+Ctrl+1".action.move-column-to-workspace = [ 1 ];
-    "Mod+Ctrl+2".action.move-column-to-workspace = [ 2 ];
-    "Mod+Ctrl+3".action.move-column-to-workspace = [ 3 ];
-    "Mod+Ctrl+4".action.move-column-to-workspace = [ 4 ];
-    "Mod+Ctrl+5".action.move-column-to-workspace = [ 5 ];
-    "Mod+Ctrl+6".action.move-column-to-workspace = [ 6 ];
+    "Mod+Shift+1".action.move-column-to-workspace = [ 1 ];
+    "Mod+Shift+2".action.move-column-to-workspace = [ 2 ];
+    "Mod+Shift+3".action.move-column-to-workspace = [ 3 ];
+    "Mod+Shift+4".action.move-column-to-workspace = [ 4 ];
+    "Mod+Shift+5".action.move-column-to-workspace = [ 5 ];
+    "Mod+Shift+6".action.move-column-to-workspace = [ 6 ];
   };
 }
diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix
index 7d0537a..60a5e16 100644
--- a/home/wayland/niri/niri.nix
+++ b/home/wayland/niri/niri.nix
@@ -5,6 +5,7 @@
   ];
   programs.niri.settings = {
     prefer-no-csd = true;
+    hotkey-overlay.skip-at-startup = true;
     input = {
       mouse = {
         accel-profile = "flat";