14 files changed, 99 insertions, 145 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index 8311c26..4873f59 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -1,5 +1,7 @@
 .gnupg/dirmngr.conf
 .lbdbrc
+.mutt/accounts/ryank.mail.cs.mcgill.ca/
+.mutt/accounts/ryan.kavanagh.mcgill.ca/
 .mutt/savehooks.rc
 .pulse
 .screenlayout/zeta-home.sh
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias.rc.asc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
index 21fc93b..21fc93b 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias.rc.asc
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc
new file mode 100644
index 0000000..fab5447
--- /dev/null
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set mbox = '+INBOX.Read'
+set postponed = '+Drafts'
+set record = '+Sent Items'
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc
new file mode 100644
index 0000000..3d4c8fe
--- /dev/null
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set pager_format = '-%Z-MAIL.MCGILL.CA: %C/%m: %-20.20n   %s%*  -- (%P)'
+set compose_format = '-- MAIL.MCGILL.CA: Compose [Approx. msg size: %l Atts: %a]%>-'
+set status_format = '-%r-MAIL.MCGILL.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)---
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
index 053a327..b2d85a8 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
@@ -1,24 +1,12 @@
 # vim: syntax=muttrc
 
-set imap_user = 'ryan.kavanagh@mail.mcgill.ca'
-set imap_login = 'ryan.kavanagh@mail.mcgill.ca'
-set imap_authenticators = 'xoauth2'
-set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-mail.mcgill.ca-token'
+cd ~/.mutt/accounts/ryan.kavanagh.mail.mcgill.ca/
 
-set smtp_url = 'smtp://ryan.kavanagh@mail.mcgill.ca@smtp.office365.com:587/'
-set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-mail.mcgill.ca-token'
-unset smtp_pass
-set from = 'Ryan Kavanagh <ryan.kavanagh@mail.mcgill.ca>'
+set folder = 'imaps://ryan.kavanagh@mail.mcgill.ca@outlook.office365.com/'
 
-set folder = 'imaps://ryan.kavanagh@mail.mcgill.ca@outlook.office365.com'
-set record = '=Sent Items'
-set copy = 'no'
-set postponed = '=Drafts'
-set spoolfile = '=Inbox'
-set imap_passive = 'no'
-set mbox = '=Archive'
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
 
-set pager_format = '-%Z-MAIL.MCGILL.CA: %C/%m: %-20.20n   %s%*  -- (%P)'
-set compose_format = '-- MAIL.MCGILL.CA: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-MAIL.MCGILL.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)---'"
+cd
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc
new file mode 100644
index 0000000..6b6e03e
--- /dev/null
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc
@@ -0,0 +1,8 @@
+# vim: syntax=neomuttrc
+
+set imap_authenticators = 'xoauth2'
+set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py --encryption-pipe="cat" --decryption-pipe="cat" ~/.mutt/accounts/ryan.kavanagh.mail.mcgill.ca/xoauth2-token'
+set imap_passive = 'no'
+set imap_user = 'ryan.kavanagh@mail.mcgill.ca'
+
+unset imap_pass
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
index fc5b2da..fc5b2da 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
diff --git a/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc b/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
deleted file mode 100644
index cc70e66..0000000
--- a/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: syntax=muttrc
-
-set imap_authenticators = 'xoauth2'
-set imap_login = 'ryan.kavanagh@mcgill.ca'
-set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-mcgill.ca-token'
-set imap_passive = 'no'
-set imap_user = 'ryan.kavanagh@mcgill.ca'
-
-set smtp_url = 'smtp://ryan.kavanagh@mcgill.ca@smtp.office365.com:587/'
-set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-mcgill.ca-token'
-unset smtp_pass
-unset sendmail
-set from = 'Ryan Kavanagh <ryan.kavanagh@mcgill.ca>'
-
-set folder = 'imaps://ryan.kavanagh@mcgill.ca@outlook.office365.com'
-set record = '=Sent Items'
-set copy = 'no'
-set postponed = '=Drafts'
-set mbox = '=Archive'
-
-set pager_format = '-%Z-MCGILL.CA: %C/%m: %-20.20n   %s%*  -- (%P)'
-set compose_format = '-- MCGILL.CA: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-MCGILL.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)---'
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc
deleted file mode 100644
index 5645937..0000000
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim: syntax=muttrc
-
-set mbox = '+INBOX.Read'
-set postponed = '+INBOX.Drafts'
-set record = '+INBOX.Sent'
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/format.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/format.rc
deleted file mode 100644
index a4de8d1..0000000
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/format.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim: syntax=muttrc
-
-set pager_format = '-%Z-CS.MCGILL.CA: %C/%m: %-20.20n   %s%*  -- (%P)'
-set compose_format = '-- CS.MCGILL.CA: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-CS.MCGILL.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)---
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
deleted file mode 100644
index e5619eb..0000000
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: syntax=muttrc
-
-cd ~/.mutt/accounts/ryank.mail.cs.mcgill.ca
-
-set folder = 'imaps://mail.cs.mcgill.ca/'
-
-source folders.rc
-source read.rc
-source send.rc
-source format.rc
-
-cd
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl
deleted file mode 100644
index 569c016..0000000
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim: syntax=muttrc
-
-set imap_delim_chars = '.'
-{{- if .password.socs }}
-set imap_pass = '{{ .password.socs }}'
-{{- end }}
-set imap_user = 'ryank'
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
index d9b43dd..84cf0e5 100644
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ b/dot_mutt/encrypted_private_alias.rc.asc
@@ -1,75 +1,74 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-JJ51
-=yK33
+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
+GSzkKXc=
+=j2WX
 -----END PGP MESSAGE-----
diff --git a/dot_tmux-mail.conf b/dot_tmux-mail.conf
index 27f6ea3..f8019f2 100644
--- a/dot_tmux-mail.conf
+++ b/dot_tmux-mail.conf
@@ -3,7 +3,7 @@ source-file ~/.tmux.conf
 new-session -s mail -d -n mutt 'neomutt -f imaps://rkavanag%40alumni.cmu.edu@imap.gmail.com'
 split-window -c '~' 'neomutt -f imaps://imap.rak.ac'
 split-window -c '~' -h 'neomutt -f imaps://ryanakca@gmail.com@imap.gmail.com/'
-split-window -c '~' -h 'neomutt -f imaps://mail.cs.mcgill.ca'
+split-window -c '~' -h 'neomutt -f imaps://kavanagh.ryan@uqam.ca@outlook.office365.com'
 selectl -t mail tiled
 new-window -d -c '~' -n hades 'ssh hades.rak.ac'
 new-window -d -c '~' -n eos 'ssh eos.rak.ac'