From cf04e67425175637c54da006d7af70c06fae8e92 Mon Sep 17 00:00:00 2001 From: "Lockszmith (VAST@MacBook)" Date: Thu, 5 Jun 2025 11:05:31 -0400 Subject: [PATCH] replace zinit with znap (zsh-snap) --- .../sz.env/011_zsh_2_znap.env.zsh | 10 +++++++ .../011_zsh_3_completion_system.env.zsh | 28 +++++++++++++++++-- .../sz.env/031_zsh_4_plugin_vimode.env.zsh | 8 ++++-- .../sz.env/091_zsh_9_zinit_fin.env.zsh | 10 ++++--- .../sz.env/981_atuin.env.zsh | 8 ++++-- .../sz.env/991_zsh_finalize.env.zsh | 4 ++- ...env.zsh => remove_011_zsh_2_zinit.env.zsh} | 0 7 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh rename chezmoi.roots/_home/private_dot_config/sz.env/{011_zsh_2_zinit.env.zsh => remove_011_zsh_2_zinit.env.zsh} (100%) diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh new file mode 100644 index 0000000..9dce82c --- /dev/null +++ b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh @@ -0,0 +1,10 @@ +#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' + +ZNAP_REPO="${XDG_DATA_HOME:-${HOME}/.local/share}/znap/_" + +# Download Znap, if it's not there yet. +[[ -r "${ZNAP_REPO}/znap.zsh" ]] || + git clone --depth 1 -- \ + https://github.com/marlonrichert/zsh-snap.git "${ZNAP_REPO}" +source "${ZNAP_REPO}/znap.zsh" # Start Znap + diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh index ad813b0..f5ebaaf 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh @@ -1,7 +1,31 @@ #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' -zinit light 'marlonrichert/zsh-autocomplete' -zinit light 'zsh-users/zsh-autosuggestions' +if [ -n "$ZI_HOME" ]; then + zinit light 'marlonrichert/zsh-autocomplete' + zinit light 'zsh-users/zsh-autosuggestions' +else + znap source 'marlonrichert/zsh-autocomplete' + znap source 'zsh-users/zsh-autosuggestions' + + # Make Tab and ShiftTab cycle completions on the command line + # bindkey '^I' menu-complete + # bindkey "$terminfo[kcbt]" reverse-menu-complete + + # Make Tab and ShiftTab go to the menu + bindkey '^I' menu-select + bindkey "$terminfo[kcbt]" menu-select + + # Make Tab and ShiftTab change the selection in the menu + bindkey -M menuselect '^I' menu-complete + bindkey -M menuselect "$terminfo[kcbt]" reverse-menu-complete + + # Make ← and → always move the cursor on the command line + # bindkey -M menuselect '^[[D' .backward-char '^[OD' .backward-char + # bindkey -M menuselect '^[[C' .forward-char '^[OC' .forward-char + + # `znap install` adds new commands and completions. + znap install aureliojargas/clitest zsh-users/zsh-completions +fi # vim: set ft=sh expandtab tabstop=4 shiftwidth=4: diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh index 54063bb..2cbca19 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh @@ -1,7 +1,11 @@ #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' -zinit ice depth=1 -zinit light jeffreytse/zsh-vi-mode +if [ -n "$ZI_HOME" ]; then + zinit ice depth=1 + zinit light jeffreytse/zsh-vi-mode +else + znap source jeffreytse/zsh-vi-mode +fi [[ -n "${DBG}" ]] && echo "jeffreytse/zsh-vi-mode loaded" diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh index b003016..a075587 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh @@ -1,10 +1,12 @@ #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' -autoload -Uz _zi -(( ${+_comps} )) && _comps[zi]=_zi +if [ -n "$ZI_HOME" ]; then + autoload -Uz _zi + (( ${+_comps} )) && _comps[zi]=_zi -autoload -Uz +X compinit bashcompinit && compinit && bashcompinit -[[ -n "${DBG}" ]] && echo "zinit/zi loaded available" + autoload -Uz +X compinit bashcompinit && compinit && bashcompinit + [[ -n "${DBG}" ]] && echo "zinit/zi loaded available" +fi # vim: set ft=sh expandtab tabstop=4 shiftwidth=4: diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh index 9d06c88..432cae0 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh @@ -2,8 +2,12 @@ if is_cmd atuin; then - # . <( atuin init "${BASE_SHELL}" ) - zinit light atuinsh/atuin + if [ -n "$ZI_HOME" ]; then + # . <( atuin init "${BASE_SHELL}" ) + zinit light atuinsh/atuin + else + znap source atuinsh/atuin + fi [[ -n "${DBG}" ]] && echo "atuin loaded." fi diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh index 1d7c69e..6d40535 100644 --- a/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh +++ b/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh @@ -1,6 +1,8 @@ #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' -zicompinit +if [ -n "$ZI_HOME" ]; then + zicompinit +fi # vim: set ft=sh expandtab tabstop=4 shiftwidth=4: diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh similarity index 100% rename from chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh rename to chezmoi.roots/_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh