diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/ri/river/keymap.nix | 24 | ||||
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix index 052d36c3..6873f40e 100644 --- a/modules/by-name/ri/river/keymap.nix +++ b/modules/by-name/ri/river/keymap.nix @@ -8,15 +8,19 @@ index2tag = input: builtins.toString (libraries.base.pow 2 (input - 1)); mkTagCommand = name: index: [name (index2tag index)]; - mkSpawn' = pkg: binaryName: args: { - command = [ - "spawn" - "${lib.getExe' pkg binaryName} ${args}" - ]; + mkSpawnInner = pkg: binaryName: args: further: (further + // { + command = [ + "spawn" + "${lib.getExe' pkg binaryName} ${args}" + ]; - description = "${binaryName} ${args}"; - }; + 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 {}); cfg = config.soispha.programs.river; in { @@ -26,8 +30,8 @@ in { "f" = { "t" = ["focus-view" "next"]; "n" = ["focus-view" "previous"]; - "<Ctrl-t>" = ["focus-output" "next"]; - "<Ctrl-n>" = ["focus-output" "previous"]; + "T" = ["focus-output" "next"]; + "N" = ["focus-output" "previous"]; }; # Spawn standard programs @@ -36,7 +40,7 @@ in { "b" = mkSpawn pkgs.tskm "open select"; "k" = mkSpawn pkgs.keepassxc ""; "s" = mkSpawn pkgs.signal-desktop ""; - "p" = mkSpawn pkgs.screenshot_persistent ""; + "p" = mkSpawnOnce pkgs.screenshot_persistent ""; }; # Client changes diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index 4b446934..8be77777 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -51,7 +51,7 @@ keymappings = '' err_fail ${riverctl} keyboard-layout ${esa cfg.init.mappings.layout} - err_fail ${lib.getExe pkgs.river-mk-keymap} ${keymapGenerate "keys.json" cfg.init.mappings.keymap} + err_fail ${lib.getExe pkgs.river-mk-keymap} --keymap ${keymapGenerate "keys.json" cfg.init.mappings.keymap} init ''; mkRule = { |