Update mutt accounts config

1 files changed, 96 insertions, 66 deletions

diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
index 907ad65..9e3fcf8 100644
--- a/.mutt/accounts.rc
+++ b/.mutt/accounts.rc
@@ -1,11 +1,23 @@
 # vim: syntax=muttrc
 
-account-hook imaps://imap.gmail.com \
+account-hook imaps://ryanakca@gmail.com@imap.gmail.com \
 "set imap_user = 'ryanakca@gmail.com';\
 set imap_pass = 'GMAIL_PASS';\
 set imap_passive = 'no';\
-set folder = 'imaps://imap.gmail.com:933';\
-set spoolfile = '=INBOX'"
+set folder = 'imaps://ryanakca@gmail.com@imap.gmail.com:933';\
+set postponed = '=[Google Mail]/Drafts';\
+set spoolfile = '=INBOX';\
+set from = "rak@debian.org";\
+set sendmail='MSMTP_PATH';\
+unset smtp_url;\
+unset smtp_pass;\
+unset record;\
+macro index,pager <ESC>a '<save-message>=[Google Mail]/All Mail<enter><enter>' 'Archive';\
+macro index,pager S '<save-message>=[Google Mail].Spam<enter><enter>' 'Spam';\
+macro index .s '<tag-prefix><copy-message>=Debian.archive<enter>' 'Saves Deb packaging email to Debian.archive';\
+set pager_format = '-%Z-GMAIL: %C/%m: %-20.20n %s';\
+set compose_format = '-- GMAIL: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-GMAIL: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
 account-hook imap://localhost \
 "set imap_user = 'ryan';\
@@ -21,7 +33,14 @@ set folder = 'imaps://outlook.office365.com:993/';\
 set record = '=Sent Items';\
 set postponed = '=Drafts';\
 set spoolfile = '=Inbox';\
-set imap_passive = 'no'"
+set imap_passive = 'no';\
+unset smtp_url;\
+unset smtp_pass;\
+set sendmail = 'MSMTP_PATH -a queensu';\
+set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>';\
+set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n %s';\
+set compose_format = '-- QUEENSU: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-QUEENSU: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
 account-hook imaps://hermes.ryanak.ca \
 "set imap_user = 'rak';\
@@ -32,67 +51,42 @@ set postponed = '=Drafts';\
 set spoolfile = '=';\
 unset smtp_url;\
 unset smtp_pass;\
-set sendmail = 'MSMTP_PATH -a ryanakca';"
+set sendmail = 'MSMTP_PATH -a ryanakca';\
+set from = 'Ryan Kavanag <rak@ryanak.ca>';\
+set pager_format = '-%Z-RYANAK.CA: %C/%m: %-20.20n %s';\
+set compose_format = '-- RYANAK.CA: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-RYANAK.CA: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
-send-hook . \
-"set from = rak@debian.org;\
-set sendmail='MSMTP_PATH';\
-unset smtp_url;\
-unset smtp_pass;\
-unset record;\
+account-hook imaps://rkavanag@andrew.cmu.edu@imap.gmail.com \
+"set imap_user = 'rkavanag@andrew.cmu.edu';\
+set imap_pass = 'CMU_PASS';\
+set imap_passive = 'no';\
+set imap_keepalive = 60;\
+set folder = 'imaps://rkavanag@andrew.cmu.edu@imap.gmail.com:933';\
 set spoolfile = '=INBOX';\
-set postponed = '=[Google Mail]/Drafts'"
-
-folder-hook . \
-"set from = rak@debian.org;\
-set sendmail='MSMTP_PATH';\
+set sendmail='MSMTP_PATH -a cmu';\
+set from = 'Ryan Kavanagh <rkavanag@andrew.cmu.edu>';\
 unset smtp_url;\
 unset smtp_pass;\
 unset record;\
+set pager_format = '-%Z-CMU: %C/%m: %-20.20n %s';\
+set compose_format = '-- CMU: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-CMU: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
+
+account-hook imaps://imap.srv.cs.cmu.edu \
+"set imap_user = 'rkavanag';\
+set imap_pass = 'CMUSCS_PASS';\
+set folder = 'imaps://imap.srv.cs.cmu.edu/';\
+set record = '=INBOX.Sent';\
+set postponed = '=INBOX.Drafts';\
 set spoolfile = '=INBOX';\
-set postponed = '=[Google Mail]/Drafts';\
-macro index,pager <ESC>a '<save-message>=[Google Mail]/All Mail<enter><enter>' 'Archive';\
-macro index,pager S '<save-message>=[Google Mail].Spam<enter><enter>' 'Spam';\
-macro index .s '<tag-prefix><copy-message>=Debian.archive<enter>' 'Saves Deb packaging email to Debian.archive';\
-set pager_format = '-%Z-MAIN: %C/%m: %-20.20n %s';\
-set compose_format = '-- MAIN: Compose [Approx. msg size: %l Atts: %a]%>-';\
-set status_format = '-%r-MAIN: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
-
-folder-hook .*[Qq]ueens[uU].* \
-"unhook send-hook;\
-set from = ryan.kavanagh@queensu.ca;\
-set sendmail="MSMTP_PATH -a queensu"\
-unset smtp_url;\
-unset smtp_pass;\
-set record='=QueensU.Sent Items';\
-set postponed='=QueensU.Drafts';\
-set pager_format = '-%Z-QUEENS: %C/%m: %-20.20n %s';\
-set compose_format = '-- QUEENS: Compose [Approx. msg size: %l Atts: %a]%>-';\
-set status_format = '-%r-QUEENS: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
-
-folder-hook .*McGill.* \
-"unhook send-hook;\
-set from = ryan.kavanagh@mail.mcgill.ca;\
-set sendmail="MSMTP_PATH -a mcgill"
 unset smtp_url;\
 unset smtp_pass;\
-set record='=McGill.Sent Items';\
-set postponed='=McGill.Drafts';\
-set pager_format = '-%Z-McGILL: %C/%m: %-20.20n %s';\
-set compose_format = '-- McGILL: Compose [Approx. msg size: %l Atts: %a]%>-';\
-set status_format = '-%r-McGILL: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
-
-folder-hook .*McGSOCS.* \
-"unhook send-hook;\
-set from = ryank@cs.mcgill.ca;\
-set sendmail="MSMTP_PATH -a mcgillsocs"
-unset smtp_url;\
-unset smtp_pass;\
-set record='=McGill.Sent Items';\
-set postponed='=McGill.Drafts';\
-set pager_format = '-%Z-McGSOCS: %C/%m: %-20.20n %s';\
-set compose_format = '-- McGSOCS: Compose [Approx. msg size: %l Atts: %a]%>-';\
-set status_format = '-%r-McGSOCS: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
+set sendmail = 'MSMTP_PATH -a cmuscs';\
+set from = 'Ryan Kavanagh <rkavanagh@cs.cmu.edu>';\
+set pager_format = '-%Z-CMU SCS: %C/%m: %-20.20n %s';\
+set compose_format = '-- CMU SCS: Compose [Approx. msg size: %l Atts: %a]%>-';\
+set status_format = '-%r-CMU SCS: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
 folder-hook /var/mail/ryan \
 "set mbox_type = Maildir;\
@@ -105,17 +99,53 @@ set compose_format = '-- LOCAL: Compose [Approx. msg size: %l Atts: %a]%>-';\
 set status_format = '-%r-LOCAL: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'"
 
 
-macro index <F12> "cimaps://imap.gmail.com/INBOX<enter>"
+macro index <F12> "cimaps://ryanakca@gmail.com@imap.gmail.com/INBOX<enter>"
 macro index <F11> "cimap://localhost/INBOX<enter>"
 macro index <F10> "cimaps://mail.queensu.ca/Inbox<enter>"
 
-macro compose <F2> '<enter-command>set sendmail="MSMTP_PATH -a ubuntu"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <ryanakca@ubuntu.com><enter><edit-fcc><kill-line><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Ubuntu account"
-macro compose <Esc><F2> '<enter-command>set sendmail="MSMTP_PATH -a kubuntu"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <ryanakca@kubuntu.org><enter><edit-fcc><kill-line><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Kubuntu account"
-macro compose <F3> '<enter-command>set sendmail="/usr/bin/msmtp -a mcgill"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <ryan.kavanagh@mail.mcgill.ca><enter><edit-fcc>=McGill.Sent Items<enter><enter-command>set postponed="=McGill.Drafts"<enter><enter-command>set record="=McGill.Sent Items"<enter>' "Sent mail from McGill account"
-macro compose <Esc><F3> '<enter-command>set sendmail="/usr/bin/msmtp -a mcgillsocs"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <ryank@cs.mcgill.ca><enter><edit-fcc>=McGSOCS.INBOX.Sent Items<enter><enter-command>set postponed="=McGSOCS.INBOX.Drafts"<enter><enter-command>set record="=McGSOCS.INBOX.Sent"<enter>' "Sent mail from McGill SOCS account"
-macro compose <F4> '<enter-command>unset sendmail<enter><edit-from><kill-line>Ryan Kavanagh <ryan.kavanagh@queensu.ca><enter><edit-fcc>=QueensU.Sent Items<enter><enter-command>set postponed="=QueensU.Drafts"<enter><enter-command>unset smtp_url<enter><enter-command>set sendmail="MSMTP_PATH -a queensu"<enter><enter-command>set record="=QueensU.Sent Items"<enter>' "Sent mail from Queen's account"
-macro compose <Esc><F4> '<enter-command>set sendmail="MSMTP_PATH -a queensucs"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <ryan@cs.queensu.ca><enter><edit-fcc><kill-line><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from cs.queensu.ca account"
-macro compose <F5> '<enter-command>set sendmail="MSMTP_PATH"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <rak@debian.org><enter><edit-fcc><kill-line><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Debian account"
-macro compose <F6> '<enter-command>set sendmail="MSMTP_PATH -a ryanakca"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from><kill-line>Ryan Kavanagh <rak@ryanak.ca><enter><edit-fcc><kill-line>imaps://hermes.ryanak.ca/Sent<enter><enter-command>set postponed="imaps://hermes.ryanak.ca/Drafts"<enter>' "Sent mail from ryanak.ca account"
+macro compose <F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com:933"<enter>\
+<edit-fcc><kill-line><enter>\
+<enter-command>set sendmail="MSMTP_PATH -a ubuntu"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <ryanakca@ubuntu.com><enter>' \
+"Send mail from Ubuntu account"
+
+macro compose <Esc><F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com:933"<enter>\
+<edit-fcc><kill-line><enter>\
+<enter-command>set sendmail="MSMTP_PATH -a kubuntu"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <ryanakca@kubuntu.org><enter>' \
+"Send mail from Kubuntu account"
+
+macro compose <F3> '<enter-command>set folder="imaps://rkavanag@andrew.cmu.edu@imap.gmail.com:933"<enter>\
+<edit-fcc><kill-line><enter>\
+<edit-from><kill-line>Ryan Kavanagh <rkavanag@andrew.cmu.edu><enter>' \
+"Send mail from CMU account"
+
+macro compose <Esc><F3> '<enter-command>set folder="imaps://imap.srv.cs.cmu.edu/"<enter>\
+<edit-fcc><kill-line>=INBOX.Sent<enter>\
+<edit-from><kill-line>Ryan Kavanagh <rkavanagh@cs.cmu.edu><enter>' \
+"Send mail from CMU SCS account"
+
+macro compose <F4> '<enter-command>set folder="imaps://outlook.office365.com"<enter>\
+<edit-fcc><kill-line>=Sent Items<enter>\
+<edit-from><kill-line>Ryan Kavanagh <ryan.kavanagh@queensu.ca><enter>' \
+"Send mail from QueensU"
+
+macro compose <Esc><F4> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com:933"<enter>\
+<edit-fcc><kill-line><enter>\
+<enter-command>set sendmail="MSMTP_PATH -a queensucs"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <ryan@cs.queensu.ca><enter>' \
+"Send mail from cs.queensu.ca"
+
+macro compose <F5> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com:933"<enter>\
+<edit-fcc><kill-line><enter>\
+<enter-command>set sendmail="MSMTP_PATH"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <rak@debian.org><enter>' \
+"Send mail from Debian account"
+
+macro compose <F6> '<enter-command>set folder="imaps://hermes.ryanak.ca/"<enter>\
+<edit-fcc><kill-line>=Sent<enter>\
+<enter-command>set sendmail="MSMTP_PATH -a ryanakca"<enter>\
+<edit-from><kill-line>Ryan Kavanagh <rak@ryanak.ca><enter>' \
+"Send mail from ryanak.ca"
 
 set certificate_file = '~/.mutt/certs/certificates'