43 files changed, 36 insertions, 150 deletions
diff --git a/dot_mutt/private_cache/bodies/.keep b/dot_cache/neomutt/bodies/.keep
index e69de29..e69de29 100644
--- a/dot_mutt/private_cache/bodies/.keep
+++ b/dot_cache/neomutt/bodies/.keep
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_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 b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc
index 5780c9a..5780c9a 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/format.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc
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_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc
index df5409d..0a5dab5 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.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/kavanagh.ryan.uqam.ca/xoauth2-token'
+set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/kavanagh.ryan.uqam.ca/xoauth2-token'
 set imap_passive = 'no'
 set imap_user = 'kavanagh.ryan@uqam.ca'
 
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
index def78d5..e89632e 100644
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
@@ -3,7 +3,7 @@
 set copy = yes
 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" ~/.mutt/accounts/kavanagh.ryan.uqam.ca/xoauth2-token'
+set smtp_oauth_refresh_command = '~/bin/mutt_oauth2.py --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/kavanagh.ryan.uqam.ca/xoauth2-token'
 set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/'
 
 set attribution = "Le %d, %n a écrit:"
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_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
diff --git a/dot_mutt/color.rc b/dot_config/neomutt/color.rc
index 94e6817..94e6817 100644
--- a/dot_mutt/color.rc
+++ b/dot_config/neomutt/color.rc
diff --git a/dot_mutt/gpg.rc b/dot_config/neomutt/gpg.rc
index 16c3534..16c3534 100644
--- a/dot_mutt/gpg.rc
+++ b/dot_config/neomutt/gpg.rc
diff --git a/dot_mutt/mailinglists.rc b/dot_config/neomutt/mailinglists.rc
index a05be8f..a05be8f 100644
--- a/dot_mutt/mailinglists.rc
+++ b/dot_config/neomutt/mailinglists.rc
diff --git a/dot_muttrc.tmpl b/dot_config/neomutt/neomuttrc.tmpl
index 5ffc36a..e857ce4 100644
--- a/dot_muttrc.tmpl
+++ b/dot_config/neomutt/neomuttrc.tmpl
@@ -31,8 +31,8 @@ set mail_check=60
 
 set move = no
 
-set header_cache="~/.mutt/cache/headers"
-set message_cachedir="~/.mutt/cache/bodies"
+set header_cache="$XDG_CACHE_HOME/neomutt/headers"
+set message_cachedir="$XDG_CACHE_HOME/neomutt/bodies"
 
 set edit_headers = yes
 
@@ -54,8 +54,8 @@ macro index .n "<tag-pattern>~N|~O<enter><tag-prefix-cond><tag-prefix><clear-fla
 
 my_hdr OpenPGP: id=4E469519ED677734268FBD958F7BF8FC4A11C97A\; url=https://rak.ac/contact/4E469519ED677734268FBD958F7BF8FC4A11C97A.asc\; preference=sign
 
-set sort=threads
-set sort_aux=date
+set use_threads=threads
+set sort_aux=last-date-received
 set move=no
 set mark_old=no
 ignore * # ignore all headers except for ...
@@ -76,7 +76,7 @@ set query_command="lbdbq %s"
 # macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
 # macro index,pager A "<pipe-message>abook --add-email-quiet<return>"
 set reverse_alias = yes
-set alias_file = ~/.mutt/alias.rc
+set alias_file = $XDG_CONFIG_HOME/neomutt/alias.rc
 
 set ispell="aspell -e -c"
 
@@ -127,19 +127,19 @@ set fcc_before_send=yes
 # to unset the folder option
 unset folder
 # alias.rc before accounts.rc
-source ~/.mutt/alias.rc
-source ~/.mutt/accounts.rc
-source ~/.mutt/mailinglists.rc
-source ~/.mutt/score.rc
-source ~/.mutt/color.rc
-source ~/.mutt/gpg.rc
-source ~/.mutt/news.rc
+source $XDG_CONFIG_HOME/neomutt/alias.rc
+source $XDG_CONFIG_HOME/neomutt/accounts.rc
+source $XDG_CONFIG_HOME/neomutt/mailinglists.rc
+source $XDG_CONFIG_HOME/neomutt/score.rc
+source $XDG_CONFIG_HOME/neomutt/color.rc
+source $XDG_CONFIG_HOME/neomutt/gpg.rc
+source $XDG_CONFIG_HOME/neomutt/news.rc
 
 {{- if hasPrefix .chezmoi.homeDir "/sdf"  }}
 set from = 'Ryan Kavanagh <rak@sdf.org>'
 {{- end }}
 
-set tmpdir='~/.mutt/tmp'
+set tmpdir='$XDG_CONFIG_HOME/neomutt/tmp'
 
 macro index <F7> \
   "<enter-command>unset wait_key<enter><shell-escape>~/bin/mutt-fetchbug --prompt search<enter><change-folder-readonly>~/.cache/mutt_btsresults<enter><enter-command>set wait_key<enter>" \
diff --git a/dot_mutt/news.rc b/dot_config/neomutt/news.rc
index 2b2d57b..24d2b77 100644
--- a/dot_mutt/news.rc
+++ b/dot_config/neomutt/news.rc
@@ -12,7 +12,7 @@ set inews = ''
 set mime_subject = yes
 set newsgroups_charset = utf-8
 set newsrc = '~/.newsrc'
-set news_cache_dir = '~/.mutt/cache/'
+set news_cache_dir = '$XDG_CONFIG_HOME/neomutt/cache/'
 set news_server = 'news.club.cc.cmu.edu'
 set nntp_authenticators = ''
 set nntp_context = 1000
diff --git a/dot_mutt/score.rc b/dot_config/neomutt/score.rc
index 6cdceb4..251fe26 100644
--- a/dot_mutt/score.rc
+++ b/dot_config/neomutt/score.rc
@@ -1,6 +1,6 @@
 uncolor index *
 unscore *
-source ~/.mutt/color.rc
+source $XDG_CONFIG_HOME/neomutt/color.rc
 # Set directly to me
 score "~p" 8
 # from me
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
deleted file mode 100644
index 21fc93b..0000000
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc
+++ /dev/null
@@ -1,40 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-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
-oEGlBXpwP1XcBb3o
-=hW88
------END PGP MESSAGE-----
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
deleted file mode 100644
index 84cf0e5..0000000
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ /dev/null
@@ -1,74 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-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
-GSzkKXc=
-=j2WX
------END PGP MESSAGE-----