diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-06-29 13:45:30 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-06-29 13:45:30 +0200 |
| commit | 8f6ac77da2ace59f9bbc09d6a4e6ac1d1b282214 (patch) | |
| tree | 9e9f1950fefa2bba2873c3f59ab7d7ca60f08ee9 /modules/by-name/ri/river | |
| parent | modules/disks: Setup a tmpfs for the new lix build location (diff) | |
| download | nixos-config-8f6ac77da2ace59f9bbc09d6a4e6ac1d1b282214.zip | |
modules/river: Fix minor keymap config-file mistakes
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/ri/river/keymap.nix | 33 | ||||
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 3 |
2 files changed, 20 insertions, 16 deletions
diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix index a80534a7..052d36c3 100644 --- a/modules/by-name/ri/river/keymap.nix +++ b/modules/by-name/ri/river/keymap.nix @@ -11,7 +11,7 @@ mkSpawn' = pkg: binaryName: args: { command = [ "spawn" - "${lib.getExe' pkgs binaryName} ${args}" + "${lib.getExe' pkg binaryName} ${args}" ]; description = "${binaryName} ${args}"; @@ -21,7 +21,7 @@ cfg = config.soispha.programs.river; in { soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable { - "<SUPER_LEFT>" = { + "<LEFT_SUPER>" = { # Change focus "f" = { "t" = ["focus-view" "next"]; @@ -43,7 +43,7 @@ in { "c" = { "f" = ["toggle-fullscreen"]; "c" = ["close"]; - "<SPACE>" = ["toggle-float"]; + " " = ["toggle-float"]; "<ENTER>" = ["zoom"]; "o" = ["send-to-output" "next"]; "t" = ["swap" "next"]; @@ -110,18 +110,21 @@ in { }; # Audio - "<MEDIA_RAISEVOLUME>" = { - command = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+"; - allow_locked = true; - }; - "<MEDIA_LOWERVOLUME>" = { - command = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-"; - allow_locked = true; - }; - "<MEDIA_MUTEVOLUME>" = { - command = mkSpawn pkgs.mpp "toggle"; - allow_locked = true; - }; + "<MEDIA_RAISEVOLUME>" = + (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+") + // { + allow_locked = true; + }; + "<MEDIA_LOWERVOLUME>" = + (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-") + // { + allow_locked = true; + }; + "<MEDIA_MUTEVOLUME>" = + (mkSpawn pkgs.mpp "toggle") + // { + allow_locked = true; + }; # Mouse "<Meta-<MOUSE_LEFT>>" = ["move-view"]; diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index ed7eb363..4b446934 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -45,7 +45,8 @@ JSON_FILE = keymapFormat.generate name value; }; } '' - river-mk-keymap --keymap "$JSON_FILE" init --dry-run + river-mk-keymap --keymap "$JSON_FILE" init --dry-run; + cp "$JSON_FILE" "$out" ''; keymappings = '' |