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:
Gabriel Birke 2024-04-29 23:54:54 +02:00 committed by GitHub
parent 7ec0ae18cd
commit 1a91cb7cdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 15 additions and 15 deletions

View file

@ -457,15 +457,15 @@ in {
set delete = yes set delete = yes
${optionalString cfg.vimKeys
"source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
# Binds # Binds
${bindSection} ${bindSection}
# Macros # Macros
${macroSection} ${macroSection}
${optionalString cfg.vimKeys
"source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
# Register accounts # Register accounts
${ ${
optionalString (accountCommandNeeded) '' optionalString (accountCommandNeeded) ''

View file

@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
# Macros # Macros
# Register accounts # Register accounts
# register account hm@example.com # register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox" mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"

View file

@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
# Macros # Macros
# Register accounts # Register accounts
# register account hm-account # register account hm-account
mailboxes "/home/hm-user/Mail/hm-account/Inbox" mailboxes "/home/hm-user/Mail/hm-account/Inbox"

View file

@ -9,6 +9,8 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
bind editor <Tab> "complete-query" bind editor <Tab> "complete-query"
bind index,pager \Cp "sidebar-prev" bind index,pager \Cp "sidebar-prev"
@ -17,8 +19,6 @@ bind index,pager \Cp "sidebar-prev"
macro index s "<save-message>?<tab>" macro index s "<save-message>?<tab>"
macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>" macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
# Register accounts # Register accounts
# register account hm@example.com # register account hm@example.com
mailboxes "/home/hm-user/Mail/hm@example.com/Inbox" mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"

View file

@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
# Macros # Macros
# Register accounts # Register accounts
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh' set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
# register account hm@example.com # register account hm@example.com

View file

@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
# Macros # Macros
# Register accounts # Register accounts
set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh' set account_command = '/nix/store/00000000000000000000000000000000-account-command.sh/bin/account-command.sh'
# register account hm@example.com # register account hm@example.com

View file

@ -9,14 +9,14 @@ alternative_order text/enriched text/plain text
set delete = yes set delete = yes
# Binds # Binds
# Macros # Macros
# Register accounts # Register accounts
# register account hm@example.com # register account hm@example.com
named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox" named-mailboxes "someCustomName" "/home/hm-user/Mail/hm@example.com/Inbox"