-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
sway: add config.bindkeysToCode #1289
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
cc @dermetfan for testing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked out your branch and ran the tests. I only get one failed test about formatting that can be solved with ./format. There is no hash mismatch error for me...
Patch produced by ./format
commit 079857636f08872c0c13ce198d2de717d1cc9f56 (HEAD -> fix/sway-bindkeys)
Author: Robin Stumm <serverkorken@gmail.com>
Date: Sun May 31 15:07:05 2020 +0200
sway: format
diff --git a/modules/services/window-managers/i3-sway/lib/functions.nix b/modules/services/window-managers/i3-sway/lib/functions.nix
index 4577d09..ea2938e 100644
--- a/modules/services/window-managers/i3-sway/lib/functions.nix
+++ b/modules/services/window-managers/i3-sway/lib/functions.nix
@@ -31,7 +31,7 @@ rec {
modeStr = name: keybindings: ''
mode "${name}" {
- ${keybindingsStr { inherit keybindings; } }
+ ${keybindingsStr { inherit keybindings; }}
}
'';
diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix
index 5c5bfa3..b000c42 100644
--- a/modules/services/window-managers/i3-sway/sway.nix
+++ b/modules/services/window-managers/i3-sway/sway.nix
@@ -268,9 +268,10 @@ let
client.placeholder ${colorSetStr colors.placeholder}
client.background ${colors.background}
- ${keybindingsStr {
+ ${keybindingsStr {
inherit keybindings;
- bindsymArgs = lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
+ bindsymArgs =
+ lib.optionalString (cfg.config.bindkeysToCode) "--to-code";
}}
${keycodebindingsStr keycodebindings}
${concatStringsSep "\n" (mapAttrsToList inputStr input)}64a2b3c to
e56a3e3
Compare
|
@dermetfan can you confirm that this patch fixes your issue? |
|
Yes, thanks for the quick reaction! No idea why Travis fails now... |
|
Beside the comment I added above this looks OK to me. The test failure is due to SRI hashes introduced in Nixpkgs, these are unsupported in the Nix version used by Travis CI. I believe the SRI hashes are being removed from Nixpkgs master which should clear up the errors once the removals hit the unstable channel. |
Do not use `--to-code` by default in `bindsym`
e56a3e3 to
3e81886
Compare
Do not use `--to-code` by default in `bindsym` PR nix-community#1289
Do not use `--to-code` by default in `bindsym`. PR #1289
|
Thanks! Rebased to master in 8574817. |
Do not use `--to-code` by default in `bindsym`. PR nix-community#1289
Do not use `--to-code` by default in `bindsym`. PR nix-community#1289
Do not use `--to-code` by default in `bindsym`. PR nix-community#1289
Description
Do not use
--to-codeby default inbindsym, let user configure that behavior manually viaconfig.bindkeysToCodeinswaymodule.Refs #1229 (comment)
Checklist
Change is backwards compatible.
Code formatted with
./format.Code tested through
nix-shell --pure tests -A run.all.tests fail with:
Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
Added myself as module maintainer. See example.
Added myself and the module files to
.github/CODEOWNERS.