mutt: Set 'folder-hook's only once

The old config worked with mutt(1), but not neomutt(1).  Now it works
with neomutt(1).

Link: <https://github.com/neomutt/neomutt/issues/4235>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

12 files changed, 12 insertions, 22 deletions

diff --git a/home/.config/mutt/account/gmail/alx/folder.muttrc b/home/.config/mutt/account/gmail/alx/folder.muttrc
index 4b0f168..c33945b 100644
--- a/home/.config/mutt/account/gmail/alx/folder.muttrc
+++ b/home/.config/mutt/account/gmail/alx/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/gmail/alx/"
-
-folder-hook ~/mail/gmail/alx/ source ~/.config/mutt/account/gmail/alx/account.muttrc
diff --git a/home/.config/mutt/account/migadu/admin/folder.muttrc b/home/.config/mutt/account/migadu/admin/folder.muttrc
index 583aaa2..7aa6c14 100644
--- a/home/.config/mutt/account/migadu/admin/folder.muttrc
+++ b/home/.config/mutt/account/migadu/admin/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/admin/"
-
-folder-hook ~/mail/migadu/admin/ source ~/.config/mutt/account/migadu/admin/account.muttrc
diff --git a/home/.config/mutt/account/migadu/alx/folder.muttrc b/home/.config/mutt/account/migadu/alx/folder.muttrc
index cf1a3ff..67bfd90 100644
--- a/home/.config/mutt/account/migadu/alx/folder.muttrc
+++ b/home/.config/mutt/account/migadu/alx/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/alx/"
-
-folder-hook ~/mail/migadu/alx/ source ~/.config/mutt/account/migadu/alx/account.muttrc
diff --git a/home/.config/mutt/account/migadu/edu/folder.muttrc b/home/.config/mutt/account/migadu/edu/folder.muttrc
index 562b9d4..26ef7d9 100644
--- a/home/.config/mutt/account/migadu/edu/folder.muttrc
+++ b/home/.config/mutt/account/migadu/edu/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/edu/"
-
-folder-hook ~/mail/migadu/edu/ source ~/.config/mutt/account/migadu/edu/account.muttrc
diff --git a/home/.config/mutt/account/migadu/foss/folder.muttrc b/home/.config/mutt/account/migadu/foss/folder.muttrc
index 440ac36..d8dca61 100644
--- a/home/.config/mutt/account/migadu/foss/folder.muttrc
+++ b/home/.config/mutt/account/migadu/foss/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/foss/"
-
-folder-hook ~/mail/migadu/foss/ source ~/.config/mutt/account/migadu/foss/account.muttrc
diff --git a/home/.config/mutt/account/migadu/gov/folder.muttrc b/home/.config/mutt/account/migadu/gov/folder.muttrc
index 8374d35..4391f65 100644
--- a/home/.config/mutt/account/migadu/gov/folder.muttrc
+++ b/home/.config/mutt/account/migadu/gov/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/gov/"
-
-folder-hook ~/mail/migadu/gov/ source ~/.config/mutt/account/migadu/gov/account.muttrc
diff --git a/home/.config/mutt/account/migadu/legal/folder.muttrc b/home/.config/mutt/account/migadu/legal/folder.muttrc
index be54fbb..5dd04a2 100644
--- a/home/.config/mutt/account/migadu/legal/folder.muttrc
+++ b/home/.config/mutt/account/migadu/legal/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/legal/"
-
-folder-hook ~/mail/migadu/legal/ source ~/.config/mutt/account/migadu/legal/account.muttrc
diff --git a/home/.config/mutt/account/migadu/llum/folder.muttrc b/home/.config/mutt/account/migadu/llum/folder.muttrc
index a97f589..de6fb85 100644
--- a/home/.config/mutt/account/migadu/llum/folder.muttrc
+++ b/home/.config/mutt/account/migadu/llum/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/llum/"
-
-folder-hook ~/mail/migadu/llum/ source ~/.config/mutt/account/migadu/llum/account.muttrc
diff --git a/home/.config/mutt/account/migadu/spam/folder.muttrc b/home/.config/mutt/account/migadu/spam/folder.muttrc
index 80c36d2..ccde2a6 100644
--- a/home/.config/mutt/account/migadu/spam/folder.muttrc
+++ b/home/.config/mutt/account/migadu/spam/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/spam/"
-
-folder-hook ~/mail/migadu/spam/ source ~/.config/mutt/account/migadu/spam/account.muttrc
diff --git a/home/.config/mutt/account/migadu/tlf/folder.muttrc b/home/.config/mutt/account/migadu/tlf/folder.muttrc
index 5e3d04f..5daf21d 100644
--- a/home/.config/mutt/account/migadu/tlf/folder.muttrc
+++ b/home/.config/mutt/account/migadu/tlf/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/tlf/"
-
-folder-hook ~/mail/migadu/tlf/ source ~/.config/mutt/account/migadu/tlf/account.muttrc
diff --git a/home/.config/mutt/account/migadu/travel/folder.muttrc b/home/.config/mutt/account/migadu/travel/folder.muttrc
index cf85878..96b5d12 100644
--- a/home/.config/mutt/account/migadu/travel/folder.muttrc
+++ b/home/.config/mutt/account/migadu/travel/folder.muttrc
@@ -1,3 +1 @@
 set folder      = "~/mail/migadu/travel/"
-
-folder-hook ~/mail/migadu/travel/ source ~/.config/mutt/account/migadu/travel/account.muttrc
diff --git a/home/.config/mutt/accounts.muttrc b/home/.config/mutt/accounts.muttrc
index aaa0f06..31494d0 100644
--- a/home/.config/mutt/accounts.muttrc
+++ b/home/.config/mutt/accounts.muttrc
@@ -12,6 +12,18 @@ source ~/.config/mutt/account/gmail/alx/account.muttrc
 
 source ~/.config/mutt/account/migadu/foss/account.muttrc
 
+folder-hook ~/mail/migadu/alx/ source ~/.config/mutt/account/migadu/alx/account.muttrc
+folder-hook ~/mail/migadu/edu/ source ~/.config/mutt/account/migadu/edu/account.muttrc
+folder-hook ~/mail/migadu/foss/ source ~/.config/mutt/account/migadu/foss/account.muttrc
+folder-hook ~/mail/migadu/gov/ source ~/.config/mutt/account/migadu/gov/account.muttrc
+folder-hook ~/mail/migadu/legal/ source ~/.config/mutt/account/migadu/legal/account.muttrc
+folder-hook ~/mail/migadu/llum/ source ~/.config/mutt/account/migadu/llum/account.muttrc
+folder-hook ~/mail/migadu/spam/ source ~/.config/mutt/account/migadu/spam/account.muttrc
+folder-hook ~/mail/migadu/tlf/ source ~/.config/mutt/account/migadu/tlf/account.muttrc
+folder-hook ~/mail/migadu/travel/ source ~/.config/mutt/account/migadu/travel/account.muttrc
+folder-hook ~/mail/migadu/admin/ source ~/.config/mutt/account/migadu/admin/account.muttrc
+folder-hook ~/mail/gmail/alx/ source ~/.config/mutt/account/gmail/alx/account.muttrc
+
 bind index,pager <F2> noop
 macro index,pager <F2>0 '<enter-command>source ~/.config/mutt/account/migadu/admin/account.muttrc<enter>'
 macro index,pager <F2>1 '<enter-command>source ~/.config/mutt/account/migadu/alx/account.muttrc<enter>'