programs.neomutt: Make manual configuration take precedence over generated settings (#1896)

modules/programs/neomutt.nix

@@ -312,16 +312,16 @@ in {
         ${optionalString cfg.vimKeys
         "source ${pkgs.neomutt}/share/doc/neomutt/vim-keys/vim-keys.rc"}
 
-        # Extra configuration
-        ${optionsStr cfg.settings}
-
-        ${cfg.extraConfig}
-
         # Register accounts
         ${concatMapStringsSep "\n" registerAccount neomuttAccounts}
 
         # Source primary account
         source ${accountFilename primary}
+
+        # Extra configuration
+        ${optionsStr cfg.settings}
+
+        ${cfg.extraConfig}
       '';
     };
 

tests/modules/programs/neomutt/neomutt-expected.conf

@@ -16,11 +16,6 @@ set delete = yes
 
 
 
-# Extra configuration
-
-
-
-
 # Register accounts
 # register account hm@example.com
 mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
@@ -30,3 +25,8 @@ folder-hook /home/hm-user/Mail/hm@example.com/ " \
 
 # Source primary account
 source /home/hm-user/.config/neomutt/hm@example.com
+
+# Extra configuration
+
+
+

tests/modules/programs/neomutt/neomutt-not-primary-expected.conf

@@ -16,11 +16,6 @@ set delete = yes
 
 
 
-# Extra configuration
-
-
-
-
 # Register accounts
 # register account hm-account
 mailboxes "/home/hm-user/Mail/hm-account/Inbox"
@@ -30,3 +25,8 @@ folder-hook /home/hm-user/Mail/hm-account/ " \
 
 # Source primary account
 source /home/hm-user/.config/neomutt/hm-account
+
+# Extra configuration
+
+
+

tests/modules/programs/neomutt/neomutt-with-binds-expected.conf

@@ -18,11 +18,6 @@ macro index,pager c "<change-folder>?<change-dir><home>^K=<enter><tab>"
 
 
 
-# Extra configuration
-
-
-
-
 # Register accounts
 # register account hm@example.com
 mailboxes "/home/hm-user/Mail/hm@example.com/Inbox"
@@ -32,3 +27,8 @@ folder-hook /home/hm-user/Mail/hm@example.com/ " \
 
 # Source primary account
 source /home/hm-user/.config/neomutt/hm@example.com
+
+# Extra configuration
+
+
+