From ddea9598f2cf0f12287b2c69982cf6e5ad99739c Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Tue, 10 Feb 2026 16:53:24 -0700 Subject: [PATCH] Fixed more settings overrides --- modules/home/niri.nix | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/home/niri.nix b/modules/home/niri.nix index e5bb324..6a10334 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -10,7 +10,6 @@ in inputs.dms.homeModules.niri ]; - # Niri compositor settings (via niri-flake home-manager module) programs.niri.settings = { input = { keyboard.xkb = {}; @@ -40,24 +39,19 @@ in 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 = { - # ── 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 ─────────────────────────────────────────── "Mod+Q".action.close-window = []; - # ── Overview ─────────────────────────────────────────────── "Mod+O" = { action.toggle-overview = []; repeat = false; }; - # ── Focus (arrows + vim keys) ───────────────────────────── "Mod+Left".action.focus-column-left = []; "Mod+Down".action.focus-window-down = []; "Mod+Up".action.focus-window-up = []; @@ -67,13 +61,11 @@ in "Mod+K".action.focus-window-up = []; "Mod+L".action.focus-column-right = []; - # ── 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 = []; @@ -83,19 +75,16 @@ in "Mod+Ctrl+K".action.move-window-up = []; "Mod+Ctrl+L".action.move-column-right = []; - # ── 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 ─────────────────────────────────────── "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 ──────────────────────────────────────────── "Mod+Page_Down".action.focus-workspace-down = []; "Mod+Page_Up".action.focus-workspace-up = []; "Mod+Ctrl+Page_Down".action.move-column-to-workspace-down = []; @@ -121,7 +110,6 @@ in "Mod+Ctrl+8".action.move-column-to-workspace = 8; "Mod+Ctrl+9".action.move-column-to-workspace = 9; - # ── 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 = []; @@ -137,21 +125,17 @@ in "Mod+Shift+V".action.switch-focus-between-floating-and-tiling = []; "Mod+W".action.toggle-column-tabbed-display = []; - # ── 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 ─────────────────────────────────────────── "Print".action.screenshot = []; "Ctrl+Print".action.screenshot-screen = []; "Alt+Print".action.screenshot-window = []; - # ── 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"; @@ -160,7 +144,6 @@ in "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; }; @@ -170,14 +153,12 @@ in "XF86AudioPrev" = { action.spawn-sh = "playerctl previous"; allow-when-locked = true; }; "XF86AudioNext" = { action.spawn-sh = "playerctl next"; allow-when-locked = true; }; - # ── Session ─────────────────────────────────────────────── "Mod+Shift+E".action.quit = []; "Mod+Shift+P".action.power-off-monitors = []; "Mod+Escape" = { action.toggle-keyboard-shortcuts-inhibit = []; allow-inhibiting = false; }; }; }; - # DankMaterialShell programs.dank-material-shell = { enable = true; enableSystemMonitoring = true; @@ -193,6 +174,7 @@ in override = false; originalFileName = "hm"; filesToInclude = [ + "binds" "outputs" ]; }; @@ -201,10 +183,13 @@ in settings = { theme = "dark"; dynamicTheming = true; + use24HourClock = false; + showDock = true; + dockPosition = 1; + dockBorderEnabled = true; }; }; - # Mouse settings home.pointerCursor = { name = "Adwaita"; package = pkgs.adwaita-icon-theme;