aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@rak.ac>2023-12-20 11:03:47 -0500
committerRyan Kavanagh <rak@rak.ac>2023-12-20 11:03:47 -0500
commitf5b3c563bdbe24796c645ed2845c857b7e9f77ac (patch)
tree0b1a516e0ee93e0339cd0034eb6374b64b5b1320
parentOnly install ~/afs on Linux (diff)
parentSplit out some common shell config options (diff)
Merge remote-tracking branch 'rak-https/master'
-rw-r--r--.chezmoiremove5
-rw-r--r--dot_cache/neomutt/bodies/.keep (renamed from dot_mutt/private_cache/bodies/.keep)0
-rw-r--r--dot_config/neomutt/accounts.rc (renamed from dot_mutt/accounts.rc)16
-rw-r--r--dot_config/neomutt/accounts/9rak.queensu.ca/folders.rc (renamed from dot_mutt/accounts/9rak.queensu.ca/folders.rc)0
-rw-r--r--dot_config/neomutt/accounts/9rak.queensu.ca/format.rc (renamed from dot_mutt/accounts/9rak.queensu.ca/format.rc)0
-rw-r--r--dot_config/neomutt/accounts/9rak.queensu.ca/main.rc (renamed from dot_mutt/accounts/9rak.queensu.ca/main.rc)2
-rw-r--r--dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl (renamed from dot_mutt/accounts/9rak.queensu.ca/private_read.rc.tmpl)2
-rw-r--r--dot_config/neomutt/accounts/9rak.queensu.ca/send.rc (renamed from dot_mutt/accounts/9rak.queensu.ca/send.rc)2
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/encrypted_alias.rc.asc34
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/folders.rc (renamed from dot_mutt/accounts/kavanagh.ryan.uqam.ca/folders.rc)0
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl (renamed from dot_mutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl)0
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/main.rc (renamed from dot_mutt/accounts/kavanagh.ryan.uqam.ca/main.rc)4
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc8
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc14
-rw-r--r--dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/signature4
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc (renamed from dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc)0
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/folders.rc (renamed from dot_mutt/accounts/rak.rak.ac/folders.rc)0
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/format.rc (renamed from dot_mutt/accounts/rak.rak.ac/format.rc)0
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/main.rc (renamed from dot_mutt/accounts/rak.rak.ac/main.rc)2
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/private_read.rc.tmpl (renamed from dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl)0
-rw-r--r--dot_config/neomutt/accounts/rak.rak.ac/send.rc (renamed from dot_mutt/accounts/rak.rak.ac/send.rc)0
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc)0
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/folders.rc (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/folders.rc)0
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/format.rc (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/format.rc)0
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/main.rc (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/main.rc)2
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl)0
-rw-r--r--dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/send.rc (renamed from dot_mutt/accounts/rkavanag.alumni.cmu.edu/send.rc)0
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc40
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc (renamed from dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/folders.rc)2
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc (renamed from dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/format.rc)0
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc (renamed from dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc)2
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc (renamed from dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/read.rc)2
-rw-r--r--dot_config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc (renamed from dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/send.rc)0
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc (renamed from dot_mutt/accounts/ryanakca.gmail.com/encrypted_private_savehooks.rc.asc)0
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/folders.rc (renamed from dot_mutt/accounts/ryanakca.gmail.com/folders.rc)0
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/format.rc (renamed from dot_mutt/accounts/ryanakca.gmail.com/format.rc)0
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/main.rc (renamed from dot_mutt/accounts/ryanakca.gmail.com/main.rc)2
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl (renamed from dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl)0
-rw-r--r--dot_config/neomutt/accounts/ryanakca.gmail.com/send.rc (renamed from dot_mutt/accounts/ryanakca.gmail.com/send.rc)0
-rw-r--r--dot_config/neomutt/color.rc (renamed from dot_mutt/color.rc)0
-rw-r--r--dot_config/neomutt/encrypted_private_alias.rc.asc74
-rw-r--r--dot_config/neomutt/gpg.rc (renamed from dot_mutt/gpg.rc)0
-rw-r--r--dot_config/neomutt/mailinglists.rc (renamed from dot_mutt/mailinglists.rc)0
-rw-r--r--dot_config/neomutt/neomuttrc.tmpl (renamed from dot_muttrc.tmpl)27
-rw-r--r--dot_config/neomutt/news.rc (renamed from dot_mutt/news.rc)2
-rw-r--r--dot_config/neomutt/score.rc (renamed from dot_mutt/score.rc)2
-rw-r--r--dot_config/private_borgmatic/encrypted_private_home.yaml.asc72
-rw-r--r--dot_config/sh/aliases49
-rw-r--r--dot_config/sh/locale10
-rw-r--r--dot_config/sh/xdg-base-dirs4
-rw-r--r--dot_config/systemd/user/borgmatic@tosh.service.wants/symlink_backup-email@mail.cs.mcgill.ca.service1
-rw-r--r--dot_emacs.tmpl2
-rw-r--r--dot_kshrc6
-rw-r--r--dot_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc8
-rw-r--r--dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc10
-rw-r--r--dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/encrypted_alias.rc.asc40
-rw-r--r--dot_mutt/encrypted_private_alias.rc.asc74
-rw-r--r--dot_vimrc2
-rw-r--r--dot_xkb/symbols/icd6
-rw-r--r--dot_zshrc.tmpl60
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/asteria/certs/rak.pub2
-rw-r--r--private_dot_ssh/private_keys/demeter/certs/eos.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/demeter/certs/hades.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/demeter/certs/rak.pub2
-rw-r--r--private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub1
-rw-r--r--private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub1
-rw-r--r--private_dot_ssh/private_keys/koios/certs/rak.pub1
-rw-r--r--private_dot_ssh/private_keys/zeta/certs/eos.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/zeta/certs/hades.rak.ac.pub2
-rw-r--r--private_dot_ssh/private_keys/zeta/certs/rak.pub2
72 files changed, 337 insertions, 276 deletions
diff --git a/.chezmoiremove b/.chezmoiremove
index 4873f59..98661e1 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -1,10 +1,9 @@
.gnupg/dirmngr.conf
.lbdbrc
-.mutt/accounts/ryank.mail.cs.mcgill.ca/
-.mutt/accounts/ryan.kavanagh.mcgill.ca/
-.mutt/savehooks.rc
+.mutt*
.pulse
.screenlayout/zeta-home.sh
.screenlayout/zeta-solo.sh
.screenlayout/zeta-work.sh
bin/mutt
+.config/systemd/user/borgmatic@tosh.service.wants/backup-email@mail.cs.mcgill.ca.service
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_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
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-----
-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
-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
diff --git a/dot_emacs.tmpl b/dot_emacs.tmpl
index 0a2669c..861a522 100644
--- a/dot_emacs.tmpl
+++ b/dot_emacs.tmpl
@@ -528,6 +528,8 @@ Otherwise split the current paragraph into one sentence per line."
:init
(autoload 'markdown-mode "markdown-mode"
"Major mode for editing Markdown files" t)
+ :hook ((markdown-mode . (lambda ()
+ (setq-default indent-tabs-mode -1))))
:mode (("\\.markdown\\'" . markdown-mode)
("\\.mdown\'" . markdown-mode)))
diff --git a/dot_kshrc b/dot_kshrc
index 3acab9c..6a1ce8d 100644
--- a/dot_kshrc
+++ b/dot_kshrc
@@ -1,11 +1,15 @@
[ -f /etc/ksh.kshrc ] && . /etc/ksh.kshrc || true
-export PPROMPT='<$USER@$HOST:$PWD:!>'"$PS1S"
+export PPROMPT='<$USER@$HOST:$PWD:!> '"$PS1S"
export PS1=$PPROMPT
export HISTFILE="$HOME/.ksh_history"
export HISTSIZE=5000
+for common in ${HOME}/.config/sh/*; do
+ [ -f "${common}" ] && . "${common}"
+done
+
export VISUAL="vim"
export EDITOR="$VISUAL"
set -o emacs
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc
deleted file mode 100644
index df5409d..0000000
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/read.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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_passive = 'no'
-set imap_user = 'kavanagh.ryan@uqam.ca'
-
-unset imap_pass
diff --git a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc
deleted file mode 100644
index fefcc79..0000000
--- a/dot_mutt/accounts/kavanagh.ryan.uqam.ca/send.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim: syntax=muttrc
-
-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_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/'
-
-unset sendmail
-unset smtp_pass
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-----
diff --git a/dot_vimrc b/dot_vimrc
index 9586033..79a9faf 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -24,5 +24,5 @@ set textwidth=80
set pastetoggle=<F10>
-au BufEnter ~/.mutt/tmp/* set textwidth=72 | set list lcs=trail:-,nbsp:%
+au BufEnter ~/.local/state/neomutt/* set textwidth=72 | set list lcs=trail:-,nbsp:%
au BufEnter */gophermap set list lcs=trail:-,nbsp:%,tab:»·,space:·
diff --git a/dot_xkb/symbols/icd b/dot_xkb/symbols/icd
index 9ace6b7..2c733a2 100644
--- a/dot_xkb/symbols/icd
+++ b/dot_xkb/symbols/icd
@@ -17,8 +17,8 @@
//
// TAB : < > P Y F G C R L ? ^ |
// TAB ; , . p y f g c r l / @ \
-// TAB ä « » ü í ç þ ¿ dˆ d'
-// TAB Ä ° · Ü Í Ç Þ dˇ d.
+// TAB ë « » ü í ç þ ¿ dˆ d'
+// TAB Ë ° · Ü Í Ç Þ dˇ d.
//
// CAPL A O E U I D H T N S _ ENTER
// CAPL a o e u i d h t n s - ENTER
@@ -64,7 +64,7 @@ xkb_symbols "icd" {
key <BKSP> { [ BackSpace ] };
// upper row, left side
- key <AD01> { [ semicolon, colon, adiaeresis, Adiaeresis ] };
+ key <AD01> { [ semicolon, colon, ediaeresis, Ediaeresis ] };
key <AD02> { [ comma, less, guillemotleft, degree ] };
key <AD03> { [ period, greater, guillemotright, periodcentered ] };
key <AD04> { [ p, P, udiaeresis, Udiaeresis ] };
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index c0b1669..62fef86 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -32,13 +32,6 @@
# BEGIN LOCAL
-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
export TIME_STYLE=long-iso # make ls -l use YYYY-MM-DD in dired
export TZ="America/Toronto" # Force our time zone this location.
export EDITOR="vim" # Long live vim (as our editor).
@@ -61,7 +54,10 @@ export BROWSER=firefox
export TEXMFHOME=${HOME}/.texmf
export KRB5CCNAME=DIR:${HOME}/.cache/krb5cc # kerberos credentials cache
export GOPATH=${HOME}/.go
-export XDG_STATE_HOME="${HOME}/.local/state"
+
+for common in ${HOME}/.config/sh/*; do
+ [ -f "${common}" ] && . "${common}"
+done
export PATH=/usr/sbin:/sbin:${PATH}
case `uname` in
@@ -78,27 +74,6 @@ case `uname` in
esac
export PATH=${HOME}/bin:${PATH}
-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"
-
# END LOCAL
. ${HOME}/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
@@ -119,33 +94,6 @@ elif [[ ! -f $HOME/.zsh/powerlevel10k/gitstatus/gitstatusd ]]; then
POWERLEVEL9K_DISABLE_GITSTATUS=true
fi
-# 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
-
# Colours.
autoload -U colors; colors
diff --git a/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub
index 9e232b5..91af80a 100644
--- a/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub
+++ b/private_dot_ssh/private_keys/asteria/certs/eos.rak.ac.pub
@@ -1 +1 @@
-ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIEXOcqgtSdaETLByfNaUyZfyyi3JY9CAvJxFoQWjgfqcAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtNTktMTNUMjM6MDY6MTdaX3JhawAAAAcAAAADcmFrAAAAAGSHsVUAAAAAZXjz1QAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAU+0IUcJ9TNCAKQGEKAU7oly6sUQxvzdMa+kcXkKY0ioRICIfoqLE5XMSW4YRtClUFDv/1mWn8T4JQHEsD2pZ/CiElBqlfQPifQBroqJghFA3BrCPrsbW4Wum92kqCgi0c2wXQdKGzuHzV/EYM2rxTyBR94kZeG4iosW70uRuItJdJwjVJJrgZUCgTCjyPI7UkMte5OmrsC21c0PYpRUvRwU+FyRh+wXVw03ssq0K6fLH0U1MoK+/9OoDoCik1WjGDdD3Nsed9K3YhARaU03bc/MGxeJCRnGpbtI4zpKWWCHPhT1uGLbOOln1BhO6n2J4vX4rlaoCjui4NRCSmuEq9g== rak@asteria
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIBQl5BPrpl4fCmHLGUS/SZ7WhQ3i1zXzv8MK4OkopNafAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtMjctMTNUMDE6MTI6MTlaX3JhawAAAAcAAAADcmFrAAAAAGV3tvcAAAAAZmj5dwAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAoDhP6QXUDmVLMJfKv79Hl0C1O5A5BNvETk7O0POZF9e/djtovxnzQis5xeLSO8MmvYdNawyLlm/V6zYdPjw7FTLzSVfvb9m5PnB1DPRl2SMeXJHtCnAuDg0Y1EkLG07K/ENPjUBZEejfvP8cCCvjGcebUfZ/Lu2OcsaKHvQD9uoj/tfpTK2ihHcUAoJ29Oq9Hw2nPhMdBfklTFPmIPtSB6Lo2Vi5t6kubu1Ep6ytllgO0qQTWmdQWT9YAAZu2RCcc5MXveD/GlZFRvKh5PxafQaf5G+l93tUYmFTSyZIOfQ3U13wfjcqlAbJ5TeYkCLU/5jcj6SflfGdmlMEG7enCw== rak@asteria
diff --git a/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub
index f4a3a2c..78b2f7f 100644
--- a/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub
+++ b/private_dot_ssh/private_keys/asteria/certs/hades.rak.ac.pub
@@ -1 +1 @@
-ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIFNeaD7T/b6V1nDJ+uglnF3ckN6099293DB1hwrDbBszAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtNTktMTNUMjM6MDY6MjBaX3JhawAAAAcAAAADcmFrAAAAAGSHsVgAAAAAZXjz2AAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYAUbUW52/s5UJVT53J29IyI4fmsLpYfWen2wnsFPjZQLC1izwFLi43GByoGmnkxEFT8DKvvBbtGIoC0d+ESP2r6w6EVgE1/TYq/noXFZGP5EcK1TGao0Q7Cssnqy6ZOoq08E2bFEQBeaMHwNMD2lNOBU/hW/8MPC94mJfc7rmPmJzVaYjiMdGR8JtIviD5NNTYObZvEN8ZiUVSa1zKIl23b2s5I6AZEAq43zZw9xu9N/Vz69GmGM+PerNKkiQ5AAdtuxdJKiASohTo0N3GOyBbKKTrgAR1OMpEFnC/4eln+C4vWFInsR5gs4HVojOIStsrCtXeZj1bp+T9ammhvanuh1kcNZsOxjXpXa46KiTvJfG9wVcWxOARW+pFOZUt2Bm9tc2+Iur+XccMIlWKD1/GA1uzdx+ZGIpvD4vs52CLfeXwDpxiXls6ojPH5KSY3Gof9ncQVcKDJtKF/uAf1p7Zw8LBbYh5O+LyMGyIToy88m0jesCZN/6rP4WvbIg/UFTc= rak@asteria
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIEtkdCqKBEQc7Zl7frxJYmGvzZufm6QS/4U27G4b3ZTSAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtMjctMTNUMDE6MTI6MjJaX3JhawAAAAcAAAADcmFrAAAAAGV3tvoAAAAAZmj5egAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYB/oeuLJyoo7hmHZkNT/Wi33rlEc3L5Uup9XfrscqtYBjSM17TZYbPIxH23o+6b31xZpIgM98F3emZ+JuN1oNldhWJInl/0ijacvTovUsGvQv9a+h0S23QWDd3JyIe2v0/q0D5HWCvMky09JGOPkllx21JIV53CyoOutE+Lg9rH3eG4VpXH6/9H1CaEc8fO+U+SR5igezUSDGNFUWgznj51wTtV88x9714ji/i+Nr6TwaL0ZXyN2XJ799jOD/wqXqaku6VpzQ0RYUGoGOHC5K9VcR6jxX61OMyYGm+XcbH9VJMKyNu7uE5BomuNVVQEPGf8OC3WTJedAfLlCBfyUia9RDfbjQ8CNLLrYYwYQ07+Xz2XrbwFNlqpYdl4pKYHALQLIKydgy82++twCrmDCuYAUpXpVv13eV1fVWKwBCejiOiFSJnF7SI1QRwr8vaexFlrXEqO5doZkVCJNpHLwBAZ/Nc7JjGcoRQkV5lMViFHB3STQwV9WT0eOjSul2mx9WE= rak@asteria
diff --git a/private_dot_ssh/private_keys/asteria/certs/rak.pub b/private_dot_ssh/private_keys/asteria/certs/rak.pub
index 178d057..4df2e7c 100644
--- a/private_dot_ssh/private_keys/asteria/certs/rak.pub
+++ b/private_dot_ssh/private_keys/asteria/certs/rak.pub
@@ -1 +1 @@
-ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIIX2ek3GZzTjgIoYK1lKRp6wr7GhPQdg8h5rDBu2Gd9WAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtNTktMTNUMjM6MDY6MjBaX3JhawAAAAcAAAADcmFrAAAAAGSHsVgAAAAAZXjz2AAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAEBrKQgKcRTryIm1fFm2JVZKF2nQPcaHi0RUXH360ytvyCQEPZLkTGhiDySod5QCrSG0HpuHavP1V7DwAAyPq2QD rak@asteria
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIPywWJtobkqRiXs55rSwv5j2OTOLo7DFDq+RJp9NCLLHAAAAIAaAqrBZRKRRelxr68ZzxT5Oq1c3BXhS6vZKypPBeaK8AAAAAAAAAAAAAAABAAAAGDIwMjMtMjctMTNUMDE6MTI6MjJaX3JhawAAAAcAAAADcmFrAAAAAGV3tvoAAAAAZmj5egAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDi7Ko/XccZVe8h4Yy479MvOuo2VyinpvmDt+KAyW5XtOf4X6qFUGIP+w/cXOQJpTc/XaDg5LxnEAPBdPwtRbgH rak@asteria
diff --git a/private_dot_ssh/private_keys/demeter/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/demeter/certs/eos.rak.ac.pub
index 116c550..0a4b0c2 100644
--- a/private_dot_ssh/private_keys/demeter/certs/eos.rak.ac.pub
+++ b/private_dot_ssh/private_keys/demeter/certs/eos.rak.ac.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com 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 rak@demeter.rak.ac
+ssh-rsa-cert-v01@openssh.com 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 rak@demeter.rak.ac
diff --git a/private_dot_ssh/private_keys/demeter/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/demeter/certs/hades.rak.ac.pub
index 7f1dffe..3ab183d 100644
--- a/private_dot_ssh/private_keys/demeter/certs/hades.rak.ac.pub
+++ b/private_dot_ssh/private_keys/demeter/certs/hades.rak.ac.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com 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 rak@demeter.rak.ac
+ssh-rsa-cert-v01@openssh.com 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 rak@demeter.rak.ac
diff --git a/private_dot_ssh/private_keys/demeter/certs/rak.pub b/private_dot_ssh/private_keys/demeter/certs/rak.pub
index b25fc0b..80296cb 100644
--- a/private_dot_ssh/private_keys/demeter/certs/rak.pub
+++ b/private_dot_ssh/private_keys/demeter/certs/rak.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgJM4oEa3018S+bdDGkF+mWjFdUjfPE34I0MCDq3PksScAAAADAQABAAAD9AxLw9W5prc8OAFN0X0z7pXheII9HdtHzvkINW+Wl15H2qu4Z2Pr9x8P1fElD6D3Uafr2CIP6s9DrYT6BPNeXC2aKMZx+r46dWBVRvn2DvKYcG9sxW9au3RwFPhHIguHWAovN4MYHD4/Qqhc9km4nNHSKV7YZQFqDUEiUUzIJCQXXIIyUUFS80xGxbr5FuidqegX4+yA2bgWy0LrQ38m1lMBPQj8JEk2HT4RssznYdF0Hy6Y0WnhZDGxkNs58ybXchEPCPLaf4pAwAG1ZRNuFDwJPmvv4bG0Nl7Qn5yI94tiYcYmfLq/ZKBaZnoWJdnWdHB+UrXehDaW3ch8R1MdvEKbgamjxReXXrzy+dpMs84Crdzc6YE9gU0g3n8R2CVbu0VRYIPWZVvbN0wE4CnZW0MPMJCx7s8HSG2W1xee6suS+rohMQlZ0Dz0f5/3YL5qay+0P26wE002kTVMqSdkif7G3EzUwyFvQTj72TZR4ExLOkLDSjZ1FMa3TOc+jEDWWmBvOXFGN/Ksyc9OqsDHNulNslBmn7oYIncCy/3e3/u2chBozSsVcUxsHjAiBcrZvryQoDz9ZzjxInIbMmFk1bJo/68Y0d/CIaJSj/8xwot7c3wqoMN4Z158KjFG/X4AsQcqvfAP0GC9PG/EioUVjv2n4ppZ2+pUctmO0nrsbumbhZz2IYF0HCziIeHcGjUCcmYoeZlwxaAqjStErBGbfeie3sEmi2f+qsjeGHXg3XMeqh5HrHkwqFuDZUq7PKIhUyM1DUhisraGc7Xlr2OnRny8MqZN1Rz6gwvwq/7JCDjqKxbRS4FpbjUuIrm07t8aYiOHRhurllT5Pi6VJ0PmUIeidGy8db7yERK21O/qu1iXg8anSgcKKKhDx1eZUx12FiYuWEChzeyzScdbXI+NqVaiidb3pHEEIfeii6A2EukTOWzdVSg2ZKqY3m+nGSyIeTONWW9MECwsFZrppqz2uMeioIg1BWS8KfOOCorRaRxUhi+3f3ctlqBNM0SFFU7ZC0Jgx+G5mY40MaXuu9Jo4y9CEjqmfyp2McaXHVztvccd/b9cw5a20mPap8VEjDU9BY7qp5Yk8rTMFAFPpRNg6RGPUJksvyX2Vo4ru8Uq0s42+LEWCstSH8aatANWmauIIicqqylGLKc6Qvh/eP4MsCQsNQ4rVpB7jOoAV3LrVguUbwqxpryfLfxmOmLcWgV6mHU9j/+aaSKPdwMpdFOefu7wy1Ol8mVzoNkS2nFmPTjuYlNiiCKh/np/wdrHK5XJidEHOlychL6kIztLSW9AnJo51wrfwgRruoiF4P8Q+od/WIU9ma1q9GRYDaQxC+c8ySTEOdkAAAAAAAAAAAAAAAEAAAAYMjAyMy01OS0xM1QyMzowNjoxNVpfcmFrAAAABwAAAANyYWsAAAAAZIexUwAAAABlePPTAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAg6A5Xlq1VB9ukVDZHXCRQ/LbKgLHOWhUxPBRTqPtHi/cAAABTAAAAC3NzaC1lZDI1NTE5AAAAQC51QkZcteuI9lRLj172fiwP93tW6YyTmMjJbUYtbPLAF6IsmcW3scVRpAtdlltnLKjHqNW3FNLbjeQItZkZbwE= rak@demeter.rak.ac
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgDbkYOIX8TdKjeuqLysj4uW8lgR9MlccZuY2QTe2Tz6oAAAADAQABAAAD9AxLw9W5prc8OAFN0X0z7pXheII9HdtHzvkINW+Wl15H2qu4Z2Pr9x8P1fElD6D3Uafr2CIP6s9DrYT6BPNeXC2aKMZx+r46dWBVRvn2DvKYcG9sxW9au3RwFPhHIguHWAovN4MYHD4/Qqhc9km4nNHSKV7YZQFqDUEiUUzIJCQXXIIyUUFS80xGxbr5FuidqegX4+yA2bgWy0LrQ38m1lMBPQj8JEk2HT4RssznYdF0Hy6Y0WnhZDGxkNs58ybXchEPCPLaf4pAwAG1ZRNuFDwJPmvv4bG0Nl7Qn5yI94tiYcYmfLq/ZKBaZnoWJdnWdHB+UrXehDaW3ch8R1MdvEKbgamjxReXXrzy+dpMs84Crdzc6YE9gU0g3n8R2CVbu0VRYIPWZVvbN0wE4CnZW0MPMJCx7s8HSG2W1xee6suS+rohMQlZ0Dz0f5/3YL5qay+0P26wE002kTVMqSdkif7G3EzUwyFvQTj72TZR4ExLOkLDSjZ1FMa3TOc+jEDWWmBvOXFGN/Ksyc9OqsDHNulNslBmn7oYIncCy/3e3/u2chBozSsVcUxsHjAiBcrZvryQoDz9ZzjxInIbMmFk1bJo/68Y0d/CIaJSj/8xwot7c3wqoMN4Z158KjFG/X4AsQcqvfAP0GC9PG/EioUVjv2n4ppZ2+pUctmO0nrsbumbhZz2IYF0HCziIeHcGjUCcmYoeZlwxaAqjStErBGbfeie3sEmi2f+qsjeGHXg3XMeqh5HrHkwqFuDZUq7PKIhUyM1DUhisraGc7Xlr2OnRny8MqZN1Rz6gwvwq/7JCDjqKxbRS4FpbjUuIrm07t8aYiOHRhurllT5Pi6VJ0PmUIeidGy8db7yERK21O/qu1iXg8anSgcKKKhDx1eZUx12FiYuWEChzeyzScdbXI+NqVaiidb3pHEEIfeii6A2EukTOWzdVSg2ZKqY3m+nGSyIeTONWW9MECwsFZrppqz2uMeioIg1BWS8KfOOCorRaRxUhi+3f3ctlqBNM0SFFU7ZC0Jgx+G5mY40MaXuu9Jo4y9CEjqmfyp2McaXHVztvccd/b9cw5a20mPap8VEjDU9BY7qp5Yk8rTMFAFPpRNg6RGPUJksvyX2Vo4ru8Uq0s42+LEWCstSH8aatANWmauIIicqqylGLKc6Qvh/eP4MsCQsNQ4rVpB7jOoAV3LrVguUbwqxpryfLfxmOmLcWgV6mHU9j/+aaSKPdwMpdFOefu7wy1Ol8mVzoNkS2nFmPTjuYlNiiCKh/np/wdrHK5XJidEHOlychL6kIztLSW9AnJo51wrfwgRruoiF4P8Q+od/WIU9ma1q9GRYDaQxC+c8ySTEOdkAAAAAAAAAAAAAAAEAAAAYMjAyMy0yNy0xM1QwMToxMjoxNlpfcmFrAAAABwAAAANyYWsAAAAAZXe29AAAAABmaPl0AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAg6A5Xlq1VB9ukVDZHXCRQ/LbKgLHOWhUxPBRTqPtHi/cAAABTAAAAC3NzaC1lZDI1NTE5AAAAQEdbrJ6DCHl3+qWfEASDIbU6KIBRcX0BtMS2qf4y67kPJDIY7fh26q/6JsIO59ewqWRTj9EAZG3yuHt3O2mnswg= rak@demeter.rak.ac
diff --git a/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub
new file mode 100644
index 0000000..ebe98aa
--- /dev/null
+++ b/private_dot_ssh/private_keys/koios/certs/eos.rak.ac.pub
@@ -0,0 +1 @@
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIBLyCEFhnmHkgDD/ynY7B/1HPAzx8ATkXIXPGiJi63NuAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjMtMjgtMjBUMTU6MTI6NTBaX3JhawAAAAcAAAADcmFrAAAAAGWBtrIAAAAAZnL5MgAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDKJT7R6NhBLkxybSA+ZuM6HpW51nb9j7VFSBm3sMiCCLLg/9kb3AFRYV1a2ZwqPGu6Nm88WXGocF9HaSOfSg8bxyZRsDRqswCG2/VM+pwP1jzWkww8ag4ETuif+VpN7zqZoGi+0YnyC+7CBG/CpIFZ7veA5vVnqzXjxp1SK85YtkaTFJicY+zKZTcIbW8t82D0qrRlHrCztq4KV9CdD5itV3Dh1j0FC9l2X1BoZ8PUYzD7axds0+tmo+H/F+MyQoqqdeq+obAWpEqIkh9JtVLlkHukHgIl/HMhs5twm/zXU5iFJUlscfz7vSmjgobUZB5CY+rZn/M5OiWO9/1M43AvAAABFAAAAAxyc2Etc2hhMi01MTIAAAEAVgm2JNPVujrML7uhQVYH6JEDniKbwO66A5nX4iMC/OhDv4hpYIfxW3KGEZMzBBAXwNKtr+8TyX2S5o+f+mIy2Vi1yebMXR1el0FFC46eCrm8tN5ggZCTcArru/yMxR8OcUQjaRnAxtLpz8hCnZZMZktcsOE+6KcE0NthaOoALAqSfO7f+Lce6atzPlggeCQLEjQHXpJtPdMl5KIXhhQ2oq8fBTrrq9IXvBbHN8sW4VEVCKHcze52CkF8cfYNaezglWK3dDBsgxKjn+zu3AJALlHCTwzqx7ikj0Unv+/HxvY0CAu0AJmsSXdSPr6XSeoK13lVJuzsashBQufGaUQfsA== rak@koios.rak.ac
diff --git a/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub
new file mode 100644
index 0000000..237cbe3
--- /dev/null
+++ b/private_dot_ssh/private_keys/koios/certs/hades.rak.ac.pub
@@ -0,0 +1 @@
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIAMv3SUvhRNF5Sj4lQNKoX5ldaOFo+seyxFi2m+CQEAXAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjMtMjgtMjBUMTU6MTI6NTNaX3JhawAAAAcAAAADcmFrAAAAAGWBtrUAAAAAZnL5NQAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCfdeufiJSL4Vbxb11zdbPdEMRt57oAYBILSZpABX7qi2qB7SBTpX0NurliWKHOsJ9WXjqWbqVp9VmXAehuEb+26kLA6LpFlOwJMrO2cF5UH26oq7p2MyQVFuzKpv9rfPrMEXhN7T+pRotU323eJLcxWYrJX68Ai2u9KudgN8wcGebsIwKcn8qPdPfb08CcgQzwaknX5uiiVhqNp7784ZnZ0Q2zvQi13SGWYfZbrO/ufi6X1c9+qtRW7izAvGttTZJNwrIFePWkQQygmtb2oZ1HOD6J+WK91GHwQHPSRfvNoT87XOGrVf8mYnbbCoEVxmpPZ5F1r4tvvc1HbCFydIJAkaPsM9r5oYsEIvHqpQxBo5m3HXj9DDVLktWNYB1ZfiiM6qvz44eDz4IBoou9IUHUNcX+37LuTBgtrJX0GaptpBQwmLGmKX2F6jj0CMIV9Ir+ztjGcEctnEXDF37ApiLioRt8r1yUylAvYaKmePSwqzQZscTvCIv4ralNaAFRBb0AAAGUAAAADHJzYS1zaGEyLTUxMgAAAYCV3GL0WszuKGAPyO0aSVT/x0zQiFjS/3COfK/0vSy8uW8Zc03phmMw65tJYgIgCq14hCkgHDBdWa8+6JZbhogcMBsqsKkVt524qsXQ/N2fVkWj/XhQJ8nZHmF8ZiX+KgIdNcYWav5E3Er+JPzdMJDDp0L+lYwsUGU3meCD1nwrzus2CL0Xoy6+aTkzZghDW9McznOV3K/9uX3iiGia6lk6sxHjpBddqXvzhvnQ5z9DR+z2vCmY0uKQyfAv+V+eL9WUTTxDxHDrjExgMydL8LN7yUj0TWd2WA5rQQ4O4VKmGpvBiaXn3Tm1FspSP6U7zqWJrQClpUHXib6VbfNkB2wLeQZHo/Krx/gJLvs4rhVvOwVlMnHSRFYtc5x1TJLeFZSAeRNnwAIP4gISSS07XWb/kKlisuylFJfuEun7XAFIUrAhY5AF/hYfg5UB8T/vzAa+NxsMKXZ/4d4S1WzkIqj8OJiOh/Jz0iESH7ZFPB4XG7fFlOtjClGVcpsX65EZu/E= rak@koios.rak.ac
diff --git a/private_dot_ssh/private_keys/koios/certs/rak.pub b/private_dot_ssh/private_keys/koios/certs/rak.pub
new file mode 100644
index 0000000..33b7f30
--- /dev/null
+++ b/private_dot_ssh/private_keys/koios/certs/rak.pub
@@ -0,0 +1 @@
+ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIJ8NtOrcF8//UrZAXC+7JXnUUYl+XpZsTSPJfwO609UsAAAAIF3200rIEC9Ly9LTxuhkPxorNOrqR5LuaO5R55AmoZ4aAAAAAAAAAAAAAAABAAAAGDIwMjMtMjgtMjBUMTU6MTI6NTNaX3JhawAAAAcAAAADcmFrAAAAAGWBtrUAAAAAZnL5NQAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3AAAAUwAAAAtzc2gtZWQyNTUxOQAAAECnwZ0FMxJZkPABbvoqTVs9B/DzaAGdA7XGFuL+yJMLK5/eK13JTnGy5uFQu8wyC1DeHeJN/AEQj4j6hRvUrAcN rak@koios.rak.ac
diff --git a/private_dot_ssh/private_keys/zeta/certs/eos.rak.ac.pub b/private_dot_ssh/private_keys/zeta/certs/eos.rak.ac.pub
index 418a87b..3b92bf3 100644
--- a/private_dot_ssh/private_keys/zeta/certs/eos.rak.ac.pub
+++ b/private_dot_ssh/private_keys/zeta/certs/eos.rak.ac.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgztP9j5JWPhUY6d16P3WXK8MMXktM+tK5/cpBPCm4EX4AAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy01OS0xM1QyMzowNjoyM1pfcmFrAAAABwAAAANyYWsAAAAAZIexWwAAAABlePPbAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAARcAAAAHc3NoLXJzYQAAAAMBAAEAAAEBAMolPtHo2EEuTHJtID5m4zoelbnWdv2PtUVIGbewyIIIsuD/2RvcAVFhXVrZnCo8a7o2bzxZcahwX0dpI59KDxvHJlGwNGqzAIbb9Uz6nA/WPNaTDDxqDgRO6J/5Wk3vOpmgaL7RifIL7sIEb8KkgVnu94Dm9WerNePGnVIrzli2RpMUmJxj7MplNwhtby3zYPSqtGUesLO2rgpX0J0PmK1XcOHWPQUL2XZfUGhnw9RjMPtrF2zT62aj4f8X4zJCiqp16r6hsBakSoiSH0m1UuWQe6QeAiX8cyGzm3Cb/NdTmIUlSWxx/Pu9KaOChtRkHkJj6tmf8zk6JY73/UzjcC8AAAEUAAAADHJzYS1zaGEyLTUxMgAAAQBpy266YlfDqQRYkQYEJmFj3xoUe6YRafrCppOLR/3uzDhTrehjOVkCr5qIlXEDh1gtSY0uye4QTRKlN5E1wcnK07r6z1F6azqXgqqqHp/I8xLRmPe1RVoCyNXN+DYFtCfi1z/rCZNHSBfKfmFiSf05/5e87IjP1OgrXuao5tb9+r7h8GIVN4bhVeaXsh8f45Cq35I5ujChxlq3vziILY0zH68AXAQGqCrCdATPzc9oER7qx5Ugc6Rqyqilch+JBpyo/p+RNQI5V3PauyfcCyltwOVM7jxSlJhlNgKyQ4DzeHFSvk9q9WQZOehRznzhRAccnpwOvv5elYWiNW84UTsS rak@zeta.rak.ac
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgYZRdJMnIN4DCwJKuyihuqrTHtlWyBTUfc9MuiYGv8TYAAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy0yNy0xM1QwMToxMjoyNVpfcmFrAAAABwAAAANyYWsAAAAAZXe2/QAAAABmaPl9AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAARcAAAAHc3NoLXJzYQAAAAMBAAEAAAEBAMolPtHo2EEuTHJtID5m4zoelbnWdv2PtUVIGbewyIIIsuD/2RvcAVFhXVrZnCo8a7o2bzxZcahwX0dpI59KDxvHJlGwNGqzAIbb9Uz6nA/WPNaTDDxqDgRO6J/5Wk3vOpmgaL7RifIL7sIEb8KkgVnu94Dm9WerNePGnVIrzli2RpMUmJxj7MplNwhtby3zYPSqtGUesLO2rgpX0J0PmK1XcOHWPQUL2XZfUGhnw9RjMPtrF2zT62aj4f8X4zJCiqp16r6hsBakSoiSH0m1UuWQe6QeAiX8cyGzm3Cb/NdTmIUlSWxx/Pu9KaOChtRkHkJj6tmf8zk6JY73/UzjcC8AAAEUAAAADHJzYS1zaGEyLTUxMgAAAQCh8Ftjqjrobtotvgxq+eyxBkrwDTTuTiz5a2nDAEeQI93zObXLiu6jEwRF8PyGGoWCZhxmzmX5mnVIfEdDEj6TjKvJdBgVleapkm/smFS21rDl1ZLKdv28jws8QSOdvlNsAXH2xZ/J3+LwpNcRtuIL+vFPhy2e6F9+zdyO1Ki5VjOeNs9KXZlSzRfpxgPrM/CgGKMMVYCANASBKk2uB7tQj19LBs3kmHXVb+YgOdXZtP0BGJhyXk4GIi8paFGVQErtrmu+VZm5E1B6/lEh+Id0CARc0fjeFetIz6bCrRjScqI5Qiv6NlEmg0rMWnuJmBQS3oWLKdjxAESdn9n/CwLe rak@zeta.rak.ac
diff --git a/private_dot_ssh/private_keys/zeta/certs/hades.rak.ac.pub b/private_dot_ssh/private_keys/zeta/certs/hades.rak.ac.pub
index 6cecbcb..a5b9cc5 100644
--- a/private_dot_ssh/private_keys/zeta/certs/hades.rak.ac.pub
+++ b/private_dot_ssh/private_keys/zeta/certs/hades.rak.ac.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgDMjsjBx+eLPnE6SCtO+Skhe8aZPWG2nXoilm0hcUe4IAAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy01OS0xM1QyMzowNjoyNlpfcmFrAAAABwAAAANyYWsAAAAAZIexXgAAAABlePPeAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBAJ9165+IlIvhVvFvXXN1s90QxG3nugBgEgtJmkAFfuqLaoHtIFOlfQ26uWJYoc6wn1ZeOpZupWn1WZcB6G4Rv7bqQsDoukWU7Akys7ZwXlQfbqirunYzJBUW7Mqm/2t8+swReE3tP6lGi1Tfbd4ktzFZislfrwCLa70q52A3zBwZ5uwjApyfyo9099vTwJyBDPBqSdfm6KJWGo2nvvzhmdnRDbO9CLXdIZZh9lus7+5+LpfVz36q1FbuLMC8a21Nkk3CsgV49aRBDKCa1vahnUc4Pon5Yr3UYfBAc9JF+82hPztc4atV/yZidtsKgRXGak9nkXWvi2+9zUdsIXJ0gkCRo+wz2vmhiwQi8eqlDEGjmbcdeP0MNUuS1Y1gHVl+KIzqq/Pjh4PPggGii70hQdQ1xf7fsu5MGC2slfQZqm2kFDCYsaYpfYXqOPQIwhX0iv7O2MZwRy2cRcMXfsCmIuKhG3yvXJTKUC9hoqZ49LCrNBmxxO8Ii/itqU1oAVEFvQAAAZQAAAAMcnNhLXNoYTItNTEyAAABgJg727402juPOXXf7RZVcJ7Pc9SZuzL9Rl9VnuqRF4kqj1v8es3yI/mRqh76AuR2R4BHRwBG6EIrZnORZ2YK4i5nWz5vgpmhrztH9S0r7fHOjgeD/jqLWC+ZgDNx9UEyUFaZl7zyhgSeToe253l6+ZVR28u5HrEn/HJOpNDi5q27XCSJcxZorC1n2uVPzYK9gX+IugBbJIX+2kNI92sc5KpwTZ7AsRYP6r06V3bPnz71f+h15YijLRdCpRkfqqj1HiSm0TFn9Y1k+kaz+xKQ3lfL3eUymC3poQPzdKP9YpXH7GRxbcaxtHQ96YIqoNhsGDtG0fyGRr4O4QlrVEpIIY9ZaDJ2V1jT9g39AIlG7zjIiPlawcd/9YogKq92xqX7y6NYjBqaQzqH3UB/pfJ29HQG5VyVF+D6FQ4E42MG3Xkae6KigXQjwzcPQaHAQU0xjtp/AJI4ZFCok6L2SOzXED0W93QuKMedFkbmfeP53/n0Q61KjT8vpnGJlA98RFpbfw== rak@zeta.rak.ac
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgfQeqGlwzAO4LR6nPk1SkgHg7kSu5njNSluQ6UFIDk/wAAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy0yNy0xM1QwMToxMjoyOVpfcmFrAAAABwAAAANyYWsAAAAAZXe3AQAAAABmaPmBAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBAJ9165+IlIvhVvFvXXN1s90QxG3nugBgEgtJmkAFfuqLaoHtIFOlfQ26uWJYoc6wn1ZeOpZupWn1WZcB6G4Rv7bqQsDoukWU7Akys7ZwXlQfbqirunYzJBUW7Mqm/2t8+swReE3tP6lGi1Tfbd4ktzFZislfrwCLa70q52A3zBwZ5uwjApyfyo9099vTwJyBDPBqSdfm6KJWGo2nvvzhmdnRDbO9CLXdIZZh9lus7+5+LpfVz36q1FbuLMC8a21Nkk3CsgV49aRBDKCa1vahnUc4Pon5Yr3UYfBAc9JF+82hPztc4atV/yZidtsKgRXGak9nkXWvi2+9zUdsIXJ0gkCRo+wz2vmhiwQi8eqlDEGjmbcdeP0MNUuS1Y1gHVl+KIzqq/Pjh4PPggGii70hQdQ1xf7fsu5MGC2slfQZqm2kFDCYsaYpfYXqOPQIwhX0iv7O2MZwRy2cRcMXfsCmIuKhG3yvXJTKUC9hoqZ49LCrNBmxxO8Ii/itqU1oAVEFvQAAAZQAAAAMcnNhLXNoYTItNTEyAAABgCrWucONn3x/OJxTtWcqycATwSdNLM2qTRHlGBydjA33ffgUr33gSjUzUhnFR6Star9kS5M4V4mn087QaZ6kNtrpTQTvh4r78CcRd4bURmF+le9NSYQIQ5gWIANv5yeuO0UmcSely3vWyxvMQAcYyZWj3Uzo10HB+/MSnqo4h4pvttfvqJDAF54zuDELEcoSWyMf4lldG6UZ6kCMbNeV8RHsziR+qb8qOsIxLWg2ajb/WOP44GYkwuqAxG04lvLJR2HG/wRjEqRpsFOfHFrKxNfhCgxC9leRH8AcLKmY1YQJvAWxHK1Z20BKtY3x3z4+Na2Xycj07l/2WaMdrh9dFobpobxD/wOEmidLLlfAEOzo18DZFUdef8jvzMXvmNyyTszSYA84RIJD2JANccwj3UrW2ZfrrhO8pVfZHM/cdITuk1kRtl+j9Oopse3801jAZFYtxRLmRhFXhvCkKmLexgvlGHtzq2CkewESB42NuuFNfwuXEldFd7jNSPxIzfS4Lw== rak@zeta.rak.ac
diff --git a/private_dot_ssh/private_keys/zeta/certs/rak.pub b/private_dot_ssh/private_keys/zeta/certs/rak.pub
index 5610dfa..67e9771 100644
--- a/private_dot_ssh/private_keys/zeta/certs/rak.pub
+++ b/private_dot_ssh/private_keys/zeta/certs/rak.pub
@@ -1 +1 @@
-ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgsHZgmKjnNaVmz17vBuFC/mYD7xj2D8UsAMtmqOJGPqAAAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy01OS0xM1QyMzowNjoyNlpfcmFrAAAABwAAAANyYWsAAAAAZIexXgAAAABlePPeAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAg6A5Xlq1VB9ukVDZHXCRQ/LbKgLHOWhUxPBRTqPtHi/cAAABTAAAAC3NzaC1lZDI1NTE5AAAAQHqGlqpzQCIDn5uLeX/icgGh9u/ZmScKXElGHaDdQyQ0WPbDfVz0tFJUUTojQUyOZ4szhl0J2RPOQwm5NN8Gbgw= rak@zeta.rak.ac
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgaq8mECdWlDGFEnG8TczqmH1olwiN22GORBriDLGMD/YAAAADAQABAAABgQDllUCYh+UsI3Am8EXcJCni8EmZgQ7e4UPt6e9GVgp1TNi4B+JEMOYZrf9NkluHbvUwnmLOA0H/QyPQ+BMYDf0WdQdCaJ/Gl7tmHAvMgA1zXZh+83dzAc9al7/mZJ8a6ZST2nmcx5ZKXmA8oF6fmT/6Sy0qBavyveiS65ULsVCWYLuotvFz42SEVcdUk0//mkosRtF+E6/q7eLEYZOrGDvBTMW2szICKQoDEcvqR8Qc32Ob5JIz8LUQ1uvisiZRN6azh1HLYzx7yfo6NfgcofGixcM7tWlMm9wgHfHzO0ymKklBHXBcI++K+aOUOx0b0bJ6aXnaTCit2aexP8N4WDSA0OhkzPAgGSLXZc1YEGwjIwJOdpnCuJfltI34597FlCGcbh6YxLnkk7IsHdHvURTsku0aCERdg3AGB0/z3TxuN1ybbPM5yQluE6itgbok+xYOAJacJG3qz40/4sN5PUCefVRkCA5RMiDbot0+T1nXMxaSpLsdPmuKQPbl2lLfPhkAAAAAAAAAAAAAAAEAAAAYMjAyMy0yNy0xM1QwMToxMjoyOVpfcmFrAAAABwAAAANyYWsAAAAAZXe3AQAAAABmaPmBAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAg6A5Xlq1VB9ukVDZHXCRQ/LbKgLHOWhUxPBRTqPtHi/cAAABTAAAAC3NzaC1lZDI1NTE5AAAAQLhHBL1t7UCCpvoj/QWJJ9h3R1aL3PrTP2m9YsYWhkxSrBX0D8TGij+iaeEKT+Fd+3YD+s74Z0vOJcADNv/NrQ4= rak@zeta.rak.ac