Move muttrc account change commands out of hook

1 files changed, 5 insertions, 10 deletions

diff --git a/tw/home/files/muttrc b/tw/home/files/muttrc
index 67b9f507..6b485636 100644
--- a/tw/home/files/muttrc
+++ b/tw/home/files/muttrc
@@ -79,7 +79,6 @@ alternative_order text/plain text/enriched text/html text image
 auto_view text/html text/calendar text/x-diff text/x-patch image/jpeg image/png
 
 set my_mythic = "imaps://oncilla.mythic-beasts.com/"
-account-hook "$my_mythic" 'unmailboxes *'
 account-hook "$my_mythic" 'set folder = "$my_mythic"'
 account-hook "$my_mythic" 'set smtp_url = "smtps://smtp-auth.mythic-beasts.com"'
 account-hook "$my_mythic" 'set imap_user = "timo@twilken.net"'
@@ -94,7 +93,6 @@ account-hook "$my_mythic" 'set from = "$imap_user"'
 account-hook "$my_mythic" 'reset ssl_use_tlsv1 ssl_use_tlsv1_1 imap_authenticators smtp_authenticators imap_oauth_refresh_command smtp_oauth_refresh_command'
 
 set my_cern = "imaps://imap.cern.ch/"
-account-hook "$my_cern" 'unmailboxes *'
 account-hook "$my_cern" 'set folder = "$my_cern"'
 account-hook "$my_cern" 'set smtp_url = "smtp://smtp.cern.ch:587"'   # we need to rely on STARTTLS
 account-hook "$my_cern" 'set imap_user = "twilken"'
@@ -112,7 +110,6 @@ account-hook "$my_cern" 'set ssl_use_tlsv1 ssl_use_tlsv1_1'   # imap.cern.ch nee
 account-hook "$my_cern" 'reset imap_authenticators imap_oauth_refresh_command smtp_oauth_refresh_command'
 
 set my_gmail = "imaps://imap.gmail.com/"
-account-hook "$my_gmail" 'unmailboxes *'
 account-hook "$my_gmail" 'set folder = "$my_gmail"'
 account-hook "$my_gmail" 'set smtp_url = "smtps://smtp.gmail.com"'
 account-hook "$my_gmail" 'set imap_user = "timo.21.wilken@gmail.com"'
@@ -129,7 +126,6 @@ account-hook "$my_gmail" 'reset ssl_use_tlsv1 ssl_use_tlsv1_1 imap_authenticator
 # ExOl needs OAUTH now!
 # https://neomutt.org/guide/optionalfeatures.html#oauth
 set my_cantab = "imaps://tw466@cantab.ac.uk@outlook.office365.com/"
-account-hook "$my_cantab" 'unmailboxes *'
 account-hook "$my_cantab" 'set folder = "$my_cantab"'
 account-hook "$my_cantab" 'set smtp_url = "smtp://smtp-mail.outlook.com:587"'
 account-hook "$my_cantab" 'set imap_user = "tw466@cantab.ac.uk"'
@@ -147,7 +143,6 @@ account-hook "$my_cantab" 'set imap_oauth_refresh_command = "mutt_oauth2.py --en
 account-hook "$my_cantab" 'set smtp_oauth_refresh_command = $imap_oauth_refresh_command'
 
 set my_outlook = "imaps://timo_wilken@live.co.uk@outlook.office365.com/"
-account-hook "$my_outlook" 'unmailboxes *'
 account-hook "$my_outlook" 'set folder = "$my_outlook"'
 account-hook "$my_outlook" 'set smtp_url = "smtp://smtp-mail.outlook.com:587"'
 account-hook "$my_outlook" 'set imap_user = "timo_wilken@live.co.uk"'
@@ -164,11 +159,11 @@ account-hook "$my_outlook" 'set imap_authenticators=xoauth2 smtp_authenticators=
 account-hook "$my_outlook" 'set imap_oauth_refresh_command = "mutt_oauth2.py --encryption-pipe=\"gpg --encrypt --recipient timo@twilken.net\" $XDG_DATA_HOME/neomutt/outlook.gpg"'
 account-hook "$my_outlook" 'set smtp_oauth_refresh_command = $imap_oauth_refresh_command'
 
-macro index,pager gm "<sync-mailbox><enter-command>set folder=$my_mythic<enter><change-folder>+INBOX<enter>" "Switch to Mythic Beasts account"
-macro index,pager gG "<sync-mailbox><enter-command>set folder=$my_gmail<enter><change-folder>+INBOX<enter>" "Switch to Gmail account"
-macro index,pager gw "<sync-mailbox><enter-command>set folder=$my_cern<enter><change-folder>+INBOX<enter>" "Switch to CERN account"
-macro index,pager gc "<sync-mailbox><enter-command>set folder=$my_cantab<enter><change-folder>+INBOX<enter>" "Switch to Cantab account"
-macro index,pager go "<sync-mailbox><enter-command>set folder=$my_outlook<enter><change-folder>+INBOX<enter>" "Switch to Outlook account"
+macro index,pager gm "<sync-mailbox><enter-command>unmailboxes *<enter><enter-command>unalternates *<enter><enter-command>set folder=$my_mythic<enter><change-folder>+INBOX<enter>" "Switch to Mythic Beasts account"
+macro index,pager gG "<sync-mailbox><enter-command>unmailboxes *<enter><enter-command>unalternates *<enter><enter-command>set folder=$my_gmail<enter><change-folder>+INBOX<enter>" "Switch to Gmail account"
+macro index,pager gw "<sync-mailbox><enter-command>unmailboxes *<enter><enter-command>unalternates *<enter><enter-command>set folder=$my_cern<enter><change-folder>+INBOX<enter>" "Switch to CERN account"
+macro index,pager gc "<sync-mailbox><enter-command>unmailboxes *<enter><enter-command>unalternates *<enter><enter-command>set folder=$my_cantab<enter><change-folder>+INBOX<enter>" "Switch to Cantab account"
+macro index,pager go "<sync-mailbox><enter-command>unmailboxes *<enter><enter-command>unalternates *<enter><enter-command>set folder=$my_outlook<enter><change-folder>+INBOX<enter>" "Switch to Outlook account"
 
 # Open the Mythic inbox by default.
 set folder = "$my_mythic"