aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@rak.ac>2022-06-28 14:47:34 -0400
committerRyan Kavanagh <rak@rak.ac>2022-06-28 14:47:34 -0400
commitb89dc655743f49a392c4f90b3091ee15bee07ff5 (patch)
tree3f5e58c5c0a14c718a1e5f430d3a558024e1f9f2
parentaccounts -> main.rc (diff)
Split up work
Diffstat (limited to '')
-rw-r--r--dot_mutt/accounts/queensu.ca/folders.rc5
-rw-r--r--dot_mutt/accounts/queensu.ca/format.rc5
-rw-r--r--dot_mutt/accounts/queensu.ca/private_main.rc.tmpl30
-rw-r--r--dot_mutt/accounts/queensu.ca/read.rc8
-rw-r--r--dot_mutt/accounts/queensu.ca/send.rc12
-rw-r--r--dot_mutt/accounts/rak.rak.ac/folders.rc5
-rw-r--r--dot_mutt/accounts/rak.rak.ac/format.rc5
-rw-r--r--dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl20
-rw-r--r--dot_mutt/accounts/rak.rak.ac/read.rc5
-rw-r--r--dot_mutt/accounts/rak.rak.ac/send.rc7
-rw-r--r--dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc4
-rw-r--r--dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc5
-rw-r--r--dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl20
-rw-r--r--dot_mutt/accounts/rkavanag.alumni.cmu.edu/read.rc6
-rw-r--r--dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc9
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.ascbin0 -> 1842 bytes
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/folders.rc8
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/format.rc5
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl24
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/read.rc5
-rw-r--r--dot_mutt/accounts/ryanakca.gmail.com/send.rc9
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias-mcgill.rc.asc (renamed from dot_mutt/encrypted_alias-mcgill.rc.asc)0
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc5
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/format.rc5
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl21
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/read.rc5
-rw-r--r--dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc9
-rw-r--r--dot_mutt/encrypted_private_savehooks.rc.asc46
28 files changed, 159 insertions, 129 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
diff --git a/dot_mutt/accounts/rak.rak.ac/folders.rc b/dot_mutt/accounts/rak.rak.ac/folders.rc
new file mode 100644
index 0000000..334dd3f
--- /dev/null
+++ b/dot_mutt/accounts/rak.rak.ac/folders.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set mbox = '=RAK'
+set postponed = '=Drafts'
+set record = '=Sent'
diff --git a/dot_mutt/accounts/rak.rak.ac/format.rc b/dot_mutt/accounts/rak.rak.ac/format.rc
new file mode 100644
index 0000000..c27e52a
--- /dev/null
+++ b/dot_mutt/accounts/rak.rak.ac/format.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set pager_format = '-%Z-RAK.AC: %C/%m: %-20.20n %s%* -- (%P)'
+set compose_format = '-- RAK.AC: Compose [Approx. msg size: %l Atts: %a]%>-'
+set status_format = '-%r-RAK.AC: %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/rak.rak.ac/private_main.rc.tmpl b/dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl
index 3666303..9376bc8 100644
--- a/dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl
+++ b/dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl
@@ -1,20 +1,12 @@
# vim: syntax=muttrc
-set imap_user = 'rak'
-set imap_pass = '{{ .password.rakac }}'
-set imap_delim_chars = '/'
+cd ~/.mutt/accounts/rak.rak.ac
set folder = 'imaps://imap.rak.ac/'
-set record = '=Sent'
-set copy = 'yes'
-set postponed = '=Drafts'
-set mbox = '=RAK'
-unset smtp_url
-unset smtp_pass
-set sendmail = 'sendmail -oem -oi'
-set from = 'Ryan Kavanagh <rak@rak.ac>'
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
-set pager_format = '-%Z-RAK.AC: %C/%m: %-20.20n %s%* -- (%P)'
-set compose_format = '-- RAK.AC: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-RAK.AC: %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/rak.rak.ac/read.rc b/dot_mutt/accounts/rak.rak.ac/read.rc
new file mode 100644
index 0000000..5eec2e9
--- /dev/null
+++ b/dot_mutt/accounts/rak.rak.ac/read.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set imap_delim_chars = '/'
+set imap_pass = '{{ .password.rakac }}'
+set imap_user = 'rak'
diff --git a/dot_mutt/accounts/rak.rak.ac/send.rc b/dot_mutt/accounts/rak.rak.ac/send.rc
new file mode 100644
index 0000000..4dda27a
--- /dev/null
+++ b/dot_mutt/accounts/rak.rak.ac/send.rc
@@ -0,0 +1,7 @@
+# vim: syntax=muttrc
+
+set from = 'Ryan Kavanagh <rak@rak.ac>'
+
+set sendmail = 'sendmail -oem -oi'
+unset smtp_pass
+unset smtp_url
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc
new file mode 100644
index 0000000..6e8a041
--- /dev/null
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc
@@ -0,0 +1,4 @@
+# vim: syntax=muttrc
+
+set mbox = '=Read'
+set record = '+[Gmail]/Sent Mail'
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc
new file mode 100644
index 0000000..1ef6580
--- /dev/null
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set pager_format = '-%Z-CMU: %C/%m: %-20.20n %s%* -- (%P)'
+set compose_format = '-- CMU: Compose [Approx. msg size: %l Atts: %a]%>-'
+set status_format = '-%r-CMU: %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/rkavanag.alumni.cmu.edu/private_main.rc.tmpl b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl
index cea3820..2360d6c 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl
@@ -1,20 +1,12 @@
# vim: syntax=muttrc
-set imap_user = 'rkavanag@alumni.cmu.edu'
-set imap_pass = '{{ .password.cmu }}'
-set imap_passive = 'no'
-set imap_keepalive = 60
+cd ~/.mutt/accounts/rkavanag.alumni.cmu.edu
set folder = 'imaps://rkavanag@alumni.cmu.edu@imap.gmail.com'
-set spoolfile = '=INBOX'
-set mbox = '=Read'
-set copy = 'no'
-set sendmail='sendmail -oem -oi'
-set from = 'Ryan Kavanagh <rkavanagh@cs.cmu.edu>'
-unset smtp_url
-unset smtp_pass
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
-set pager_format = '-%Z-CMU: %C/%m: %-20.20n %s%* -- (%P)'
-set compose_format = '-- CMU: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-CMU: %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/rkavanag.alumni.cmu.edu/read.rc b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/read.rc
new file mode 100644
index 0000000..a2c6733
--- /dev/null
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/read.rc
@@ -0,0 +1,6 @@
+# vim: syntax=muttrc
+
+set imap_keepalive = 60
+set imap_pass = '{{ .password.cmu }}'
+set imap_passive = 'no'
+set imap_user = 'rkavanag@alumni.cmu.edu'
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc
new file mode 100644
index 0000000..428e1b2
--- /dev/null
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc
@@ -0,0 +1,9 @@
+# vim: syntax=muttrc
+
+set from = 'Ryan Kavanagh <rkavanagh@cs.cmu.edu>'
+
+set copy = 'no'
+set sendmail='sendmail -oem -oi'
+
+unset smtp_url
+unset smtp_pass
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc b/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
new file mode 100644
index 0000000..0762b66
--- /dev/null
+++ b/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
Binary files differ
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/folders.rc b/dot_mutt/accounts/ryanakca.gmail.com/folders.rc
new file mode 100644
index 0000000..60c24f2
--- /dev/null
+++ b/dot_mutt/accounts/ryanakca.gmail.com/folders.rc
@@ -0,0 +1,8 @@
+# vim: syntax=muttrc
+
+set folder = 'imaps://ryanakca@gmail.com@imap.gmail.com'
+
+set postponed = '=[Google Mail]/Drafts'
+set record = '=[Google Mail]/Sent Mail'
+
+unset mbox
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/format.rc b/dot_mutt/accounts/ryanakca.gmail.com/format.rc
new file mode 100644
index 0000000..1af2c3e
--- /dev/null
+++ b/dot_mutt/accounts/ryanakca.gmail.com/format.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set pager_format = '-%Z-GMAIL: %C/%m: %-20.20n %s%* -- (%P)'
+set compose_format = '-- GMAIL: Compose [Approx. msg size: %l Atts: %a]%>-'
+set status_format = '-%r-GMAIL: %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/ryanakca.gmail.com/private_main.rc.tmpl b/dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl
index 69e60fb..7876e09 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl
@@ -1,21 +1,11 @@
# vim: syntax=muttrc
-set imap_user = 'ryanakca@gmail.com'
-set imap_pass = '{{ .password.gmail }}'
-set imap_passive = 'no'
+cd ~/.mutt/accounts/ryanakca.gmail.com
-set folder = 'imaps://ryanakca@gmail.com@imap.gmail.com'
-set postponed = '=[Google Mail]/Drafts'
-set spoolfile = '=INBOX'
-set record = '=[Google Mail]/Sent Mail'
-set copy = 'no'
-unset mbox
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
+source savehooks.rc
-set from = 'Ryan Kavanagh <ryanakca@gmail.com>'
-set sendmail = 'sendmail -oem -oi'
-unset smtp_url
-unset smtp_pass
-
-set pager_format = '-%Z-GMAIL: %C/%m: %-20.20n %s%* -- (%P)'
-set compose_format = '-- GMAIL: Compose [Approx. msg size: %l Atts: %a]%>-'
-set status_format = '-%r-GMAIL: %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/ryanakca.gmail.com/read.rc b/dot_mutt/accounts/ryanakca.gmail.com/read.rc
new file mode 100644
index 0000000..c09f92a
--- /dev/null
+++ b/dot_mutt/accounts/ryanakca.gmail.com/read.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set imap_pass = '{{ .password.gmail }}'
+set imap_passive = 'no'
+set imap_user = 'ryanakca@gmail.com'
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/send.rc b/dot_mutt/accounts/ryanakca.gmail.com/send.rc
new file mode 100644
index 0000000..5e84f84
--- /dev/null
+++ b/dot_mutt/accounts/ryanakca.gmail.com/send.rc
@@ -0,0 +1,9 @@
+# vim: syntax=muttrc
+
+set from = 'Ryan Kavanagh <ryanakca@gmail.com>'
+
+set copy = no
+set sendmail = 'sendmail -oem -oi'
+
+unset smtp_url
+unset smtp_pass
diff --git a/dot_mutt/encrypted_alias-mcgill.rc.asc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias-mcgill.rc.asc
index 21fc93b..21fc93b 100644
--- a/dot_mutt/encrypted_alias-mcgill.rc.asc
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias-mcgill.rc.asc
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc
new file mode 100644
index 0000000..5645937
--- /dev/null
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/folders.rc
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 0000000..a4de8d1
--- /dev/null
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/format.rc
@@ -0,0 +1,5 @@
+# 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/private_main.rc.tmpl b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl
index 776f741..e5619eb 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl
@@ -1,21 +1,12 @@
# vim: syntax=muttrc
-set imap_user = 'ryank'
-set imap_pass = '{{ .password.socs }}'
-set imap_delim_chars = '.'
+cd ~/.mutt/accounts/ryank.mail.cs.mcgill.ca
set folder = 'imaps://mail.cs.mcgill.ca/'
-set record = '+INBOX.Sent'
-set copy = 'yes'
-set postponed = '+INBOX.Drafts'
-set spoolfile = '+'
-set mbox = '+INBOX.Read'
-unset smtp_url
-unset smtp_pass
-set sendmail = 'sendmail -oem -oi'
-set from = 'Ryan Kavanagh <rkavanagh@cs.mcgill.ca>'
+source folders.rc
+source read.rc
+source send.rc
+source format.rc
-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)---
+cd
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/read.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/read.rc
new file mode 100644
index 0000000..9ac8fee
--- /dev/null
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/read.rc
@@ -0,0 +1,5 @@
+# vim: syntax=muttrc
+
+set imap_user = 'ryank'
+set imap_pass = '{{ .password.socs }}'
+set imap_delim_chars = '.'
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc
new file mode 100644
index 0000000..ddd1603
--- /dev/null
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/send.rc
@@ -0,0 +1,9 @@
+# vim: syntax=muttrc
+
+set from = 'Ryan Kavanagh <rkavanagh@cs.mcgill.ca>'
+
+set copy = yes
+set sendmail = 'sendmail -oem -oi'
+
+unset smtp_url
+unset smtp_pass
diff --git a/dot_mutt/encrypted_private_savehooks.rc.asc b/dot_mutt/encrypted_private_savehooks.rc.asc
deleted file mode 100644
index 4277563..0000000
--- a/dot_mutt/encrypted_private_savehooks.rc.asc
+++ /dev/null
@@ -1,46 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-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
-kS66NeJF3QUZsVH9RiP2kcLPSKo=
-=One5
------END PGP MESSAGE-----