Update mail.mcgill.ca neomutt config

6 files changed, 73 insertions, 19 deletions

diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
new file mode 100644
index 0000000..21fc93b
--- /dev/null
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
@@ -0,0 +1,40 @@
+-----BEGIN PGP MESSAGE-----
+
+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
+oEGlBXpwP1XcBb3o
+=hW88
+-----END PGP MESSAGE-----
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/ryan.kavanagh.mail.mcgill.ca/send.rc b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
new file mode 100644
index 0000000..fc5b2da
--- /dev/null
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
@@ -0,0 +1,8 @@
+# vim: syntax=muttrc
+
+set copy = yes
+set from = 'Ryan Kavanagh <rkavanagh@cs.mcgill.ca>'
+set sendmail = 'sendmail -oem -oi'
+
+unset smtp_pass
+unset smtp_url