rearange sz.env and optimize for zsh

chezmoi.roots/_src.posix/private_dot_config/sz.env/011_zsh_0_perp.env.zsh

@@ -0,0 +1,65 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+[ -z "$ZSH_CACHE_DIR" ] && export ZSH_CACHE_DIR=$HOME/.cache/zsh
+mkdir -p $ZSH_CACHE_DIR/completions
+mkdir -p "$HOME/.local/share/zsh/completions"
+
+# Remove duplicates from fpath, and add local completion dir
+fpath=( $(
+    for d in $( 
+        awk '!seen[$0]++' <(
+            echo "$HOME/.local/share/zsh/completions"
+            printf '%s\n' $fpath
+        )
+    ); do
+        [ -d "$d" ] && echo "$d"
+    done
+) )
+
+skip_global_compinit=1
+
+# # Jump to the bottom of the screen
+# SZ_TPUT_END=$(tput cup 9999 0)
+# echo $SZ_TPUT_END 
+
+PS1="$(zsh -c '. <([ -n "$(echo /etc/*-release(N))" ] && cat /etc/*-release(N) | uniq -u || NAME="$VENDOR" ); echo "$NAME $VERSION_ID "')| ZSH ${ZSH_VERSION} LOADING >"
+
+#""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+#"""                              Shell Settings                              """
+#""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+typeset -g HISTFILE="$HOME/.zsh_history"
+typeset -g HISTSIZE=1000000
+typeset -g SAVEHIST=$HISTSIZE
+typeset -g COMPLETION_WAITING_DOTS="true"
+setopt hist_ignore_dups       # ignore duplicated commands history list
+export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES # fix "+[__NSPlaceholderDictionary initialize] may have been in progress in another thread when fork() was called" issue
+
+#####################
+# SETOPT            #
+#####################
+setopt promptsubst
+setopt extended_history       # record timestamp of command in HISTFILE
+setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
+setopt hist_ignore_all_dups   # ignore duplicated commands history list
+setopt hist_ignore_space      # ignore commands that start with space
+setopt hist_verify            # show command with history expansion to user before running it
+setopt inc_append_history     # add commands to HISTFILE in order of execution
+setopt share_history          # share command history data
+setopt always_to_end          # cursor moved to the end in full completion
+setopt hash_list_all          # hash everything before completion
+setopt nocompletealiases      # no complete alisases - no need for specific compdef for aliases
+setopt always_to_end          # when completing from the middle of a word, move the cursor to the end of the word
+setopt complete_in_word       # allow completion from within a word/phrase
+setopt nocorrect              # spelling correction for commands
+setopt list_ambiguous         # complete as much of a completion until it gets ambiguous.
+setopt auto_cd                # changing directories without cd
+setopt nolisttypes
+setopt listpacked
+setopt automenu
+setopt interactivecomments    # allow # comments in command-line
+setopt vi
+
+[[ -n "${DBG}" ]] && echo "ZSH preped"
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh

@@ -5,8 +5,11 @@
 #""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 #
 # ### Added by z-shell/zi's installer
-ZI_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zi/bin"
+ZI_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zi"
 mkdir -p "$(dirname "$ZI_HOME")"
+
+typeset -gAH ZINIT=(HOME_DIR "${ZI_HOME}" COMPINIT_OPTS '-D -i -u -C -w')
+
 if [[ ! -d "$ZI_HOME/.git" ]]; then
     print -P "%F{33}▓▒░ %F{160}Installing (%F{33}z-shell/zi%F{160})…%f"
     command mkdir -p "$(dirname "$ZINIT_HOME")" \
@@ -17,16 +20,15 @@ if [[ ! -d "$ZI_HOME/.git" ]]; then
         || print -P "%F{160}▓▒░ The clone has failed.%f%b"
 fi
 source "${ZI_HOME}/zi.zsh"
-autoload -Uz _zi
-(( ${+_comps} )) && _comps[zi]=_zi
 # examples here -> https://wiki.zshell.dev/ecosystem/category/-annexes
 zicompinit # <- https://wiki.zshell.dev/docs/guides/commands
 ### End of z-shell/zi installer's chunk
 alias zinit=zi
 
-zinit ice depth=1
-zinit light jeffreytse/zsh-vi-mode
+autoload -Uz _zi
+(( ${+_comps} )) && _comps[zi]=_zi
 
-[[ -n "${DBG}" ]] && echo "zi ready"
+[[ -n "${DBG}" ]] && echo "zinit/zi initialized"
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh

@@ -0,0 +1,7 @@
+#!/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'
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh

@@ -0,0 +1,9 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+zinit ice depth=1
+zinit light jeffreytse/zsh-vi-mode
+
+[[ -n "${DBG}" ]] && echo "jeffreytse/zsh-vi-mode loaded"
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+#

chezmoi.roots/_src.posix/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh

@@ -0,0 +1,10 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+autoload -Uz _zi
+(( ${+_comps} )) && _comps[zi]=_zi
+
+autoload -Uz +X compinit bashcompinit && compinit && bashcompinit
+[[ -n "${DBG}" ]] && echo "zinit/zi loaded available"
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_0_perp.env.zsh

@@ -1,69 +0,0 @@
-#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
-
-BASE_SHELL=${BASE_SHELL:-${SHELL##*/}}
-
-if [[ "${BASE_SHELL}" == "zsh" ]]; then
-
-    [ -z "$ZSH_CACHE_DIR" ] && export ZSH_CACHE_DIR=$HOME/.cache/zsh
-    mkdir -p $ZSH_CACHE_DIR/completions
-    mkdir -p "$HOME/.local/share/zsh/completions"
-
-    # Remove duplicates from fpath, and add local completion dir
-    fpath=( $(
-        for d in $( 
-            awk '!seen[$0]++' <(
-                echo "$HOME/.local/share/zsh/completions"
-                printf '%s\n' $fpath
-            )
-        ); do
-            [ -d "$d" ] && echo "$d"
-        done
-    ) )
- 
-    skip_global_compinit=1
-    
-    # # Jump to the bottom of the screen
-    # SZ_TPUT_END=$(tput cup 9999 0)
-    # echo $SZ_TPUT_END 
-    
-    PS1="$(zsh -c '. <([ -n "$(echo /etc/*-release(N))" ] && cat /etc/*-release(N) | uniq -u || NAME="$VENDOR" ); echo "$NAME $VERSION_ID "')| ZSH ${ZSH_VERSION} LOADING >"
-    
-    #""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    #"""                              Shell Settings                              """
-    #""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    typeset -g HISTFILE="$HOME/.zsh_history"
-    typeset -g HISTSIZE=1000000
-    typeset -g SAVEHIST=$HISTSIZE
-    typeset -g COMPLETION_WAITING_DOTS="true"
-    setopt hist_ignore_dups       # ignore duplicated commands history list
-    export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES # fix "+[__NSPlaceholderDictionary initialize] may have been in progress in another thread when fork() was called" issue
-    
-    #####################
-    # SETOPT            #
-    #####################
-    setopt promptsubst
-    setopt extended_history       # record timestamp of command in HISTFILE
-    setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
-    setopt hist_ignore_all_dups   # ignore duplicated commands history list
-    setopt hist_ignore_space      # ignore commands that start with space
-    setopt hist_verify            # show command with history expansion to user before running it
-    setopt inc_append_history     # add commands to HISTFILE in order of execution
-    setopt share_history          # share command history data
-    setopt always_to_end          # cursor moved to the end in full completion
-    setopt hash_list_all          # hash everything before completion
-    setopt nocompletealiases      # no complete alisases - no need for specific compdef for aliases
-    setopt always_to_end          # when completing from the middle of a word, move the cursor to the end of the word
-    setopt complete_in_word       # allow completion from within a word/phrase
-    setopt nocorrect              # spelling correction for commands
-    setopt list_ambiguous         # complete as much of a completion until it gets ambiguous.
-    setopt auto_cd                # changing directories without cd
-    setopt nolisttypes
-    setopt listpacked
-    setopt automenu
-    setopt interactivecomments    # allow # comments in command-line
-    setopt vi
-
-    [[ -n "${DBG}" ]] && echo "ZSH preped"
-fi
-
-# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:

chezmoi.roots/_src.posix/private_dot_config/sz.env/aaa_zsh_3_completion_system.env.zsh

@@ -1,10 +0,0 @@
-#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
-
-zinit load 'marlonrichert/zsh-autocomplete'
-if false; then
-    autoload -Uz +X compinit bashcompinit && compinit && bashcompinit
-
-    zstyle ':completion:*' menu yes select
-fi
-
-# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:

chezmoi.roots/_src.posix/private_dot_config/sz.env/broot.env

@@ -1,7 +1,8 @@
 #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
 
 if is_cmd broot; then
-    source /mnt/szmedia/USERDATA/home/sz/.config/broot/launcher/bash/br
+    . <(broot --print-shell-function "${SHELL##*/}")
+    broot --set-install-state installed
 fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:

chezmoi.roots/_src.posix/private_dot_config/sz.env/executable_000_load.sh

@@ -54,15 +54,15 @@ if is_sourced; then
                         "| sort' shell '{}' ';'" \
                     "-exec sh -c '" \
                         'find "$1" -xdev -maxdepth 1 -type f' \
-                            '-name "PATH_*.env" -or -name "PATH_*.env.'"${BASE_SHELL}"\" \
+                            '-name "???_PATH_*.env" -or -name "???_PATH_*.env.'"${BASE_SHELL}"\" \
                         "| sort' shell '{}' ';'" \
                     "-exec sh -c '" \
                         'find "$1" -xdev -maxdepth 1 -type f' \
                             '-name "*.env" -or -name "*.env.'"${BASE_SHELL}"\" \
-                        '| grep -Ev "/(PATH|ID)_[^/]+$"' \
+                        '| grep -Ev "/[[:digit:]]+_(PATH|ID)_[^/]+$"' \
                         "| sort' shell '{}' ';'" \
                     "-exec sh -c '" \
-                        'find "$1" -xdev -maxdepth 1 -type f -name "PATH_zz_cleanup.env"' \
+                        'find "$1" -xdev -maxdepth 1 -type f -name "999_PATH_zz_cleanup.env"' \
                     "' shell '{}' ';'"
             )"
             ALL_ENV_FILES="$(

chezmoi.roots/_src.posix/private_dot_config/sz.env/ls_1_lsd.env

@@ -2,11 +2,11 @@
 
 if is_cmd lsd; then
 
-    alias _ls="$(command -v lsd) "
-    alias lg="ll --git "
+    alias _ls="$(command -v lsd) --git "
 
     [[ -n "${DBG}" ]] && echo "assigned lsd as ls alias."
 
 fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/ls_2_eza.env

@@ -2,11 +2,11 @@
 
 if is_cmd eza; then
 
-    alias _ls="$(command -v eza) --icons "
-    alias lg="ll --git --git-repos-no-status"
+    alias _ls="$(command -v eza) --icons --git --git-repos-no-status "
 
     [[ -n "${DBG}" ]] && echo "assigned eza as ls alias."
 
 fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/zza_zoxide.env

@@ -0,0 +1,12 @@
+#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
+
+if is_cmd zoxide; then
+
+    . <( zoxide init --cmd cd "${BASE_SHELL}" )
+
+    [[ -n "${DBG}" ]] && echo "zoxide loaded."
+
+fi
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_atuin.env.bash

@@ -1,17 +1,15 @@
 #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
 
-BASE_SHELL=${BASE_SHELL:-${SHELL##*/}}
-
 if is_cmd atuin; then
-    if [[ "${BASE_SHELL}" == "bash" ]] && ! [[ -n "$SZ_ENV_BASH_LOAD_PREEXEC$BLE_VERSION" ]]; then
+    if ! [[ -n "$SZ_ENV_BASH_LOAD_PREEXEC$BLE_VERSION" ]]; then
         printf '%s\n' \
             'atuin was found, but bash-preexec or ble.sh are not loaded,' \
             'to load atuin, first run update-ble.sh or update-bash-preexec ' \
             'then relaod (_r) the shell.'
     fi
 
-    . <( atuin init "${BASE_SHELL}" )
-    . <( atuin gen-completions --shell ${BASE_SHELL} )
+    . <( atuin init bash )
+    . <( atuin gen-completions --shell bash )
 
     [[ -n "${DBG}" ]] && echo "atuin loaded."
 fi

chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_atuin.env.zsh

@@ -0,0 +1,11 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+if is_cmd atuin; then
+
+    # . <( atuin init "${BASE_SHELL}" )
+    zinit light atuinsh/atuin
+
+    [[ -n "${DBG}" ]] && echo "atuin loaded."
+fi
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:

chezmoi.roots/_src.posix/private_dot_config/sz.env/zzy_chezmoi.env.tmpl

@@ -40,6 +40,7 @@ if is_cmd 'chezmoi'; then
         chezmoi edit "${EDITLIST[@]}" --apply --interactive
     }
     alias czx="CZ_EXTR=1 chezmoi "
+    alias cz-reset-home="(czcd; cd ..; RESET=reset ./symclone.sh _home.macos; RESET=reset ./symclone.sh _home)"
 fi
 
-# vim: set ft=bash sw=4 sts=4 et:
+# vim: set ft=sh sw=4 sts=4 et:

chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_aliases.env.tmpl

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
 
-alias _ls='command ls '
+[[ "$(command -v _ls)" =~ alias ]] || alias _ls='command ls '
 {{- if eq .chezmoi.os "darwin" }}
 alias ls='_ls -hF --color=auto '
 alias l='ls -la '
@@ -36,3 +36,4 @@ alias nvimdiff='nvim -d '
 alias vimdiff='nvimdiff '
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+

chezmoi.roots/_src.posix/private_dot_config/sz.env/zzz_zsh_finalize.env.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
+
+zicompinit
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+