diff --git a/modules/home/niri.nix b/modules/home/niri.nix index c491b10..3ca5269 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -1,5 +1,9 @@ { config, pkgs, inputs, ... }: +let + settings = import ../../settings.nix; + wallpaperPath = "/home/${settings.username}/Assets/wallpapers/sound.png"; +in { imports = [ inputs.dms.homeModules.dank-material-shell @@ -36,21 +40,24 @@ spawn-at-startup = [ { argv = [ "xwayland-satellite" ]; } + # Set wallpaper via DMS IPC (waits briefly for DMS to start) + { sh = "sleep 2 && dms ipc call wallpaper set ${wallpaperPath}"; } ]; binds = { - # Terminal & apps + # ── App launchers ────────────────────────────────────────── + "Mod+D".action.spawn-sh = "dms ipc call spotlight toggle"; "Mod+T".action.spawn = "ghostty"; "Mod+B".action.spawn = "librewolf"; "Mod+E".action.spawn = "nautilus"; - # Close window + # ── Close window ─────────────────────────────────────────── "Mod+Q".action.close-window = []; - # Overview + # ── Overview ─────────────────────────────────────────────── "Mod+O" = { action.toggle-overview = []; repeat = false; }; - # Focus + # ── Focus (arrows + vim keys) ───────────────────────────── "Mod+Left".action.focus-column-left = []; "Mod+Down".action.focus-window-down = []; "Mod+Up".action.focus-window-up = []; @@ -60,7 +67,13 @@ "Mod+K".action.focus-window-up = []; "Mod+L".action.focus-column-right = []; - # Move columns/windows + # ── Scroll wheel focus ──────────────────────────────────── + "Mod+WheelScrollDown" = { action.focus-column-right = []; cooldown-ms = 150; }; + "Mod+WheelScrollUp" = { action.focus-column-left = []; cooldown-ms = 150; }; + "Mod+Shift+WheelScrollDown" = { action.focus-workspace-down = []; cooldown-ms = 300; }; + "Mod+Shift+WheelScrollUp" = { action.focus-workspace-up = []; cooldown-ms = 300; }; + + # ── Move columns/windows ────────────────────────────────── "Mod+Ctrl+Left".action.move-column-left = []; "Mod+Ctrl+Down".action.move-window-down = []; "Mod+Ctrl+Up".action.move-window-up = []; @@ -70,19 +83,19 @@ "Mod+Ctrl+K".action.move-window-up = []; "Mod+Ctrl+L".action.move-column-right = []; - # Monitor focus + # ── Monitor focus ───────────────────────────────────────── "Mod+Shift+Left".action.focus-monitor-left = []; "Mod+Shift+Down".action.focus-monitor-down = []; "Mod+Shift+Up".action.focus-monitor-up = []; "Mod+Shift+Right".action.focus-monitor-right = []; - # Move to monitor + # ── Move to monitor ─────────────────────────────────────── "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = []; "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = []; "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = []; "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = []; - # Workspaces + # ── Workspaces ──────────────────────────────────────────── "Mod+Page_Down".action.focus-workspace-down = []; "Mod+Page_Up".action.focus-workspace-up = []; "Mod+Ctrl+Page_Down".action.move-column-to-workspace-down = []; @@ -108,7 +121,7 @@ "Mod+Ctrl+8".action.move-column-to-workspace = 8; "Mod+Ctrl+9".action.move-column-to-workspace = 9; - # Window management + # ── Window management ───────────────────────────────────── "Mod+BracketLeft".action.consume-or-expel-window-left = []; "Mod+BracketRight".action.consume-or-expel-window-right = []; "Mod+Comma".action.consume-window-into-column = []; @@ -124,18 +137,30 @@ "Mod+Shift+V".action.switch-focus-between-floating-and-tiling = []; "Mod+W".action.toggle-column-tabbed-display = []; - # Sizing + # ── Sizing ──────────────────────────────────────────────── "Mod+Minus".action.set-column-width = "-10%"; "Mod+Equal".action.set-column-width = "+10%"; "Mod+Shift+Minus".action.set-window-height = "-10%"; "Mod+Shift+Equal".action.set-window-height = "+10%"; + # Scroll wheel resizing + "Mod+Ctrl+WheelScrollDown" = { action.set-column-width = "-5%"; cooldown-ms = 50; }; + "Mod+Ctrl+WheelScrollUp" = { action.set-column-width = "+5%"; cooldown-ms = 50; }; - # Screenshots + # ── Screenshots ─────────────────────────────────────────── "Print".action.screenshot = []; "Ctrl+Print".action.screenshot-screen = []; "Alt+Print".action.screenshot-window = []; - # Media keys + # ── DMS shell controls ──────────────────────────────────── + "Mod+N".action.spawn-sh = "dms ipc call notifications toggle"; + "Mod+A".action.spawn-sh = "dms ipc call control-center toggle"; + "Mod+Shift+C".action.spawn-sh = "dms ipc call clipboard toggle"; + "Mod+P".action.spawn-sh = "dms ipc call settings openWith displays"; + "Mod+I".action.spawn-sh = "dms ipc call settings toggle"; + "Mod+Shift+L".action.spawn-sh = "dms ipc call lock lock"; + "Mod+Shift+D".action.spawn-sh = "dms ipc call dock toggle"; + + # ── Media keys ──────────────────────────────────────────── "XF86AudioRaiseVolume" = { action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; allow-when-locked = true; }; "XF86AudioLowerVolume" = { action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; allow-when-locked = true; }; "XF86AudioMute" = { action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; allow-when-locked = true; }; @@ -145,7 +170,7 @@ "XF86AudioPrev" = { action.spawn-sh = "playerctl previous"; allow-when-locked = true; }; "XF86AudioNext" = { action.spawn-sh = "playerctl next"; allow-when-locked = true; }; - # Session + # ── Session ─────────────────────────────────────────────── "Mod+Shift+E".action.quit = []; "Mod+Shift+P".action.power-off-monitors = []; "Mod+Escape" = { action.toggle-keyboard-shortcuts-inhibit = []; allow-inhibiting = false; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index bd7a08e..ea4169b 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -18,6 +18,10 @@ bitwarden-cli tea + # Display & desktop utilities + wdisplays + playerctl + # Desktop applications bitwarden-desktop vlc