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

49 files changed, 308 insertions, 71 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-----
+
+hQUMAwAAAAAAAAAAASgAt/pilEor3JhKFEoqiFwE+Gaq+ukuH5R8MvUuKxihWXv2
+2F0qxKxOdQklxpnkJflfpEhScoEH6MnqySyDTh+pCyQkyXzcP2IvNRUzyKp1EkFo
+HLX6TQBeH/qFi8zHYdKf6EwHbOwZHWIrN6ydOFwbqo9+ouSnnMMRtx1hgqB/hKN0
+myqwpdrSDA8hW/mQtHWH2GPbgcNpEBda2uOSwy1bbJF7EzI5ll2WQ1yu3+RxydlC
+TUogUS4WfgB2ohgVrU8Dlt1Ol0UqaTkU243hyxWn4tnUQjT51h9D0Ae3305O2p6/
+xPNvhdSRsWJ/GRy09mg4YFr0TjO+Znj7u09bx9H65h1nQJ56V7LhbiACQArzfppX
+dedf9HsEJaPpDcl9vyAbmpOKlzVvBi7MV/U5jDIxMYkGA053OC691BumulrNORHS
+sJkKic8nBrywYS0Ug16RCfOBuuRSs+saDsG9b1CYdr7URHbOFzMu7yfYBPCqlX9G
+1H7OkbIAScmiHYZ1h3hMV9iwiziKxNJ03Cy3U4J5zbFjRyOuu0U7aF2o5BKLndyG
+QrPQVAx1cIaLsFlPTgwKxAp6swHChahgfkS+K5GtAwwa2UueTbbAvSZCZVhYTFAn
+1F9omg3+HcbtckiPtQjF5a3DMwOERTZuZFxCoaNUU2TX1zXjPMKkRXhkz91mBkK3
+taSAtMJzyIvi8Q3oF9H1+txGclA4H6C6kLlac6QTDc3jRKheVHlSfj07WVGPpnJ+
+NZXEDhkPBMaD3QQP6AtsCsBrH1dXiE7wr9fF9Xy4i+joRMdtns5H0BPlcsujZvjO
+oOQPxORuiG8HInI5JrpGKdVeWUPvniqtJEtAkTC+c5M4FMv1AsWGV2+NC+E3GC2a
+XqJKvEbBexjJ3s5HkHrNxIYLX1QmxqOC/oXmrJr6vRhgfKLY7KVkn4nMJae6Ks6b
+g8L/oSU2vC/Z8c5rILrGHo6Y9WFXToUxK79NUIV8NgW2I5JiRyFsv5DT37NWOGSI
+v7M/whMb3fCMkZgLlVJi5CsHYBz4rrqa9bV3+yBy66ojRCnpzfq2C/yEcLXzRxpF
+zeBmUgLh+gq+3lHQaOVs9siK2BzoPlUcFmJSNwCNPx1OdOFlNwxfHlJ8q/LjrUEl
+MhnhxFzBRFdFCj9mlAylDmUWjC16plufbNDbHQUdQcAeND4Y1L8ZaHCMjWVwE2Lz
+uJuY3i5E5A9Czu4v4ROQQABQMA28mc639PwK+x7uqpyHd+NniXJADoMefdJmPw8/
+OCLX3ecVs9Jx/Nu+wHcA9YUjbxCi1YiUjaWpvAUVANgo03uH/eIsQiROvvBugdIX
+5mETYqhhg47bGcM80b5n1OJcWPqdXmpb1haQyrvDolgkl9op6q8jWh60/oEGiXcK
+kjn5h/epEw4kEjASLnNkKqM0kW+SjcSql9mTzHg/soc/U1rcImRLAp2e/ukztqc0
+lEQeF46G5B3DmUDxg5KtQkrGO/S+qGwVIfrcyAv3LRf1/CNfl0NyEcilHOJous1L
+en8mqLgUvC3ETeVQlsG5WFfrMmf+lb/Uy23gC5FHWKHximprafoh0/pKQtKae1nW
+8gjVXiGYPy1Qf2NNfGspJOvB9xSsvAN60LsUSpQefyJ+9BnYOuuUqOxfDLTYLCCx
+VPiqeUT6Ee03Vn9uRYX2gg2ieD62Otvdk7ogDuq6rCoRV0C1ptemY0E9ivDeVNvS
+wMkBFn4Gf/rOxYBI7WxNmoIROqNm2qEc39qerRLOK0i1403vewIUXvWyDy6QsI3C
+ppWKYOZk2zgIJUxDb8igrQ+sUhIRToI+eY9vecVDvo2kjZhyeTj3AbNiw4KT9POY
+4aAMk7XmnyE5tLvf2g5S6atjjcNBOSRpevMrLR169eQPYHW3TvYs/r1FSqDLMG9T
+UUUc/1PfWEtwZ2TIE+ZvNvksEiHtzjQQkeGhNWsbDF94UMu2JrcWxwl8VhoiGdMX
+AvXCbjLeSFBRlp03zKIRRiimIUaCNtBQUJNR7/34Oj077xKk4OhBULDlBwOvUjkg
+DTcPvwhCxFVa61H4PiQKBVJSiTtPHD1tyUJJlDehP1VmJbtI0OjkMEIuRJXLIH+B
+wahnfrGIYVy6QgRyyd1Fytx4+68fj14XRJ/67ee0sf0H8TS8WL4RDzW/1kHsgnBD
+3Go+NZsieQI106RVZc1+xpiBE6hceCejhBJrS0LmVDjKsCug+CRXsK14w1asd6Zf
+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
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_config/neomutt/encrypted_private_alias.rc.asc b/dot_config/neomutt/encrypted_private_alias.rc.asc
new file mode 100644
index 0000000..c6088ba
--- /dev/null
+++ b/dot_config/neomutt/encrypted_private_alias.rc.asc
@@ -0,0 +1,74 @@
+-----BEGIN PGP MESSAGE-----
+
+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
+=rL3g
+-----END PGP MESSAGE-----
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 fdf1554..379312c 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
 
@@ -55,8 +55,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 ...
@@ -77,7 +77,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"
 
@@ -128,19 +128,20 @@ 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'
+# preserve messages-in-composition between restarts in case of a power failure.
+set tmpdir= "$XDG_STATE_HOME/neomutt"
 
 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_config/private_borgmatic/encrypted_private_home.yaml.asc b/dot_config/private_borgmatic/encrypted_private_home.yaml.asc
index 50851de..0ad7237 100644
--- a/dot_config/private_borgmatic/encrypted_private_home.yaml.asc
+++ b/dot_config/private_borgmatic/encrypted_private_home.yaml.asc
@@ -1,39 +1,39 @@
 -----BEGIN PGP MESSAGE-----
 
-hQUMAwAAAAAAAAAAASgAgymMEW5BfjXkS3JzoK7xYEEEjRVTuZdS/XZvIaBtYzW1
-6yuqevlCL5oXt+/TMgm5Zjl5N1/ShymMo+McPYxRnbrBN5ebFGzlR09QKmCEw7FW
-Il2heieqwSuXipPQXDG1K7bzDLUEr/5mWjqzzkzkWIp4WUe/kPfz8tkQkNcbdTaI
-FDlrG0DLUbC7+2Nl7BErYDl1rVPgu9NyGNTFGKK+oB6+J+mS2Dnm+q2q0xeq78Z/
-+agxvrMBfH6pja5tyzFi4PQKGEESRwFepoN2NsjTADZ6LRb/i0reZAUCP3z7414I
-DmjOrry6Prt3biL9PAGI962oNIf/aY+4kR3xbbdD7xnRAtHRTF1eTKVYJUM0Uh1m
-6GIW5xSxP6HgROsyJBTJAr49+/Wk7f4zeFfYnMRkIGrFQIorLJ6rubBsjrVGyO1I
-6RyvdKFsi3vaaRrp51ZX1yoMajqchIH/jnEWCA4Br8z5prCLHAMenn0vqn+Tz7tk
-wU5KW8DbyCxWteJzr08s+rXIA6NAX6uJD14/BVJWHXMSQZQf7sxjCdFCHt/uUY/u
-dcdpuQka/moRKP8RWSt2s0dbzqdHlDb19ZrQcpUbG6LBfKQRPfWmIRHjLhh5t6Tf
-celIMoz0RtRiCqNEfJ2kX9Qg+CU0ZkAV/AqHCj5lbVDcJ+rQbinXTmSl7nlgCUSu
-w/uAZWyv1L5hDXXYqurzZ7hDxIQUnhDEUx2XCjLAxTob7MymlTVEcLJAvJBo4nSx
-wHdvXx5mjdO/1L7xWg2Pa4Bsm2c73aW17VcXTKJfFeM2fol8JXOCo7uAdl5ZkyDY
-3BH9DZiEBH83l60tY8cITaNTIjyl8bgDnlSY0EkeNNqZzh67cGD9c6TjC0RCLPeG
-mMc64Gv2Y1ADQ/3M+sMyyUGjC5wUGg1SOdf1XZL8EgfuEA/m5f0GStlSFioRgJp4
-gQnGZDVT/WH96WsLGZr11PgWasB1D6PYZWhqxYdLTzMLRcFBN1miNAvk8nFle9d5
-W524JtDqWebErdpi5GbTlKotKGO6h0GbG/wCvAAjfuqr0BdGkQbxegpX0r9hgb5V
-QLkYGAfBvcILigGRhI7obDaxI0PaFyiVRtxWecclT0VOnMd6liyt2SLBZzbF1mQi
-wgy3Eld9Iu6+5MduF62wxGVlTVf2sTZJ/FlniR1nWrugkY34euCziWGq0ZoFSrtT
-c/ckXQHF6sAQpeCiSjDaPqUvCH4yHLnsxjv2vkpSCld3bTIoIMdphOOC2P7maHN1
-s8pSXYD8woTr5bvCEcu5cC3sCbdusKXh0CAkxCywkxFtOUmoW3+LB0fPcXIvQ4ak
-IJolvu6p6T8WFDzHHjZ5BGpR7M0ZMkbRMqOllyl5kHikQmp3dKf2exBadl7wjOCc
-TTQoFnVBLXsrv2Xl1iBxt5HswZLwev3zd4JOPkh6TKyh/gASJluVYde8Ng3mMm7s
-c20JIZ3y+32jB2KKf1iTNFBE788KoOiGXlZrpxbwo8tZQNbBSqldwYHdgdvvQKrp
-+MqGRkLM5vHAXJOT1x3FO++ONETK4yWjyrAobtIBJaYVAiNWLJIBNOKm+GLd3DC4
-X1V399YqH7F+eUMVQ+YWi6LlOZOd3RkO4i05iSg8FCCJ76zeEEUpfEYmkD8GQvTh
-hAsKUKqdcQf6twTcpqMgLxuMYTwMzGgLgNVzDdr3fywbTjFY/q6hDlEhuMFDdMjS
-wJ4BdIQ0gRkKR0wnw3meNXNJCBEmX/cFOb07PibSLGRs5THtq0NIlZG0x6e4KVIF
-C1F5hQNg5pvUkNXM6CM4Xr3KbJWCifIQ0Kvpc9SXRx+MU6iUfCL0ZW+SSF7epyoZ
-ilkefXCRJxyLszpaPa40Srb30fa6jH906JGs2hSBu6XQ7v9wMrNn91el4UGllRU2
-1m65a8WCu0qhjsv9Df+B6YEsg4m+50gJ9KbhoVhlnVVMvjMERhsr1GnOw/+YlQdN
-VoTGjPA4MydH0YP/F1xXuJj3ZKmQhUns9XhabaQeSB4BBaKYR9zpWq//hxIERhkS
-Xj7jWF0eQpNvg1V2qS6WTtx+o+JdaX8D4T6HR2RrLL5tTF/LQ2KNOgbAqF6wNox4
-F1oenuAHdezdWXBRAKiAgQrTeKQEMz0F6Ei5HHHbX60dDOv6bmKE/jGGUCn/Ug1K
-KhoNgrhqi7h2qMi0Eulhng==
-=ur1G
+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
+oR8eoV+HE0iucJMTlgII3zs=
+=6vVr
 -----END PGP MESSAGE-----
diff --git a/dot_config/sh/aliases b/dot_config/sh/aliases
new file mode 100644
index 0000000..f96d5d7
--- /dev/null
+++ b/dot_config/sh/aliases
@@ -0,0 +1,49 @@
+alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade'
+
+alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls'
+alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls'
+alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac'
+
+alias mplayer-fb='mplayer -vo fbdev'
+alias links2-fb='links2 -driver fb'
+
+alias itp='reportbug -M -B debian --email rak@debian.org --paranoid -K $GPGKEY wnpp'
+alias gibuild='gbp buildpackage --git-builder="sbuild -sAd u"'
+alias gibuildi='gbp buildpackage --git-ignore-new --git-builder="sbuild -sAd u"'
+alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
+
+alias vi='vim'
+
+alias sm='tmux attach -t mail || tmux -f ${HOME}/.tmux-mail.conf attach -t mail'
+alias sshfw='ssh -oForwardAgent=yes'
+
+alias llocate="locate -d ${XDG_STATE_HOME}/plocate/home.db"
+
+# Alias/custom commands
+#
+# Many of these options don's exist on BSD rm/cp/mkdir/ln/etc.
+#
+# Some are just in case - for 'rm', 'cp' and 'mv' - ask about overwriting or
+# deleting files.
+# Furthermore, be verbose about what each command is performing to be present of
+# what is occuring every time.
+if [[ `uname` = "Linux" ]]; then
+    alias cp="cp -iv"
+    alias mkdir="mkdir -v"
+    alias mv="mv -iv"
+    alias ln="ln -v"
+    # Only delete files on the current file system to avoid removing recursively
+    # from bind mounts.
+    alias rm="rm -iv --one-file-system"
+
+    alias grep="grep --colour=auto"
+
+    alias chown="chown -v"
+    alias chmod="chmod -v"
+    alias ls="ls --classify --color=always" # Add all colours and
+                                            # have fancy symbols for files, etc.
+elif [[ `uname` = "OpenBSD" && -x /usr/local/bin/colorls ]]; then
+    alias ls="colorls -G"
+fi
+
+# vim: set ft=sh:
diff --git a/dot_config/sh/locale b/dot_config/sh/locale
new file mode 100644
index 0000000..f9dda6c
--- /dev/null
+++ b/dot_config/sh/locale
@@ -0,0 +1,10 @@
+if ! export LANG=$(locale -a | grep -E -i "en_CA.UTF-?8"); then
+    if ! export LANG=$(locale -a | grep -E -i "C.UTF-?8"); then
+        export LANG=C
+    fi
+fi
+
+export LC_TIME="en_GB.UTF-8"
+export LC_COLLATE=C                     # force strict lexicographic sorting
+
+# vim: set ft=sh:
diff --git a/dot_config/sh/xdg-base-dirs b/dot_config/sh/xdg-base-dirs
new file mode 100644
index 0000000..18acb96
--- /dev/null
+++ b/dot_config/sh/xdg-base-dirs
@@ -0,0 +1,4 @@
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_STATE_HOME="${HOME}/.local/state"
diff --git a/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service b/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service
deleted file mode 100644
index ef74119..0000000
--- a/dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service
+++ /dev/null
@@ -1 +0,0 @@
-../backup-email@.service