Merge remote-tracking branch 'refs/remotes/origin/master'

11 files changed, 25 insertions, 72 deletions

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'