niri: niphas-screenshot

flake.nix

@@ -38,6 +38,9 @@
         niphas-file-browser = prev.pcmanfm;
         niphas-runner = prev.writers.writeDashBin "niphas-runner" "${prev.lib.getExe prev.rofi} -show run";
         niphas-locker = prev.swaylock;
+        niphas-screenshot = prev.writers.writeDashBin "niphas-screenshot" ''
+          ${prev.lib.getExe prev.grim} -g "$(${prev.lib.getExe prev.slurp})" - | ${prev.lib.getExe prev.satty} -f -
+        '';
 
         niphas-editor = prev.lib.makeOverridable (prev.callPackage packages/vim) { };
         niphas-bar = import packages/ashell.nix {

packages/niri.nix

@@ -1,7 +1,6 @@
 {
   wrappers,
   pkgs,
-  screenshotPath ? null,
   geolocation ? [
     52.5244
     13.4105
@@ -17,8 +16,7 @@ let
 
   niri = wrappers.wrapperModules.niri.apply {
     inherit pkgs;
-    settings = builtins.foldl' lib.recursiveUpdate { } (
-      [
+    settings = builtins.foldl' lib.recursiveUpdate { } ([
       {
         input = {
           keyboard = {
@@ -89,6 +87,7 @@ let
             "Mod+Return".spawn = lib.getExe pkgs.niphas-terminal;
             "Mod+D".spawn = lib.getExe pkgs.niphas-runner;
             "Mod+Shift+W".spawn = lib.getExe pkgs.niphas-locker;
+            "Print".spawn = lib.getExe pkgs.niphas-screenshot;
 
             # TODO allow-when-locked
             "XF86AudioRaiseVolume".spawn-sh = "${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0";
@@ -168,18 +167,7 @@ let
             "Ctrl+Alt+Delete".quit = null;
           };
       }
-      ]
-      ++ lib.optional (screenshotPath != null) [
-        {
-          screenshot-path = screenshotPath;
-          binds = {
-            "Print".screenshot = null;
-            "Ctrl+Print".screenshot-screen = null;
-            "Alt+Print".screenshot-window = null;
-          };
-        }
-      ]
-    );
+    ]);
   };
 in
 niri.wrapper