From c818330a0d7c967b9b18755ce36486726be77d0d Mon Sep 17 00:00:00 2001 From: gwg313 Date: Wed, 18 Feb 2026 22:48:08 -0500 Subject: [PATCH] some updates Signed-off-by: gwg313 --- home-manager/modules/niri/autostart.nix | 4 ++ home-manager/modules/niri/default.nix | 2 + home-manager/modules/niri/keybinds.nix | 49 ++++++++++++++++++--- home-manager/modules/niri/noctaliashell.nix | 18 ++++++-- home-manager/modules/niri/settings.nix | 14 +++++- 5 files changed, 75 insertions(+), 12 deletions(-) diff --git a/home-manager/modules/niri/autostart.nix b/home-manager/modules/niri/autostart.nix index 95a1450..5138408 100644 --- a/home-manager/modules/niri/autostart.nix +++ b/home-manager/modules/niri/autostart.nix @@ -4,6 +4,10 @@ ... }: { + home.packages = with pkgs; [ + xwayland-satellite + xdg-desktop-portal-gtk + ]; programs.niri.settings.spawn-at-startup = [ { command = [ diff --git a/home-manager/modules/niri/default.nix b/home-manager/modules/niri/default.nix index 59969f3..1ca1821 100644 --- a/home-manager/modules/niri/default.nix +++ b/home-manager/modules/niri/default.nix @@ -13,4 +13,6 @@ ./autostart.nix ./noctaliashell.nix ]; + + services.gnome-keyring.enable = true; } diff --git a/home-manager/modules/niri/keybinds.nix b/home-manager/modules/niri/keybinds.nix index 529262b..dce4bc8 100644 --- a/home-manager/modules/niri/keybinds.nix +++ b/home-manager/modules/niri/keybinds.nix @@ -33,19 +33,41 @@ in "launcher" "toggle" ]; - # Quickshell Keybinds End + + "super+shift+Slash".action = show-hotkey-overlay; + + "super+l".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "lockScreen" + "lock" + ]; "xf86audioraisevolume".action = volume-up; "xf86audiolowervolume".action = volume-down; - "control+super+xf86audioraisevolume".action = spawn "brightness" "up"; - "control+super+xf86audiolowervolume".action = spawn "brightness" "down"; + "XF86MonBrightnessDown".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "brightness" + "decrease" + ]; + "XF86MonBrightnessUp".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "brightness" + "increase" + ]; "super+q".action = close-window; - "super+b".action = spawn apps.browser; + # "super+b".action = spawn apps.browser; "super+Return".action = spawn apps.terminal; #"super+Control+Return".action = spawn apps.appLauncher; "super+E".action = spawn apps.fileManager; + "super+o".action = toggle-overview; "super+f".action = maximize-column; "super+Shift+f".action = fullscreen-window; @@ -53,8 +75,10 @@ in "super+r".action = switch-preset-column-width; "super+Shift+r".action = switch-preset-window-height; - # "control+shift+1".action = screenshot; - # "control+shift+2".action = screenshot-window {write-to-disk = true;}; + "super+b".action = + spawn-sh "${pkgs.grim}/bin/grim \"$HOME/Pictures/screenshots/desktop-$(${pkgs.busybox}/bin/date +%Y%m%d%H%M).png\""; + "super+Shift+b".action = + spawn-sh "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy"; # Screenshot selection directly to clipboard "super+Left".action = focus-column-left; "super+Right".action = focus-column-right; @@ -65,5 +89,18 @@ in "super+Shift+Right".action = move-column-right; "super+Shift+Down".action = move-column-to-workspace-down; "super+Shift+Up".action = move-column-to-workspace-up; + + "super+Control+Left".action = focus-monitor-left; + "super+Control+Right".action = focus-monitor-right; + "super+Control+Down".action = focus-monitor-down; + "super+Control+Up".action = focus-monitor-up; + + "super+BracketLeft".action = consume-or-expel-window-left; + "super+BracketRight".action = consume-or-expel-window-right; + "super+Comma".action = consume-window-into-column; + "super+Period".action = expel-window-from-column; + + "super+Home".action = focus-column-first; + "super+End".action = focus-column-last; }; } diff --git a/home-manager/modules/niri/noctaliashell.nix b/home-manager/modules/niri/noctaliashell.nix index cf7a191..f418e89 100644 --- a/home-manager/modules/niri/noctaliashell.nix +++ b/home-manager/modules/niri/noctaliashell.nix @@ -13,9 +13,16 @@ enable = true; settings = { # configure noctalia here + nightLight = { + enabled = true; + }; + dock = { + enabled = false; + }; bar = { - density = "compact"; - position = "left"; + density = "default"; + position = "top"; + floating = true; showCapsule = false; widgets = { left = [ @@ -38,6 +45,9 @@ } ]; right = [ + { + id = "Tray"; + } { alwaysShowPercentage = false; id = "Battery"; @@ -55,12 +65,12 @@ }; colorSchemes.predefinedScheme = "Monochrome"; general = { - avatarImage = "/home/drfoobar/.face"; + avatarImage = "/home/gwg313/.face"; radiusRatio = 0.2; }; location = { monthBeforeDay = true; - name = "Toronto, Canada"; + name = "Ottawa, Canada"; }; }; # this may also be a string or a path to a JSON file. diff --git a/home-manager/modules/niri/settings.nix b/home-manager/modules/niri/settings.nix index 59058d6..a6eba9b 100644 --- a/home-manager/modules/niri/settings.nix +++ b/home-manager/modules/niri/settings.nix @@ -40,6 +40,15 @@ hotkey-overlay = { skip-at-startup = true; }; + switch-events = { + lid-close.action.spawn = [ + "noctalia-shell" + "ipc" + "call" + "lockScreen" + "lock" + ]; + }; layout = { preset-column-widths = [ @@ -93,6 +102,7 @@ accel-profile = "adaptive"; }; focus-follows-mouse.enable = true; + focus-follows-mouse.max-scroll-amount = "0%"; warp-mouse-to-focus.enable = false; }; @@ -109,7 +119,7 @@ }; }; - "desc:Microstep MSI MP161 E2 PB7H314B00225" = { + "Microstep MSI MP161 E2 PB7H314B00225" = { mode = { width = 1920; height = 1080; @@ -117,7 +127,7 @@ scale = 1.0; position = { x = 0; - y = 1080; + y = -1080; }; }; };