5 files changed, 37 insertions, 23 deletions
diff --git a/dot_mutt/accounts/queensu.ca/folders.rc b/dot_mutt/accounts/queensu.ca/folders.rc
new file mode 100644
index 0000000..2b552ff
--- /dev/null
+++ b/dot_mutt/accounts/queensu.ca/folders.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set mbox = '+Read'
+set postponed = '+Drafts'
+set record = '+Sent Items'
diff --git a/dot_mutt/accounts/queensu.ca/format.rc b/dot_mutt/accounts/queensu.ca/format.rc
new file mode 100644
index 0000000..4ab31f0
--- /dev/null
+++ b/dot_mutt/accounts/queensu.ca/format.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n   %s%*  -- (%P)'
+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)---'
diff --git a/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl b/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl
index ed968b3..f7cd3e4 100644
--- a/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl
@@ -1,28 +1,12 @@
 # vim: syntax=muttrc
 
-set imap_user = '9rak@queensu.ca'
-set imap_login = '9rak@queensu.ca'
-unset imap_pass
-set imap_authenticators = 'xoauth2'
-set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-queensu.ca-token'
-set imap_passive = 'no'
-
-set smtp_url = 'smtp://9rak@queensu.ca@smtp.office365.com:587/'
-set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-queensu.ca-token'
-unset smtp_pass
-unset smtp_url
-unset sendmail
-
-set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>'
+cd ~/.mutt/accounts/queensu.ca
 
 set folder = 'imaps://9rak@queensu.ca@outlook.office365.com'
-set record = '=Sent Items'
-set copy = 'yes'
-set postponed = '=Drafts'
-set spoolfile = '=Inbox'
-set mbox = '=Read'
 
-set pager_format = '-%Z-QUEENSU: %C/%m: %-20.20n   %s%*  -- (%P)'
-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)---'
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
+
+cd
diff --git a/dot_mutt/accounts/queensu.ca/read.rc b/dot_mutt/accounts/queensu.ca/read.rc
new file mode 100644
index 0000000..2e9ebc5
--- /dev/null
+++ b/dot_mutt/accounts/queensu.ca/read.rc
@@ -0,0 +1,8 @@
+# vim: syntax=muttrc
+
+set imap_authenticators = 'xoauth2'
+set imap_login = '9rak@queensu.ca'
+set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-queensu.ca-token'
+set imap_passive = 'no'
+set imap_user = '9rak@queensu.ca'
+unset imap_pass
diff --git a/dot_mutt/accounts/queensu.ca/send.rc b/dot_mutt/accounts/queensu.ca/send.rc
new file mode 100644
index 0000000..720552a
--- /dev/null
+++ b/dot_mutt/accounts/queensu.ca/send.rc
@@ -0,0 +1,12 @@
+# vim: syntax=muttrc
+
+set copy = yes
+
+set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>'
+
+set smtp_url = 'smtp://9rak@queensu.ca@smtp.office365.com:587/'
+set smtp_authenticators = 'xoauth2'
+set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-queensu.ca-token'
+
+unset smtp_pass
+unset sendmail