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.
nix-community · Apr 29, 2024 · 1a91cb7 · 1a91cb7
1 parent 7ec0ae1
commit 1a91cb7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
@@ -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) ''

diff --git a/tests/modules/programs/neomutt/neomutt-expected.conf b/tests/modules/programs/neomutt/neomutt-expected.conf
@@ -9,12 +9,12 @@ alternative_order text/enriched text/plain text
 
 set delete = yes
 
-# Binds
 
 
-# Macros
+# Binds
 
 
+# Macros
 
 
 # Register accounts

diff --git a/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf b/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
@@ -9,12 +9,12 @@ alternative_order text/enriched text/plain text
 
 set delete = yes
 
-# Binds
 
 
-# Macros
+# Binds
 
 
+# Macros
 
 
 # Register accounts

diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf b/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
@@ -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 [email protected]
 mailboxes "/home/hm-user/Mail/[email protected]/Inbox"

diff --git a/tests/modules/programs/neomutt/neomutt-with-imap-expected.conf b/tests/modules/programs/neomutt/neomutt-with-imap-expected.conf
@@ -9,12 +9,12 @@ alternative_order text/enriched text/plain text
 
 set delete = yes
 
-# Binds
 
 
-# Macros
+# Binds
 
 
+# Macros
 
 
 # Register accounts

diff --git a/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes-expected.conf b/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes-expected.conf
@@ -9,12 +9,12 @@ alternative_order text/enriched text/plain text
 
 set delete = yes
 
-# Binds
 
 
-# Macros
+# Binds
 
 
+# Macros
 
 
 # Register accounts

diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
@@ -9,12 +9,12 @@ alternative_order text/enriched text/plain text
 
 set delete = yes
 
-# Binds
 
 
-# Macros
+# Binds
 
 
+# Macros
 
 
 # Register accounts