thanks

00dani/.zshenv

@@ -0,0 +1,2 @@
+# Skip the not really helping Ubuntu global compinit
+skip_global_compinit=1

00dani/zshrc.zsh

@@ -2,34 +2,35 @@
 
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:=~/.cache}
 
-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
+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/psprint/zinit $ZINIT_HOME/bin
+	zcompile $ZINIT_HOME/bin/zinit.zsh
 fi
-source $ZPLG_HOME/bin/zplugin.zsh
+source $ZINIT_HOME/bin/zinit.zsh
 load=light
 
-zplugin $load willghatch/zsh-saneopt
+zinit $load willghatch/zsh-saneopt
 
-zplugin $load mafredri/zsh-async
-zplugin $load rupa/z
-zplugin $load sindresorhus/pure
+zinit $load mafredri/zsh-async
+zinit $load rupa/z
+zinit $load sindresorhus/pure
 
-zplugin ice nocompile:! pick:c.zsh atpull:%atclone atclone:'dircolors -b LS_COLORS > c.zsh'
-zplugin $load trapd00r/LS_COLORS
+zinit ice nocompile:! pick:c.zsh atpull:%atclone atclone:'dircolors -b LS_COLORS > c.zsh'
+zinit $load trapd00r/LS_COLORS
 
-zplugin ice silent wait:1 atload:_zsh_autosuggest_start
-zplugin $load zsh-users/zsh-autosuggestions
+zinit ice silent wait:1 atload:_zsh_autosuggest_start
+zinit $load zsh-users/zsh-autosuggestions
 
-zplugin ice blockf; zplugin $load zsh-users/zsh-completions
+zinit ice blockf; zinit $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
+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
 
-zplugin ice silent wait!1; zplugin $load zdharma/fast-syntax-highlighting
+zinit ice silent wait!1 atload"ZINIT[COMPINIT_OPTS]=-C; zpcompinit"
+zinit $load zdharma/fast-syntax-highlighting

Dockerfile

@@ -4,8 +4,8 @@ FROM ubuntu:18.04
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
     apt install -yq \
-        ncurses-dev unzip zsh git subversion curl make sudo locales \
-        python golang-go \
+        ncurses-dev man telnet unzip zsh git subversion curl make sudo locales \
+        autoconf automake python golang-go \
         vim htop
 
 # Set the locale
@@ -22,19 +22,19 @@ RUN adduser --disabled-password --gecos '' user         && \
     usermod --shell /bin/zsh user
 USER user
 
-# Install Rust language
-RUN curl 'https://sh.rustup.rs' -sSf | sh -s -- -y  && \
-    echo 'source ${HOME}/.cargo/env' > /home/user/.zshenv
-
-# Install zplugin
-RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma/zplugin/master/doc/install.sh)"
+# Install zinit
+RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma/zinit/master/doc/install.sh)"
 
 # Copy configs into home directory
 ARG FOLDER
 COPY --chown=user "${FOLDER}" /home/user
 # Copy of a possible .zshrc named according to a non-leading-dot scheme
 RUN cp -vf /home/user/zshrc.zsh /home/user/.zshrc 2>/dev/null || true
 
+# Install Rust language
+RUN curl 'https://sh.rustup.rs' -sSf | sh -s -- -y  && \
+    echo 'source ${HOME}/.cargo/env' >> /home/user/.zshenv
+
 # Run user's bootstrap script
 RUN if [ -f /home/user/bootstrap.sh ]; then \
         chmod u+x /home/user/bootstrap.sh; \
@@ -44,6 +44,7 @@ RUN if [ -f /home/user/bootstrap.sh ]; then \
 # Install all plugins
 ARG TERM
 ENV TERM ${TERM}
-RUN SHELL=/bin/zsh zsh -i -c -- '-zplg-scheduler burst || true'
+RUN SHELL=/bin/zsh zsh -i -c -- 'zinit module build; @zinit-scheduler burst || true '
+
+CMD zsh -i -l
 
-CMD zsh

NICHOLAS85/.zinit/snippets/config/._zinit/blockf

@@ -0,0 +1 @@
+

NICHOLAS85/.zinit/snippets/config/._zinit/depth

@@ -0,0 +1 @@
+3

NICHOLAS85/.zinit/snippets/config/._zinit/id-as

@@ -0,0 +1 @@
+config

NICHOLAS85/.zinit/snippets/config/._zinit/light-mode

@@ -0,0 +1 @@
+

NICHOLAS85/.zinit/snippets/config/._zinit/lucid

@@ -0,0 +1 @@
+

NICHOLAS85/.zinit/snippets/config/._zinit/mode

@@ -0,0 +1 @@
+1

NICHOLAS85/.zinit/snippets/config/._zinit/svn

@@ -0,0 +1 @@
+

NICHOLAS85/.zinit/snippets/config/._zinit/teleid

@@ -0,0 +1 @@
+https://github.com/NICHOLAS85/dotfiles/trunk/.zinit/snippets/config

NICHOLAS85/.zinit/snippets/config/._zinit/url

@@ -0,0 +1 @@
+https://github.com/NICHOLAS85/dotfiles/trunk/.zinit/snippets/config

NICHOLAS85/.zinit/snippets/config/._zinit/wait

@@ -0,0 +1 @@
+

NICHOLAS85/.zinit/snippets/config/.svn/entries

@@ -0,0 +1 @@
+12

NICHOLAS85/.zinit/snippets/config/.svn/format

@@ -0,0 +1 @@
+12

NICHOLAS85/.zinit/snippets/config/.svn/pristine/01/01a5b15fc422b7588717cb8e1969c3779f2cc6e6.svn-base

@@ -0,0 +1,24 @@
+Allow dotbare to be symlinked
+--- kazhala---dotbare/dotbare	2020-11-08 03:51:47.379765820 -0500
++++ kazhala---dotbare/dotbare-patch	2020-11-08 03:51:12.764122189 -0500
+@@ -12,7 +12,7 @@
+ #   option flags:
+ #     check sub commands for available option flags
+
+-mydir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
++mydir="$(dirname -- "$(readlink -f -- "$BASH_SOURCE")")"
+ source "${mydir}"/helper/set_variable.sh
+
+ function usage() {
+--- kazhala---dotbare/pkg/completion/zsh/_dotbare	2020-11-23 17:46:34.913377981 -0500
++++ kazhala---dotbare/pkg/completion/zsh/_dotbare.patch	2020-11-23 17:46:32.169435684 -0500
+@@ -127,6 +127,9 @@
+             '(- : *)'{-h,--help}'[show help information]' \
+             && ret=0
+           ;;
++        *)
++          _normal
++          ;;
+       esac
+       ;;
+   esac

NICHOLAS85/.zinit/snippets/config/.svn/pristine/02/02c13ed091c78090552d22fc73c018aedfca9fbb.svn-base

@@ -0,0 +1,6 @@
+dirs=( $( { sed -e 's/:\(.*\):/\1/' $AUTOENV_AUTH_FILE } | sed 's/:.*//' |
+FZF_DEFAULT_OPTS="$FORGIT_FZF_DEFAULT_OPTS -0 -m --nth 2..,..
+--preview='[[ \$(file --mime {}) =~ binary ]] && echo {} is a binary file || (bat --style=numbers --color=always {}) 2> /dev/null | head -500'
+$FORGIT_ADD_FZF_OPTS" fzf ) )
+
+${dirs:+kate} $dirs

NICHOLAS85/.zinit/snippets/config/.svn/pristine/05/054e77e5a92056707ff53ab6c0bb8807c2fa121b.svn-base

@@ -0,0 +1,14 @@
+Fix autoloading with Zinit, remove cdpath hook
+--- marlonrichert---zsh-edit/zsh-edit.plugin.zsh	2020-11-24 14:57:14.225191357 -0500
++++ marlonrichert---zsh-edit/zsh-edit.plugin.zsh-patch	2020-11-24 15:01:38.468808641 -0500
+@@ -6,9 +6,7 @@
+
+   local fdir=${${(%):-%x}:A:h}/functions
+   typeset -gU FPATH fpath=( $fdir $fpath )
+-  autoload -Uz add-zsh-hook $fdir/*~*.zwc
+-
+-  add-zsh-hook chpwd _cdpath
++  autoload -Uz add-zsh-hook $fdir/*~*.zwc(.:t)
+
+   local widget
+

NICHOLAS85/.zinit/snippets/config/.svn/pristine/18/188d4306c78d8fd43b553902653b27ebfa0b0776.svn-base

@@ -0,0 +1,29 @@
+--- michaelxmcbride---zsh-dircycle/dircycle.zsh	2020-10-14 03:42:40.565527743 -0400
++++ michaelxmcbride---zsh-dircycle/dircycle.zsh-patch	2020-10-14 03:42:32.315653673 -0400
+@@ -5,20 +5,22 @@
+
+     [[ ${#dirstack} -eq 0 ]] && return
+
+-    while ! builtin pushd -q $1 &>/dev/null; do
++    while ! builtin pushd $1 &>/dev/null; do
+         # A missing directory was found; pop it out of the directory stack.
+-        builtin popd -q $1
++        builtin popd $1
+
+         # Stop trying if there are no more directories in the directory stack.
+         [[ ${#dirstack} -eq 0 ]] && break
+     done
+-    
++
+     # Trigger a prompt update if using Pure (https://github.com/sindresorhus/pure).
+     if typeset -f prompt_pure_setup > /dev/null; then
+         prompt_pure_async_tasks
+         prompt_pure_preprompt_render
+     else
+-        zle reset-prompt
++        _p9k_precmd
++        zle .reset-prompt
++        zle -R
+     fi
+ }
+

NICHOLAS85/.zinit/snippets/config/.svn/pristine/1b/1b67e0285be8b45736460986c014e42cea01a6c6.svn-base

@@ -0,0 +1,14 @@
+Fix autoloading with Zinit, remove cdpath hook
+--- marlonrichert---zsh-edit/zsh-edit.plugin.zsh	2020-11-23 16:58:49.823346698 -0500
++++ marlonrichert---zsh-edit/zsh-edit.plugin.zsh-patch	2020-11-23 16:59:08.433260361 -0500
+@@ -7,9 +7,7 @@
+
+   local fdir=${${(%):-%x}:A:h}/functions
+   typeset -gU FPATH fpath=( $fdir $fpath )
+-  autoload -Uz add-zsh-hook $fdir/*
+-
+-  add-zsh-hook chpwd cdpath
++  autoload -Uz add-zsh-hook $fdir/*(.:t)
+
+   local widget
+

NICHOLAS85/.zinit/snippets/config/.svn/pristine/1e/1e8d99d43902c9e96c56757031497ac8dbd77e28.svn-base

@@ -0,0 +1,22 @@
+setopt extendedglob local_options
+autoload -Uz compinit
+local zcompf="${ZINIT[ZCOMPDUMP_PATH]:-${ZDOTDIR:-$HOME}/.zcompdump}"
+
+# use a separate file to determine when to regenerate, as compinit doesn't always need to modify the compdump
+local zcompf_a="${zcompf}.augur"
+
+if [[ -e "$zcompf_a" && -f "$zcompf_a"(#qN.md-1) ]]; then
+    compinit -C -d "$zcompf"
+else
+    compinit -d "$zcompf"
+    touch "$zcompf_a"
+fi
+
+# if zcompdump exists (and is non-zero), and is older than the .zwc file, then regenerate
+if [[ -s "$zcompf" && (! -s "${zcompf}.zwc" || "$zcompf" -nt "${zcompf}.zwc") ]]; then
+    # since file is mapped, it might be mapped right now (current shells), so rename it then make a new one
+    [[ -e "$zcompf.zwc" ]] && mv -f "$zcompf.zwc" "$zcompf.zwc.old"
+    # compile it mapped, so multiple shells can share it (total mem reduction)
+    # run in background
+    { zcompile -M "$zcompf" && command rm -f "$zcompf.zwc.old" }&!
+fi

NICHOLAS85/.zinit/snippets/config/.svn/pristine/1f/1f5cdd25986bf3173ab9815134b3868500cd0f77.svn-base

@@ -0,0 +1,29 @@
+--- kadaan---per-directory-history/per-directory-history.zsh	2020-08-24 05:35:33.232756679 -0400
++++ kadaan---per-directory-history/per-directory-history-patch	2020-08-24 05:37:48.008288237 -0400
+@@ -46,7 +46,7 @@
+ 	if ! $_per_directory_history_is_global
+ 	then
+ 		fc -P
+-		mkdir -p ${_per_directory_history_path:h}
++		[ -d ${_per_directory_history_path:h} ] || mkdir -p ${_per_directory_history_path:h}
+ 		fc -p $_per_directory_history_path
+ 	fi
+ }
+@@ -73,7 +73,7 @@
+ 			local fn
+ 			if $_per_directory_history_is_global
+ 			then
+-				mkdir -p ${_per_directory_history_path:h}
++				[ -d ${_per_directory_history_path:h} ] || mkdir -p ${_per_directory_history_path:h}
+ 				fn=$_per_directory_history_path
+ 			else
+ 				fn=$_per_directory_history_main_histfile
+@@ -96,7 +96,7 @@
+ function _per-directory-history-set-directory-history() {
+ 	fc -P
+
+-	mkdir -p ${_per_directory_history_path:h}
++	[ -d ${_per_directory_history_path:h} ] || mkdir -p ${_per_directory_history_path:h}
+ 	fc -p $_per_directory_history_path
+ 	_per_directory_history_is_global=false
+ }

NICHOLAS85/.zinit/snippets/config/.svn/pristine/20/207c4e870581c3ca7f71482c9d65a80c6267ee6f.svn-base

@@ -0,0 +1 @@
+fc -ln 0 | awk '{print $1}' | sort | uniq -c | sort -nr | head 

NICHOLAS85/.zinit/snippets/config/.svn/pristine/25/25c0b3a9f9964acbdc7f02c1737041d7b89cc463.svn-base

@@ -0,0 +1,20 @@
+--- "zinit-zsh---z-a-bin-gem-node/\342\206\222za-bgn-atdelete-handler"	2020-11-08 17:51:29.893155968 -0500
++++ "zinit-zsh---z-a-bin-gem-node/\342\206\222za-bgn-atdelete-handler-patch"	2020-11-08 17:51:25.881202480 -0500
+@@ -14,14 +14,14 @@
+ # sbin'' ice – creation of shims (the name borrowed from rbenv)
+ #
+
+-if (( ${+ICE[sbin]} )) {
++if (( ${+ICE2[sbin]} )) {
+     local -a sbins srcdst
+-    sbins=( ${(s.;.)ICE[sbin]} )
++    sbins=( ${(s.;.)ICE2[sbin]} )
+
+     local sbin
+     integer set_gem_home set_node_path
+
+-    ( 
++    (
+         builtin cd -q "$dir"
+         for sbin ( $sbins "" ) {
+             if [[ -z $sbin && ${#sbins} -eq 0 ]]; then

NICHOLAS85/.zinit/snippets/config/.svn/pristine/29/2973d6ccf5da70e2e644f1fe68acbd81e26ef76a.svn-base

@@ -0,0 +1,6 @@
+if $_per_directory_history_is_global; then
+    p10k segment -i ''
+else
+    p10k segment -i '📍'
+fi
+