Merge remote-tracking branch 'rak-https/master'

37 files changed, 119 insertions, 19 deletions

diff --git a/dot_mutt/accounts.rc b/dot_config/neomutt/accounts.rc
index 81a4ce7..6fdb111 100644
--- a/dot_mutt/accounts.rc
+++ b/dot_config/neomutt/accounts.rc
@@ -1,28 +1,28 @@
 # vim: syntax=muttrc
 
 account-hook imaps://ryanakca@gmail.com@imap.gmail.com \
-    source ~/.mutt/accounts/ryanakca.gmail.com/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/ryanakca.gmail.com/main.rc
 
 account-hook imaps://ryan.kavanagh@mcgill.ca@outlook.office365.com \
-    source ~/.mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
 
 account-hook imaps://ryan.kavanagh@mail.mcgill.ca@outlook.office365.com \
-    source ~/.mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
 
 account-hook imaps://9rak@queensu.ca@outlook.office365.com \
-    source ~/.mutt/accounts/9rak.queensu.ca/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca/main.rc
 
 account-hook imaps://kavanagh.ryan@uqam.ca@outlook.office365.com \
-    source ~/.mutt/accounts/kavanagh.ryan.uqam.ca/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/kavanagh.ryan.uqam.ca/main.rc
 
 account-hook imaps://imap.rak.ac \
-    source ~/.mutt/accounts/rak.rak.ac/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/rak.rak.ac/main.rc
 
 account-hook imaps://mail.cs.mcgill.ca \
-    source ~/.mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
 
 account-hook imaps://rkavanag@alumni.cmu.edu@imap.gmail.com \
-    source ~/.mutt/accounts/rkavanag.alumni.cmu.edu/main.rc
+    source $XDG_CONFIG_HOME/neomutt/accounts/rkavanag.alumni.cmu.edu/main.rc
 
 macro compose <F2> '<enter-command>set folder="imaps://ryanakca@gmail.com@imap.gmail.com"<enter>\
 <edit-fcc><kill-line><enter>\
diff --git a/dot_mutt/accounts/9rak.queensu.ca/folders.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/folders.rc
index 2b552ff..2b552ff 100644
--- a/dot_mutt/accounts/9rak.queensu.ca/folders.rc
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/folders.rc
diff --git a/dot_mutt/accounts/9rak.queensu.ca/format.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/format.rc
index 4ab31f0..4ab31f0 100644
--- a/dot_mutt/accounts/9rak.queensu.ca/format.rc
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/format.rc
diff --git a/dot_mutt/accounts/9rak.queensu.ca/main.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/main.rc
index 0e81120..49eab83 100644
--- a/dot_mutt/accounts/9rak.queensu.ca/main.rc
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/main.rc
@@ -1,6 +1,6 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/9rak.queensu.ca
+cd $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca
 
 set folder = 'imaps://9rak@queensu.ca@outlook.office365.com'
 
diff --git a/dot_mutt/accounts/9rak.queensu.ca/private_read.rc.tmpl b/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl
index cc734ff..407e643 100644
--- a/dot_mutt/accounts/9rak.queensu.ca/private_read.rc.tmpl
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl
@@ -1,7 +1,7 @@
 # vim: syntax=neomuttrc
 
 set imap_authenticators = 'xoauth2'
-set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" ~/.mutt/accounts/9rak.queensu.ca/xoauth2-token'
+set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca/xoauth2-token'
 set imap_passive = 'no'
 set imap_user = '9rak@queensu.ca'
 
diff --git a/dot_mutt/accounts/9rak.queensu.ca/send.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc
index af4f9c5..8327f7e 100644
--- a/dot_mutt/accounts/9rak.queensu.ca/send.rc
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc
@@ -3,7 +3,7 @@
 set copy = yes
 set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>'
 set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" ~/.mutt/accounts/9rak.queensu.ca/xoauth2-token'
+set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca/xoauth2-token'
 set smtp_url = 'smtp://9rak@queensu.ca@smtp.office365.com:587/'
 
 unset sendmail
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/encrypted_alias.rc.asc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/encrypted_alias.rc.asc
new file mode 100644
index 0000000..c67290c
--- /dev/null
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/encrypted_alias.rc.asc
@@ -0,0 +1,34 @@
+-----BEGIN PGP MESSAGE-----
+
+hQUMAwAAAAAAAAAAASf7Bq1aK8FzyB1Lk7RodUhugWmz/mTOXj2hSL/yCIUk7o79
+j1DrheMQx/IoAu9puepSZEo4rq126Zy97hKapOamPmBToupzUVV2hxgJ4Bo4z4Z3
+J+2eBl2D2yFmRZWu01I926CbK0TtYdVDA3RQfUmypSKFH5XXjUhR1p2QxDygiByt
+eGhzCxw0U3EIB55nt9cNMwLjWd0qZFFwGgTfBLDX+hfehYakuEXwjfRsLURBBsH2
+veuW0MnB1GNEKz3BGH0mD45evTI3KoNtheRSFPg5+MSB1P0R55rkqg0YHJGVpKQ2
+ci4hvb6KNSsQ9IMT77JFskNQOSKaTPbesto2HTZQMLC6rSqVem67Hj121je/iUNK
+4ihkNeSaTYkQ8WqsEDbjqmU0nhTkQU5nt+6VeCsRB+Ahli0iDdlh/t3P5o505TuQ
+Siqt35u3Rz8FGJswVGVpJh/tGJYz+HAPsjv4cT7WOWmA2hy3/YzyoCZUyyEXMOj6
++4c11fGIeqZs0tdo9PSRSY5f15bsGliRd7nju+aVn/r1fm3uAtPCfGbBVFofGX82
+/oixU5OunleZpmPj+HE0/B2zWZifXZAXh4AhjPn616HyZZfZOG7W9oQoRYD35wbx
+Oxl84gP8xhbmf8UD1tZ7DlrWdLgKnjrAXgZ/yix+nS6zIUuAhgcpfRr7pz78wGPf
+B9wBUHwx0vWs7M2pMqKTm08lCoGqMd2eXoCI1KOa92a6C42x0BH2VlXcjVKHn7/C
+1hExTz25W3HKaAGq5kuhndXy8VFYd+KHbvhMMp0GHzWsadjcwXqu65DHgjNZBZPi
+P2ifLP+uADdUmQ8CccfrYT4VLUCGaSzrBMvN/MGRnEm/8jL//Uzju7DPysq8xOL7
+/WqgyTxrI1b1cz/2Wv1aowZL9cLoPySd5cul3cdkx7BCPgWtyT/m4q+IKtF1PAnC
+SMaNLNKD2r+XGjnQMHFJzrwwbDXhp3IBB5f+iMAr7lT4wydZ8VGF+TNW14m3ax9l
+tONwO1QxCFs9e4BbhLv5/gXxIi7+qhk1qsrP379F8N01RyZiP2mhluLKkf7Hjetz
+QlHVk1eVV5Er+6GdU1tVqzbxRRDKDmsKiHT7RghdzvsVirUi2k6jTceXLco6DqWc
+kPyyJYNkHHN1vUDWKEYZO2m43pS+FauyDkX/u64363cyxBzwHYex+aFq7jTn7K1h
+VBAkZiApiYCGDmP4Th9BPk5EAEtcjz/xot/JUury/3K6W9s/5gvGvBJXey74pGQc
+TRiZUU6iLcm53FkDyHEs9j/F2BWmfAaWc8LpIj1sUqbg88k2zKgoYy4swruq4ybV
+7Ja6ogCJvaaSAl5RZcgcx+bPOHrMurjUWedtsW0YtShykqQRdf2cHzLlvzDs5FOm
+W9XZ6WwpDGKxYp0nDdAkGf2Tmy0IrCRqonBXraWmtE/7uEC1WflQKeL7c1g5glmy
+b2wJ5DY77UTZqkp9kpCqGCFQbsHVXrF7NGOoKvYBJBe6adYMDlKpPasAPas2fum5
+9jbmPvTBSE9bOKubU92H8ECaiL4Yo7KJUrpTABDwYgZRQYGCwrr+roKHxKtcU9Kt
+mUYx0OqT9hnKlggsRBiXVevssAlQ6euokHJm/xMDL4vUX/dvhq7X3IIf9lFLgiHR
+5VI1goEU8g4cbyhZYfwE5MQHt4us3C9dRKqbYhs7VTHgqFAMNKaRtjxBw4ATUtzS
+ewFs9pOILpgyL3tAXeBzeuRC5wsedICSjpDzgTTeA7jmUieKM/RYdXm0MIenbT+w
++mhvnYbadJbMMRptNJDMeaWMwgH7NPT2Go6pMCQQ+zCEWEyU/OpLBRqPBeCShNGX
++72rtlN8jHbLixW4hYgKMg/yvEwyl+rPppRUcA==
+=O65p
+-----END PGP MESSAGE-----
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/folders.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/folders.rc
index 2b552ff..2b552ff 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/folders.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/folders.rc
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl
index b0d2ded..b0d2ded 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/main.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/main.rc
index b1a60e5..30b1dc6 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/main.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/main.rc
@@ -1,8 +1,8 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/kavanagh.ryan.uqam.ca
+cd $XDG_CONFIG_HOME/neomutt/accounts/kavanagh.ryan.uqam.ca
 
-set folder = 'imaps://kavanagh.ryan@uqam.ca@outlook.office365.com'
+set folder = 'imaps://kavanagh.ryan@uqam.ca@outlook.office365.com/'
 
 source folders.rc
 source read.rc
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc
new file mode 100644
index 0000000..fd74dfa
--- /dev/null
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.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' `pwd`/xoauth2-token"
+set imap_passive = 'no'
+set imap_user = 'kavanagh.ryan@uqam.ca'
+
+unset imap_pass
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
new file mode 100644
index 0000000..ac1f134
--- /dev/null
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
@@ -0,0 +1,14 @@
+# vim: syntax=muttrc
+
+# Set copy to no so long as you use UQAM's smtp,
+# which automatically saves messages to $record
+set copy = no
+set from = 'Ryan Kavanagh <kavanagh.ryan@uqam.ca>'
+set smtp_authenticators = 'xoauth2'
+set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token"
+set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/'
+
+set signature = "`pwd`/signature"
+
+unset sendmail
+unset smtp_pass
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/signature b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/signature
new file mode 100644
index 0000000..90723cd
--- /dev/null
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/signature
@@ -0,0 +1,4 @@
+Ryan Kavanagh
+Professeur régulier au Département d'informatique
+Université du Québec à Montréal (UQAM)
+PK-4330
diff --git a/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc b/dot_config/neomutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
index 00883ac..00883ac 100644
--- a/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
+++ b/dot_config/neomutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
diff --git a/dot_mutt/accounts/rak.rak.ac/folders.rc b/dot_config/neomutt/accounts/rak.rak.ac/folders.rc
index 334dd3f..334dd3f 100644
--- a/dot_mutt/accounts/rak.rak.ac/folders.rc
+++ b/dot_config/neomutt/accounts/rak.rak.ac/folders.rc
diff --git a/dot_mutt/accounts/rak.rak.ac/format.rc b/dot_config/neomutt/accounts/rak.rak.ac/format.rc
index c27e52a..c27e52a 100644
--- a/dot_mutt/accounts/rak.rak.ac/format.rc
+++ b/dot_config/neomutt/accounts/rak.rak.ac/format.rc
diff --git a/dot_mutt/accounts/rak.rak.ac/main.rc b/dot_config/neomutt/accounts/rak.rak.ac/main.rc
index 2c1b109..35f044c 100644
--- a/dot_mutt/accounts/rak.rak.ac/main.rc
+++ b/dot_config/neomutt/accounts/rak.rak.ac/main.rc
@@ -1,6 +1,6 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/rak.rak.ac
+cd $XDG_CONFIG_HOME/neomutt/accounts/rak.rak.ac
 
 set folder = 'imaps://imap.rak.ac/'
 
diff --git a/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl b/dot_config/neomutt/accounts/rak.rak.ac/private_read.rc.tmpl
index 6e061ff..6e061ff 100644
--- a/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl
+++ b/dot_config/neomutt/accounts/rak.rak.ac/private_read.rc.tmpl
diff --git a/dot_mutt/accounts/rak.rak.ac/send.rc b/dot_config/neomutt/accounts/rak.rak.ac/send.rc
index b8d61e1..b8d61e1 100644
--- a/dot_mutt/accounts/rak.rak.ac/send.rc
+++ b/dot_config/neomutt/accounts/rak.rak.ac/send.rc
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc
index c16c4f7..c16c4f7 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/folders.rc
index 6e8a041..6e8a041 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/folders.rc
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/format.rc
index 1ef6580..1ef6580 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/format.rc
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/main.rc b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/main.rc
index 2360d6c..967847d 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/main.rc
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/main.rc
@@ -1,6 +1,6 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/rkavanag.alumni.cmu.edu
+cd $XDG_CONFIG_HOME/neomutt/accounts/rkavanag.alumni.cmu.edu
 
 set folder = 'imaps://rkavanag@alumni.cmu.edu@imap.gmail.com'
 
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
index 16febff..16febff 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/send.rc
index 46640c2..46640c2 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/send.rc
diff --git a/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
new file mode 100644
index 0000000..3acd49e
--- /dev/null
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
@@ -0,0 +1,40 @@
+-----BEGIN PGP MESSAGE-----
+
+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
+e4Fo5B9ePsKEYcU=
+=7eze
+-----END PGP MESSAGE-----
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc
index fab5447..fab8acc 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc
@@ -1,5 +1,5 @@
 # vim: syntax=muttrc
 
-set mbox = '+INBOX.Read'
+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_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc
index 3d4c8fe..3d4c8fe 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
index b2d85a8..f3859a3 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
@@ -1,6 +1,6 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/ryan.kavanagh.mail.mcgill.ca/
+cd $XDG_CONFIG_HOME/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/
 
 set folder = 'imaps://ryan.kavanagh@mail.mcgill.ca@outlook.office365.com/'
 
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc
index 6b6e03e..52c1101 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc
@@ -1,7 +1,7 @@
 # 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_oauth_refresh_command = '~/bin/mutt_oauth2.py --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/xoauth2-token'
 set imap_passive = 'no'
 set imap_user = 'ryan.kavanagh@mail.mcgill.ca'
 
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
index fc5b2da..fc5b2da 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
+++ b/dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc b/dot_config/neomutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
index 5b3bfaf..5b3bfaf 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/folders.rc b/dot_config/neomutt/accounts/ryanakca.gmail.com/folders.rc
index 60c24f2..60c24f2 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/folders.rc
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/folders.rc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/format.rc b/dot_config/neomutt/accounts/ryanakca.gmail.com/format.rc
index 1af2c3e..1af2c3e 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/format.rc
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/format.rc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/main.rc b/dot_config/neomutt/accounts/ryanakca.gmail.com/main.rc
index 7876e09..53063fe 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/main.rc
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/main.rc
@@ -1,6 +1,6 @@
 # vim: syntax=muttrc
 
-cd ~/.mutt/accounts/ryanakca.gmail.com
+cd $XDG_CONFIG_HOME/neomutt/accounts/ryanakca.gmail.com
 
 source folders.rc
 source read.rc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl b/dot_config/neomutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
index 837c2d5..837c2d5 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/send.rc b/dot_config/neomutt/accounts/ryanakca.gmail.com/send.rc
index 6df9cc1..6df9cc1 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/send.rc
+++ b/dot_config/neomutt/accounts/ryanakca.gmail.com/send.rc