home-manager: new screenshot type and updated xwayland support

2 files changed, 2 insertions, 6 deletions

diff --git a/home-manager/features/gui/desktops/niri/parts/niri/default.nix b/home-manager/features/gui/desktops/niri/parts/niri/default.nix
index 8eeca2d..a05d20f 100644
--- a/home-manager/features/gui/desktops/niri/parts/niri/default.nix
+++ b/home-manager/features/gui/desktops/niri/parts/niri/default.nix
@@ -13,6 +13,7 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       wl-clipboard
+      xwayland-satellite
 
       pavucontrol # audio control
     ];
@@ -46,15 +47,9 @@ in {
           # Sunsetr for night mode
           {command = ["sunsetr"];}
 
-          # Allows x apps to be used in wayland.
-          {command = ["${lib.getExe pkgs.xwayland-satellite}"];}
-
           # Logs the clipboard for use in utilities.
           {command = ["${pkgs.wl-clipboard}/bin/wl-paste" "--watch" "${pkgs.cliphist}/bin/cliphist" "store"];}
         ];
-        environment = {
-          DISPLAY = ":0"; # Important for Xwayland.
-        };
         window-rules = [
           {
             geometry-corner-radius = let
diff --git a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
index 8e321c2..f88a81b 100644
--- a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
+++ b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
@@ -36,6 +36,7 @@ in {
       "Mod+P".action.screenshot = [];
       "Shift+Mod+P".action.screenshot-screen = [];
       "Control+Mod+P".action.screenshot-window = [];
+      "Control+Shift+Mod+P".action.spawn-sh = "niri msg action screenshot; wl-paste | ${lib.getExe pkgs.swappy} -f -";
 
       "Mod+M".action.spawn-sh = "${lib.getExe pkgs.hyprpicker} -nl | ${pkgs.wl-clipboard}/bin/wl-copy";