From c80e99245a62c724be3ffaaed2c2d897a215238a Mon Sep 17 00:00:00 2001 From: Blallo Date: Mon, 8 May 2023 23:55:41 +0200 Subject: [PATCH 1/3] Fix update_antidote --- update_antidote.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/update_antidote.sh b/update_antidote.sh index ad4c83b..6e7d159 100755 --- a/update_antidote.sh +++ b/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 From 026c7f42fbae187b98ecd4b254d5058aabaea659 Mon Sep 17 00:00:00 2001 From: Blallo Date: Mon, 8 May 2023 23:56:29 +0200 Subject: [PATCH 2/3] Reenable antidote --- .zshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.zshrc b/.zshrc index b43df2d..1150708 100644 --- a/.zshrc +++ b/.zshrc @@ -17,8 +17,8 @@ compinit . ${HOME}/.config/zsh/antibody.zsh ### antidote -#. ~/.antidote/antidote.zsh -#antidote load +. ~/.antidote/antidote.zsh +antidote load #. ~/.zsh_plugins.zsh From 5a125aeecdcb88dc2871ec1e19cb554e6a6831a0 Mon Sep 17 00:00:00 2001 From: Blallo Date: Mon, 8 May 2023 23:56:53 +0200 Subject: [PATCH 3/3] Switch to powerlevel10k --- .zshrc | 10 ++++++++++ antidote.plugins.txt | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index 1150708..fd395ba 100644 --- a/.zshrc +++ b/.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 @@ -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 diff --git a/antidote.plugins.txt b/antidote.plugins.txt index d1d98e6..64065be 100644 --- a/antidote.plugins.txt +++ b/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