Merge remote-tracking branch 'origin/rita' into jane

.zshrc

@@ -1,3 +1,10 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
 ### Source local secrets
 [ -f ${HOME}/.config/zsh/secrets ] && . ${HOME}/.config/zsh/secrets
 
@@ -17,8 +24,8 @@ compinit
 . ${HOME}/.config/zsh/antibody.zsh
 
 ### antidote
-#. ~/.antidote/antidote.zsh
-#antidote load
+. ~/.antidote/antidote.zsh
+antidote load
 
 #. ~/.zsh_plugins.zsh
 
@@ -422,3 +429,6 @@ function ,pkfr() {
 alias ,pkpr='piknik -paste | tar xzpvf -'
 
 # vim: set ft=zsh et sw=0 ts=2 sts=0:
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

antidote.plugins.txt

@@ -1,5 +1,4 @@
 ohmyzsh/ohmyzsh path:lib
-ohmyzsh/ohmyzsh path:themes/agnoster.zsh-theme
 ohmyzsh/ohmyzsh path:plugins/docker
 ohmyzsh/ohmyzsh path:plugins/virtualenv
 ohmyzsh/ohmyzsh path:plugins/vagrant
@@ -11,3 +10,4 @@ gangleri/pipenv
 leophys/zsh-plugin-fzf-finder
 bobthecow/git-flow-completion
 wfxr/forgit
+romkatv/powerlevel10k

update_antidote.sh

@@ -1,7 +1,13 @@
 #!/usr/bin/env zsh
 
+! [[ -z $DEBUG ]] && set -x
+
 # clone antidote if necessary
-[[ -e ~/.antidote ]] || git clone https://github.com/mattmc3/antidote.git ~/.antidote
+if [[ -d ~/.antidote ]]; then
+    git -C ~/.antidote pull
+else
+    git clone https://github.com/mattmc3/antidote.git ~/.antidote
+fi
 
 # source antidote
 . ~/.antidote/antidote.zsh