4 files changed, 26 insertions, 6 deletions
diff --git a/tw/home/files/aerc/accounts.work.conf b/tw/home/files/aerc/accounts.work.conf
new file mode 100644
index 00000000..469c912e
--- /dev/null
+++ b/tw/home/files/aerc/accounts.work.conf
@@ -0,0 +1,20 @@
+[CERN]
+# https://man.sr.ht/~rjarry/aerc/providers/microsoft.md#office365-with-xoauth2
+source            = imaps+xoauth2://timo.wilken%40cern.ch@outlook.office365.com?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&scope=https://outlook.office.com/SMTP.Send https://outlook.office.com/IMAP.AccessAsUser.All offline_access
+outgoing          = smtp+xoauth2://timo.wilken%40cern.ch@smtp.office365.com:587?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&scope=https://outlook.office.com/SMTP.Send https://outlook.office.com/IMAP.AccessAsUser.All offline_access
+smtp-starttls     = yes
+# To authorize for the first time (to get refresh token):
+# mutt_oauth2.py ~/.local/share/aerc/twilken.tokens --authorize --authflow authcode --provider microsoft \
+#    --email timo.wilken@cern.ch --client-id 9e5f94bc-e8a4-4e73-b8be-63364c29d753 --client-secret '' \
+#    --encryption-pipe 'gpg --encrypt --recipient C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C'
+# Confirm empty client secret. When done, copy-paste ?code= value from final URL to the command-line.
+# Then, to store the refresh token:
+# gpg --decrypt ~/.local/share/aerc/twilken.tokens | jq -r .refresh_token | pass insert -e -f cern/exol/refresh-token
+source-cred-cmd   = pass cern/exol/refresh-token
+outgoing-cred-cmd = pass cern/exol/refresh-token
+default           = INBOX
+from              = Timo Wilken <timo.wilken@cern.ch>
+aliases           = twilken@cern.ch
+copy-to           = Sent Items
+postpone          = Drafts
+cache-headers     = true
diff --git a/tw/home/files/aerc/aerc.conf b/tw/home/files/aerc/aerc.conf
index aae2806a..01c2527d 100644
--- a/tw/home/files/aerc/aerc.conf
+++ b/tw/home/files/aerc/aerc.conf
@@ -126,7 +126,7 @@ text/html=lynx -display_charset=UTF-8 -force_html -dump -stdin
 #text/*=bat -fP --file-name="$AERC_FILENAME"
 #application/x-sh=bat -fP -l sh
 #image/*=catimg -w $(tput cols) -
-image/*=kitty +kitten icat /dev/stdin
+image/*=imv -
 #subject,~Git(hub|lab)=lolcat -f
 #from,thatguywhodoesnothardwraphismessages=fmt -w 72 | colorize
 
diff --git a/tw/home/files/gitconfig b/tw/home/files/gitconfig
index 51e60054..6bed5cc8 100644
--- a/tw/home/files/gitconfig
+++ b/tw/home/files/gitconfig
@@ -1,13 +1,10 @@
 # This is Git's per-user configuration file.
 [user]
 	name = Timo Wilken
-	email = git@twilken.net
-	signingkey = 53EC3C06856883DD92355BC22FC78504681F69B0
+	email = timo.wilken@cern.ch
+	signingkey = C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C
 [commit]
 	gpgsign = true
-# For work repos, include the gitconfig that sets up my work identity.
-[includeIf "gitdir:~/src/alice/"]
-        path = ~/src/alice/.gitconfig
 [url "https://"]
 	insteadOf = git://
 [url "ssh://git@gitlab.cern.ch:7999/"]
diff --git a/tw/home/files/zshrc b/tw/home/files/zshrc
index 882cf60c..2382fa27 100644
--- a/tw/home/files/zshrc
+++ b/tw/home/files/zshrc
@@ -105,6 +105,9 @@ alias nomad-diskfree='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1
 alias levant='NOMAD_TOKEN=$(pass cern/ci/nomad-bootstrap-token | head -1) \levant'
 alias consul='CONSUL_HTTP_TOKEN=$(pass cern/ci/consul-bootstrap-token | head -1) \consul'
 alias vault='VAULT_TOKEN=$(pass cern/ci/vault-root-token | head -1) \vault'
+nomad-shell () {
+  nomad alloc exec "$1" sh -c 'export TERM=xterm-256color HOME=$NOMAD_TASK_DIR PS1="\\u@\\h \\w \\\$ "; cd; exec bash -i'
+}
 
 # Git aliases
 alias ga='git add'