Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

qutebrowser: unwrap list from keybinding removal

Browse source 
The option to remove the default keybindings by setting the
`programs.qutebrowser.enableDefaultKeybindings` variable to `false`
had a list wrapped around the `config.py` line. This would cause a
type coercion error.

PR #1410
This commit is contained in:
seylerius 2020-07-27 03:54:11 -05:00 committed by Robert Helgesson
parent 7b73f84071
commit 89adfc9f01
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/programs/qutebrowser.nix
View file

@ -261,7 +261,7 @@ in {
++ mapAttrsToList (formatDictLine "c.url.searchengines") cfg.searchEngines ++ mapAttrsToList (formatDictLine "c.url.searchengines") cfg.searchEngines
++ mapAttrsToList (formatDictLine "c.bindings.key_mappings") ++ mapAttrsToList (formatDictLine "c.bindings.key_mappings")
cfg.keyMappings cfg.keyMappings
++ optional (!cfg.enableDefaultBindings) [ "c.bindings.default = {}" ] ++ optional (!cfg.enableDefaultBindings) "c.bindings.default = {}"
++ mapAttrsToList formatKeyBindings cfg.keyBindings ++ mapAttrsToList formatKeyBindings cfg.keyBindings
++ optional (cfg.extraConfig != "") cfg.extraConfig); ++ optional (cfg.extraConfig != "") cfg.extraConfig);
}; };

3
tests/modules/programs/qutebrowser/keybindings.nix
View file

@ -7,6 +7,8 @@ with lib;
programs.qutebrowser = { programs.qutebrowser = {
enable = true; enable = true;
enableDefaultBindings = false;
keyBindings = { keyBindings = {
normal = { normal = {
"<Ctrl-v>" = "spawn mpv {url}"; "<Ctrl-v>" = "spawn mpv {url}";
@ -27,6 +29,7 @@ with lib;
home-files/.config/qutebrowser/config.py \ home-files/.config/qutebrowser/config.py \
${ ${
pkgs.writeText "qutebrowser-expected-config.py" '' pkgs.writeText "qutebrowser-expected-config.py" ''
c.bindings.default = {}
config.bind(",l", "config-cycle spellcheck.languages [\"en-GB\"] [\"en-US\"]", mode="normal") config.bind(",l", "config-cycle spellcheck.languages [\"en-GB\"] [\"en-US\"]", mode="normal")
config.bind("<Ctrl-v>", "spawn mpv {url}", mode="normal") config.bind("<Ctrl-v>", "spawn mpv {url}", mode="normal")
config.bind("<Ctrl-y>", "prompt-yes", mode="prompt")'' config.bind("<Ctrl-y>", "prompt-yes", mode="prompt")''