more transitioning to alumni account

4 files changed, 12 insertions, 12 deletions

diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
index 9872a91..35aa1f9 100644
--- a/.mutt/accounts.rc
+++ b/.mutt/accounts.rc
@@ -78,12 +78,12 @@ set status_format = '-%r-RAK.AC: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d?
 
 # Sources cmu aliases to override any personal variants already loaded in
 # ~/.muttrc
-account-hook imaps://rkavanag@andrew.cmu.edu@imap.gmail.com \
-"set imap_user = 'rkavanag@andrew.cmu.edu';\
+account-hook imaps://rkavanag@alumni.cmu.edu@imap.gmail.com \
+"set imap_user = 'rkavanag@alumni.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';\
+set folder = 'imaps://rkavanag@alumni.cmu.edu@imap.gmail.com';\
 set spoolfile = '=INBOX';\
 set sendmail='sendmail -oem -oi';\
 set from = 'Ryan Kavanagh <rkavanagh@cs.cmu.edu>';\
@@ -109,13 +109,13 @@ macro compose <Esc><F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@i
 <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"<enter>\
+macro compose <F3> '<enter-command>set folder="imaps://rkavanag@alumni.cmu.edu@imap.gmail.com"<enter>\
 <edit-fcc><kill-line><enter>\
 <enter-command>set sendmail="sendmail -oem -oi"<enter>\
-<edit-from><kill-line>Ryan Kavanagh <rkavanag@andrew.cmu.edu><enter>' \
-"Send mail from CMU account"
+<edit-from><kill-line>Ryan Kavanagh <rkavanag@alumni.cmu.edu><enter>' \
+"Send mail from CMU Alumni account"
 
-macro compose <Esc><F3> '<enter-command>set folder="imaps://rkavanag@andrew.cmu.edu@imap.gmail.com"<enter>\
+macro compose <Esc><F3> '<enter-command>set folder="imaps://rkavanag@alumni.cmu.edu@imap.gmail.com"<enter>\
 <edit-fcc><kill-line><enter>\
 <enter-command>set sendmail="sendmail -oem -oi"<enter>\
 <edit-from><kill-line>Ryan Kavanagh <rkavanagh@cs.cmu.edu><enter>' \
diff --git a/.muttrc b/.muttrc
index 7613109..06206ad 100644
--- a/.muttrc
+++ b/.muttrc
@@ -3,7 +3,7 @@ set use_from = yes
 set use_envelope_from = yes
 set reverse_name = yes
 set reverse_realname = no
-alternates "ryanakca@gmail\.com|ryanakca@kubuntu\.org|ryanakca@ubuntu\.com|9rak@queensu\.ca|ryan\.kavanagh@queensu\.ca|rak@debian\.org|ryan@cs\.queensu\.ca|rkavanag@cs\.cmu\.edu|rkavanagh@cs\.cmu\.edu|rkavanag@andrew\.cmu\.edu|rak@ryanak\.ca|rak@rak\.ac"
+alternates "ryanakca@(gmail\\.com|kubuntu\\.org|ubuntu\\.com)|(ryan\\.kavanagh|9rak)@queensu\\.ca|rak@(debian\\.org|rak\\.ac|ryanak\\.ca)|rkavanag@((andrew|alumni|cs)\\.cmu\\.edu)|rkavanagh@cs\\.cmu\\.edu|ryan@cs\\.queensu\\.ca|ryank@cs\\.mcgill\.ca|ryan\\.kavanagh@(mail\\.)?mcgill\\.ca"
 
 set crypt_autosign = yes # default: no
 set crypt_replysign = yes # default: no
diff --git a/.netrc b/.netrc
index a1277d1..49c6f3a 100644
--- a/.netrc
+++ b/.netrc
@@ -1,4 +1,4 @@
-machine imap.gmail.com login rkavanag@andrew.cmu.edu password CMU_PASS
+machine imap.gmail.com login rkavanag@alumni.cmu.edu password CMU_PASS
 machine imap.gmail.com login ryanakca@gmail.com password GMAIL_mailx_PASS
 machine imap.rak.ac login rak password RYANAKCA_PASS
 machine localhost login ryan password LOCAL_PASS
diff --git a/.s-nail.rc b/.s-nail.rc
index d2b7a12..9ada463 100644
--- a/.s-nail.rc
+++ b/.s-nail.rc
@@ -97,7 +97,7 @@ set netrc-lookup
 # ACCOUNTS #
 ############
 
-set alternates="ryanakca@gmail.com,rak@debian.org,ryanakca@ubuntu.com,ryanakca@kubuntu.org,rak@rak.ac,rak@ryanak.ca,rkavanag@andrew.cmu.edu,rkavanag@cs.cmu.edu,rkavanagh@cs.cmu.edu,ryan@cs.queensu.ca"
+set alternates="ryanakca@gmail.com,rak@debian.org,ryanakca@ubuntu.com,ryanakca@kubuntu.org,rak@rak.ac,rak@ryanak.ca,rkavanag@andrew.cmu.edu,rkavanag@alumni.cmu.edu,rkavanag@cs.cmu.edu,rkavanagh@cs.cmu.edu,ryan@cs.queensu.ca"
 
 define gmail {
     set from="Ryan Kavanagh <ryanakca@gmail.com>"
@@ -122,9 +122,9 @@ define rak {
 
 define cmu {
     set from="Ryan Kavanagh <rkavanagh@cs.cmu.edu>"
-    set folder=imaps://rkavanag%40andrew.cmu.edu@imap.gmail.com/
+    set folder=imaps://rkavanag%40alumni.cmu.edu@imap.gmail.com/
     set MBOX=+Read
-    set record=+"[Gmail]/Sent Items"
+    set record=+"[Gmail]/Sent Mail"
 }
 
 # rak is the default account