neomutt: allow binds to override vimKeys
In the generated neomutt configuration, source the optional `vim-keys.rc` before applying the `binds` configuration, to allow the user to override keybindings from `vim-keys.rc`. Adapt the test files to account for the empty space left by the unset `vimKeys` option.
This commit is contained in:
parent
7ec0ae18cd
commit
1a91cb7cdb
|
@ -457,15 +457,15 @@ in {
|
|||
|
||||
set delete = yes
|
||||
|
||||
${optionalString cfg.vimKeys
|
||||
"source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
|
||||
|
||||
# Binds
|
||||
${bindSection}
|
||||
|
||||
# Macros
|
||||
${macroSection}
|
||||
|
||||
${optionalString cfg.vimKeys
|
||||
"source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
|
||||
|
||||
# Register accounts
|
||||
${
|
||||
optionalString (accountCommandNeeded) ''
|
||||
|
|
|
@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
|
||||
|
||||
# Macros
|
||||
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
# register account hm@example.com
|
||||
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
|
||||
|
|
|
@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
|
||||
|
||||
# Macros
|
||||
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
# register account hm-account
|
||||
mailboxes "/home/hm-user/Mail/hm-account/Inbox"
|
||||
|
|
|
@ -9,6 +9,8 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
bind editor <Tab> "complete-query"
|
||||
bind index,pager \Cp "sidebar-prev"
|
||||
|
@ -17,8 +19,6 @@ bind index,pager \Cp "sidebar-prev"
|
|||
macro index s "<save-message>?<tab>"
|
||||
macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
# register account hm@example.com
|
||||
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
|
||||
|
|
|
@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
|
||||
|
||||
# Macros
|
||||
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
|
||||
# register account hm@example.com
|
||||
|
|
|
@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
|
||||
|
||||
# Macros
|
||||
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
|
||||
# register account hm@example.com
|
||||
|
|
|
@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
|
|||
|
||||
set delete = yes
|
||||
|
||||
|
||||
|
||||
# Binds
|
||||
|
||||
|
||||
# Macros
|
||||
|
||||
|
||||
|
||||
|
||||
# Register accounts
|
||||
# register account hm@example.com
|
||||
named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox"
|
||||
|
|
Loading…
Reference in a new issue