modules/river/keymap: Avoid providing a function for each arg

1 files changed, 6 insertions, 8 deletions

diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix
index 7134af66..21a50896 100644
--- a/modules/by-name/ri/river/keymap.nix
+++ b/modules/by-name/ri/river/keymap.nix
@@ -8,7 +8,7 @@
   index2tag = input: builtins.toString (libraries.base.pow 2 (input - 1));
 
   mkTagCommand = name: index: [name (index2tag index)];
-  mkSpawnInner = pkg: binaryName: args: further: (further
+  mkSpawn' = pkg: binaryName: args: further: (further
     // {
       command = [
         "spawn"
@@ -18,9 +18,7 @@
       description = "${binaryName} ${args}";
     });
 
-  mkSpawnOnce = pkg: args: (mkSpawnInner pkg pkg.meta.mainProgram args {once = true;});
-  mkSpawn = pkg: args: (mkSpawn' pkg pkg.meta.mainProgram args);
-  mkSpawn' = pkg: binaryName: args: (mkSpawnInner pkg binaryName args {});
+  mkSpawn = pkg: args: further: (mkSpawn' pkg pkg.meta.mainProgram args further);
 
   cfg = config.soispha.programs.river;
 in {
@@ -37,10 +35,10 @@ in {
       # Spawn standard programs
       "r" = {
         "a" = mkSpawn pkgs.alacritty "";
-        "b" = mkSpawnOnce pkgs.tskm "open select";
-        "k" = mkSpawnOnce pkgs.keepassxc "";
-        "s" = mkSpawnOnce pkgs.signal-desktop "";
-        "p" = mkSpawnOnce pkgs.screenshot_persistent "";
+        "b" = mkSpawn pkgs.tskm "open select" {once = true;};
+        "k" = mkSpawn pkgs.keepassxc "" {once = true;};
+        "s" = mkSpawn pkgs.signal-desktop "" {once = true;};
+        "p" = mkSpawn pkgs.screenshot_persistent "" {once = true;};
       };
 
       # Client changes