modules/river/keymap: Don't duplicate commands, use aliases instead

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix
index 21a50896..027e3a19 100644
--- a/modules/by-name/ri/river/keymap.nix
+++ b/modules/by-name/ri/river/keymap.nix
@@ -22,7 +22,7 @@
 
   cfg = config.soispha.programs.river;
 in {
-  soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable {
+  soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable rec {
     "<LEFT_SUPER>" = {
       # Change focus
       "f" = {
@@ -52,6 +52,9 @@ in {
         "n" = ["swap" "previous"];
       };
 
+      # This is a fill in for <Super-L>, as that is otherwise impossible to input.
+      "l" = "<LEFT_SUPER>".x.l;
+
       # River compositor control.
       "x" = {
         "q" = ["exit"];
@@ -113,17 +116,17 @@ in {
 
     # Audio
     "<MEDIA_RAISEVOLUME>" =
-      (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+")
+      "<LEFT_SUPER>".m.r
       // {
         allow_locked = true;
       };
     "<MEDIA_LOWERVOLUME>" =
-      (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-")
+      "<LEFT_SUPER>".m.l
       // {
         allow_locked = true;
       };
     "<MEDIA_MUTEVOLUME>" =
-      (mkSpawn pkgs.mpp "toggle")
+      "<LEFT_SUPER>".m.m
       // {
         allow_locked = true;
       };
@@ -132,10 +135,7 @@ in {
     "<Meta-<MOUSE_LEFT>>" = ["move-view"];
     "<Meta-<MOUSE_RIGHT>>" = ["resize-view"];
 
-    # Lock screen.
-    "<Meta-L>" = mkSpawn pkgs.lock "";
-
     # Screenshot
-    "<PRINTSCREEN>" = mkSpawn pkgs.screenshot_persistent "";
+    "<PRINTSCREEN>" = "<LEFT_SUPER>".r.p;
   };
 }