From de79e53a021ae10065886f6360de62bd7c65b605 Mon Sep 17 00:00:00 2001 From: Peter Son Struschka Date: Tue, 17 Sep 2019 18:48:47 +0700 Subject: Update ZSH: use zplug instead of antigen --- zsh/.zshrc | 79 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 34 deletions(-) (limited to 'zsh/.zshrc') diff --git a/zsh/.zshrc b/zsh/.zshrc index 2ba2d1f..806c84f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,39 +1,33 @@ -source /usr/share/zsh/share/antigen.zsh - -antigen use oh-my-zsh - -antigen bundle git -antigen bundle git-extras -antigen bundle pip -antigen bundle lein -antigen bundle command-not-found -antigen bundle docker -antigen bundle archlinux -antigen bundle sublime -antigen bundle zsh-navigation-tools -antigen bundle systemd -antigen bundle taskwarrior -antigen bundle virtualenvwrapper - -fpath+=~/.zfunc -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle zsh-users/zsh-autosuggestions -antigen bundle zsh-users/zsh-completions -antigen bundle zsh-users/zsh-history-substring-search - -if [ "$TERM" = "linux" ]; then - _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p' - for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do - echo -en "$i" - done - clear -fi +# zplug +source ~/.zplug/init.zsh + +# oh my zsh stuff + +zplug "plugins/archlinux", from:oh-my-zsh +zplug "plugins/command-not-found", from:oh-my-zsh +zplug "plugins/docker", from:oh-my-zsh +zplug "plugins/git", from:oh-my-zsh +zplug "plugins/git-extras", from:oh-my-zsh +zplug "plugins/pip", from:oh-my-zsh +zplug "plugins/rsync", from:oh-my-zsh +zplug "plugins/sublime", from:oh-my-zsh +zplug "plugins/systemd", from:oh-my-zsh +zplug "plugins/taskwarrior", from:oh-my-zsh +zplug "plugins/thefuck", from:oh-my-zsh +zplug "plugins/tmux", from:oh-my-zsh +zplug "plugins/virtualenvwrapper", from:oh-my-zsh +zplug "plugins/zsh-navigation-tools", from:oh-my-zsh + +zplug "zsh-users/zsh-syntax-highlighting" +zplug "zsh-users/zsh-autosuggestions" +zplug "zsh-users/zsh-completions" +zplug "zsh-users/zsh-history-substring-search" # THEME POWERLEVEL9K_INSTALLATION_PATH=$ANTIGEN_BUNDLES/bhilburn/powerlevel9k POWERLEVEL9K_PROMPT_ON_NEWLINE=true POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="" -#POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="↳ " +# POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="↳ " POWERLEVEL9K_PROMPT_ADD_NEWLINE=true POWERLEVEL9K_MODE='awesome-fontconfig' POWERLEVEL9K_SHORTEN_DIR_LENGTH=3 @@ -41,11 +35,19 @@ POWERLEVEL9K_SHORTEN_DIR_LENGTH=3 POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon context virtualenv dir dir_writable vcs) POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status command_execution_time root_indicator background_jobs history time) -# antigen theme https://gist.github.com/pstruschka/c05686e6cf10e12471a3104e42e6366b.git agnoster_custom -antigen theme bhilburn/powerlevel9k powerlevel9k +# zplug theme https://gist.github.com/pstruschka/c05686e6cf10e12471a3104e42e6366b.git agnoster_custom + +zplug romkatv/powerlevel10k, use:powerlevel10k.zsh-theme -antigen apply +fpath+=~/.zfunc +if [ "$TERM" = "linux" ]; then + _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p' + for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do + echo -en "$i" + done + clear +fi if type "kitty" > /dev/null; then autoload -Uz compinit @@ -81,3 +83,12 @@ export WORKON_HOME=~/.virtualenvs alias ec="emacsclient -c" [[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh + +if ! zplug check --verbose; then + printf "Install? [y/N]: " + if read -q; then + echo; zplug install + fi +fi + +zplug load --verbose -- cgit v1.2.3