From 91418d3e57e96dc9f520931401c653becd33b4a4 Mon Sep 17 00:00:00 2001
From: malte-v <34393802+malte-v@users.noreply.github.com>
Date: Sun, 11 Apr 2021 19:52:31 +0200
Subject: [PATCH] programs.neomutt: Make manual configuration take precedence
 over generated settings (#1896)

---
 modules/programs/neomutt.nix                           | 10 +++++-----
 tests/modules/programs/neomutt/neomutt-expected.conf   | 10 +++++-----
 .../programs/neomutt/neomutt-not-primary-expected.conf | 10 +++++-----
 .../programs/neomutt/neomutt-with-binds-expected.conf  | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index 5ee38e2a1..14e763cc0 100644
--- a/modules/programs/neomutt.nix
+++ b/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}
       '';
     };
 
diff --git a/tests/modules/programs/neomutt/neomutt-expected.conf b/tests/modules/programs/neomutt/neomutt-expected.conf
index 18cac44a9..6d51da816 100644
--- a/tests/modules/programs/neomutt/neomutt-expected.conf
+++ b/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
+
+
+
diff --git a/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf b/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
index ed1286c70..ed64124d9 100644
--- a/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
+++ b/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
+
+
+
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf b/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
index 21ae55a92..7f89c3178 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
+++ b/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
+
+
+