From d2a5ca19a2dbd04632fe20f2e458035227a70938 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Mon, 20 Jan 2020 12:01:30 +1100 Subject: [PATCH] Migrate from Zplugin to Zinit, because the project was renamed --- config/zsh/zinit | 32 ++++++++++++++++++++++++++++++++ config/zsh/zplugin | 32 -------------------------------- config/zsh/zshrc | 4 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 config/zsh/zinit delete mode 100644 config/zsh/zplugin diff --git a/config/zsh/zinit b/config/zsh/zinit new file mode 100644 index 0000000..3814c69 --- /dev/null +++ b/config/zsh/zinit @@ -0,0 +1,32 @@ +#! zsh +typeset -A ZINIT +ZINIT_HOME=$XDG_CACHE_HOME/zsh/zinit +ZINIT[HOME_DIR]=$ZINIT_HOME +ZINIT[ZCOMPDUMP_PATH]=$XDG_CACHE_HOME/zsh/zcompdump + +if [[ ! -f $ZINIT_HOME/bin/zinit.zsh ]]; then + git clone https://github.com/zdharma/zinit $ZINIT_HOME/bin + zcompile $ZINIT_HOME/bin/zinit.zsh +fi +source $ZINIT_HOME/bin/zinit.zsh +load=light + +zinit $load willghatch/zsh-saneopt + +zinit $load mafredri/zsh-async +zinit $load rupa/z +zinit $load sindresorhus/pure + +zinit ice nocompile:! pick:c.zsh atpull:%atclone atclone:'dircolors -b LS_COLORS > c.zsh' +zinit $load trapd00r/LS_COLORS + +zinit ice silent wait:1 atload:_zsh_autosuggest_start +zinit $load zsh-users/zsh-autosuggestions + +zinit ice blockf; zinit $load zsh-users/zsh-completions + +zinit ice silent wait:1; zinit $load mollifier/cd-gitroot +zinit ice silent wait:1; zinit $load micha/resty +zinit ice silent wait:1; zinit $load supercrabtree/k + +zinit ice silent wait!1; zinit $load zdharma/fast-syntax-highlighting diff --git a/config/zsh/zplugin b/config/zsh/zplugin deleted file mode 100644 index d39b1b0..0000000 --- a/config/zsh/zplugin +++ /dev/null @@ -1,32 +0,0 @@ -#! zsh -typeset -A ZPLGM -ZPLG_HOME=$XDG_CACHE_HOME/zsh/zplugin -ZPLGM[HOME_DIR]=$ZPLG_HOME -ZPLGM[ZCOMPDUMP_PATH]=$XDG_CACHE_HOME/zsh/zcompdump - -if [[ ! -f $ZPLG_HOME/bin/zplugin.zsh ]]; then - git clone https://github.com/psprint/zplugin $ZPLG_HOME/bin - zcompile $ZPLG_HOME/bin/zplugin.zsh -fi -source $ZPLG_HOME/bin/zplugin.zsh -load=light - -zplugin $load willghatch/zsh-saneopt - -zplugin $load mafredri/zsh-async -zplugin $load rupa/z -zplugin $load sindresorhus/pure - -zplugin ice nocompile:! pick:c.zsh atpull:%atclone atclone:'dircolors -b LS_COLORS > c.zsh' -zplugin $load trapd00r/LS_COLORS - -zplugin ice silent wait:1 atload:_zsh_autosuggest_start -zplugin $load zsh-users/zsh-autosuggestions - -zplugin ice blockf; zplugin $load zsh-users/zsh-completions - -zplugin ice silent wait:1; zplugin $load mollifier/cd-gitroot -zplugin ice silent wait:1; zplugin $load micha/resty -zplugin ice silent wait:1; zplugin $load supercrabtree/k - -zplugin ice silent wait!1; zplugin $load zdharma/fast-syntax-highlighting diff --git a/config/zsh/zshrc b/config/zsh/zshrc index 96a299d..3d1536b 100644 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -1,8 +1,8 @@ -source $ZDOTDIR/zplugin +source $ZDOTDIR/zinit for f in $ZDOTDIR/interactive/*(N); source $f zpcompinit && zpcdreplay -([[ $ZPGLM[ZCOMPDUMP_PATH].zwc -nt $ZPGLM[ZCOMPDUMP_PATH] ]] || zcompile $ZPLGM[ZCOMPDUMP_PATH]) &! +([[ $ZINIT[ZCOMPDUMP_PATH].zwc -nt $ZINIT[ZCOMPDUMP_PATH] ]] || zcompile $ZINIT[ZCOMPDUMP_PATH]) &! [[ -o login ]] && for f in $ZDOTDIR/interactive+login/*(N); source $f