ZSH Integration

reyjrar · reyjrar · commit 8e7e80b042d2 · 2024-12-21T20:20:42.000-08:00
* created `shell.d` for shared resources in `bash` and `zsh`
* added a `zshrc`
diff --git a/bash.d/00-system-defaults.sh b/bash.d/00-system-defaults.sh
diff --git a/bash.d/02-bash-completion.sh b/bash.d/02-bash-completion.sh
@@ -6,8 +6,6 @@ COMPLETION_SCRIPTS="
     /opt/local/etc/bash_completion
     /opt/local/etc/profile.d/bash_completion.sh
     /etc/bash_completion.d/git
-    $HOMEBREW_PREFIX/etc/bash_completion
-    $HOMEBREW_PREFIX/etc/profile.d/bash_completion.sh
 "
 
 for file in $COMPLETION_SCRIPTS; do
diff --git a/bash.d/03-homebrew.sh b/bash.d/03-homebrew.sh
@@ -11,14 +11,13 @@ if [ -n "$brew_install_dir" ] && [ -x "$brew_install_dir/bin/brew" ]; then
     path_inject "$brew_install_dir/bin"
     eval "$($brew_install_dir/bin/brew shellenv)"
 
-    # Inject gnubins therein
-    for path in $brew_install_dir/opt/*/libexec/gnubin; do
-        path_inject "$path"
-    done
+    # Completions
+    hbcomp="$brew_install_dir/etc/profile.d/bash_completion.sh"
+    [ -r "$hbcomp" ] && . "$hbcomp"
 
-    for p in "bash_completion.sh" "z.sh"; do
-        profile="$brew_install_dir/etc/profile.d/$p"
-        [[ -r "$profile" ]] && . "$profile"
+    # Inject gnubins therein
+    for dir in $brew_install_dir/opt/*/libexec/gnubin; do
+        path_inject "$dir"
     done
 
     # Load Latest PgSQL paths
diff --git a/bash.d/10-prompt.sh b/bash.d/10-prompt.sh
@@ -7,7 +7,7 @@ function prompt_extra() {
         addition="${bldblk}(${host_color}${addition}${bldblk})$txtrst";
     fi;
 
-    if [ -z $PROMPT_EXTRA ]; then
+    if [ -z "${PROMPT_EXTRA+x}" ]; then
         PROMPT_EXTRA=$addition;
     else
         PROMPT_EXTRA="$PROMPT_EXTRA$addition"
@@ -27,7 +27,7 @@ function before_prompt() {
 
     printf "$bldblk[$host_color%s$bldblk] $(get_user_color)%s" "$(date '+%H:%M:%S')" "$PWD"
 
-    if [ "$VCPROMPT" != "disable" ]; then
+    if [ "${VCPROMPT+x}" != "disable" ]; then
         if git status &> /dev/null; then
             rev=$(git rev-parse --short HEAD)
             branch=$(git branch 2> /dev/null | grep '^*' | colrm 1 2)
@@ -48,7 +48,7 @@ function before_prompt() {
         fi
     fi
 
-    [ ! -z $PROMPT_EXTRA ] && printf " $PROMPT_EXTRA";
+    [ ! -z "${PROMPT_EXTRA+x}" ] && printf " $PROMPT_EXTRA";
 
     [ $retval -ne 0 ] && printf " $bldred[*${txtred}${retval}${bldred}*]$txtrst";
 
diff --git a/bash.d/30-zoxide.sh b/bash.d/30-zoxide.sh
@@ -1,5 +1,3 @@
 if hash zoxide &> /dev/null; then
-    eval "$(zoxide init bash)"
-
-    alias cd=z
+    eval "$(zoxide init --cmd=cd bash)"
 fi
diff --git a/bash.d/40-k8s.sh b/bash.d/40-k8s.sh
@@ -3,6 +3,6 @@
 # Load completions
 for cmd in 'kubectl' 'minikube'; do
     if hash "$cmd" &> /dev/null; then
-        source <($cmd completion $(basename "$SHELL"))
+        source <($cmd completion $(basename "${shell_name}"))
     fi
 done
diff --git a/bashrc b/bashrc
@@ -9,18 +9,27 @@ case $- in *i*) INTERACTIVE=1;; esac
 
 if [ $INTERACTIVE -eq 1 ]; then
     # Interactive session, load ALL THE THINGS!
+    for rc in ~/.shell.d/*.sh; do
+        file=$(basename "$rc")
+        [[ $file == 99* ]] && continue
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
     for rc in ~/.bash.d/*.sh; do
         (( $DEBUG )) && echo "rc loading '$rc'";
         source $rc;
     done;
+    for rc in ~/.shell.d/9*.sh; do
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
     (( $DEBUG )) && echo "Loaded fully interactive."
 else
     # Non-interactive, sparse load
-    source ~/.bash.d/00-system-defaults.sh
-    source ~/.bash.d/00-variables.sh
-    source ~/.bash.d/01-functions.sh
-    source ~/.bash.d/02-base-paths.sh
-    source ~/.bash.d/99-aliases.sh
+    for rc in ~/.shell.d/{0,9}*.sh; do
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
 fi;
 
 # Clear any bad RC's
diff --git a/gitconfig b/gitconfig
@@ -12,7 +12,7 @@
     tool = vimdiff
 [alias]
     br = branch
-    ci = commit
+    ci = "commit -v"
     co = checkout
     cp = commit -p
     lp = log --format=\"%h - %an, %ar : %s\"
diff --git a/shell.d/00-system-defaults.sh b/shell.d/00-system-defaults.sh
@@ -0,0 +1,19 @@
+# Pull in the system-wide defaults
+export shell_name=$(basename "$SHELL")
+sysShellRC=("/opt/local/etc/${shell_name}rc" "/usr/local/etc/${shell_name}rc" "/etc/${shell_name}/rc")
+
+## Fix ulimit
+if command -v ulimit &> /dev/null; then
+    minimum_ulimit=8192;
+    if [ "$(ulimit -n)" -lt "$minimum_ulimit" ]; then
+        ulimit -n "$minimum_ulimit"
+    fi
+fi
+
+for shellrc in "${sysShellRC[@]}"; do
+    if [ -f "$shellrc" ]; then
+        . "$shellrc"
+        (( $DEBUG )) && echo "Loaded system settings: $shellrc"
+        break;
+    fi
+done
diff --git a/shell.d/00-variables.sh b/shell.d/00-variables.sh
@@ -14,6 +14,6 @@ export EDITOR LANG LC_TIME HOSTOS PLATFORM
 unset USERNAME
 unset LS_COLORS
 
-if [ -f "$HOME/.bash_variables" ];  then
-    . "$HOME/.bash_variables"
-fi
+for vars in "$HOME/.shell_variables" "$HOME/.${shell_name}_variables"; do
+    [ -f "$vars" ] && . "$vars"
+done
diff --git a/shell.d/01-colors.sh b/shell.d/01-colors.sh
@@ -45,10 +45,11 @@ esac;
 function get_user_color() {
     # Set User Color based on Name
     case "$USER" in
-        "root"      )   user_color="$bldred";;
-        "brad"      )   user_color="$txtgrn";;
-        "blhotsky"  )   user_color="$txtcyn";;
-        *           )   user_color="$txtpur";;
+        "root"        )   user_color="$bldred";;
+        "brad"        )   user_color="$txtgrn";;
+        "blhotsky"    )   user_color="$txtcyn";;
+        "brad.lhotsky")   user_color="$txtcyn";;
+        *             )   user_color="$txtpur";;
     esac
     echo $user_color;
 }
diff --git a/shell.d/01-functions.sh b/shell.d/01-functions.sh
@@ -1,27 +1,27 @@
 # Path Injection
 function path_inject() {
-    path=$1
-    (( $DEBUG )) && echo -n "path_inject( $path )";
-    if [ -d "$path" ]; then
-        if [[ $PATH =~ (^|:)$path(:|$) ]]; then
+    bindir=$1
+    (( $DEBUG )) && echo -n "path_inject( $bindir )";
+    if [ -d "$bindir" ]; then
+        if [[ $PATH =~ (^|:)$bindir(:|$) ]]; then
             (( $DEBUG )) && echo -n " [PRESENT]";
-            newpath="$path";
+            newpath="$bindir";
             for dir in $( echo $PATH | tr ':' "\n" | awk '!x[$0]++' ); do
-                [ "$path" == "$dir" ] && continue
+                [ "$bindir" = "$dir" ] && continue
                 [ ! -d "$dir" ] && continue
                 newpath="$newpath:$dir";
             done
-            PATH="$newpath"
+            PATH="$bindir"
         else
-            PATH="$path:$PATH";
+            PATH="$bindir:$PATH";
             (( $DEBUG )) && echo -n " [ADDED]";
         fi
     fi;
     (( $DEBUG )) && echo;
 }
 
 function ssl_expiry() {
-    if [ ! -z "$1" ]; then
+    if [ ! -z "${1+x}" ]; then
         echo "" | openssl s_client -connect "$1" | openssl x509 -noout -dates
     else
         echo "usage: $FUNCNAME host:port";
@@ -59,7 +59,7 @@ function send_bash_local() {
             echo "!! warning : host $host was not found in ~/.distrib_hosts";
         fi;
     fi;
-    /usr/bin/scp .bash_local $host:~
+    scp .bash_local $host:~
 }
 
 function _set_win_title() {
diff --git a/shell.d/02-base-paths.sh b/shell.d/02-base-paths.sh
diff --git a/shell.d/30-gpg.sh b/shell.d/30-gpg.sh
@@ -1,5 +1,4 @@
 # GPG Configuration
-
-if [ "$HOSTOS" == "Darwin" ]; then
+if [ "$HOSTOS" = "Darwin" ]; then
     export GPG_TTY=$(tty)
 fi
diff --git a/shell.d/30-ssh.sh b/shell.d/30-ssh.sh
@@ -1,5 +1,5 @@
 # Configurations for SSH related things
-if [ -z "$SSH_KEEPASSXC" ]; then
+if [ -z "${SSH_KEEPASSXC+x}" ]; then
     # Use Better SSH Key Handling if KeepassXC isn't managing it
     alias ssh="fancy_ssh"
     alias ssh-add="fancy_sshadd"
@@ -11,7 +11,7 @@ alias scp='scp -o ControlMaster=no'
 alias unsafe_ssh='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
 
 # Set the SSH_PRIMARY_AUTH_KEY
-if [ -z "$SSH_PRIMARY_AUTH_KEY" ]; then
+if [ -z "${SSH_PRIMARY_AUTH_KEY+x}" ]; then
     for key in "$HOME/.ssh/id_ed25519"; do
         if [ -f "$key" ]; then
             export SSH_PRIMARY_AUTH_KEY="$key"
@@ -20,7 +20,7 @@ if [ -z "$SSH_PRIMARY_AUTH_KEY" ]; then
     done
 fi
 if [ -n "$SSH_PRIMARY_AUTH_KEY" ]; then
-    if [ -z "$SSH_PRIMARY_AUTH_ID" ]; then
+    if [ -z "${SSH_PRIMARY_AUTH_ID+x}" ]; then
         if [ -f "$SSH_PRIMARY_AUTH_KEY" ]; then
             export SSH_PRIMARY_AUTH_ID=$(ssh-keygen -l -f "$SSH_PRIMARY_AUTH_KEY" | awk '{print $2}')
         fi
@@ -54,7 +54,7 @@ function fancy_ssh() {
     # Check host status
     if [[ $# != 0 ]]; then
         target_host=`command ssh -G "$@" |grep -e ^hostname -e ^port |awk '{print $2}' |xargs echo`
-        if [ ! -z "$target_host" ]; then
+        if [ ! -z "${target_host+x}" ]; then
             _set_win_title "$target_host"
         fi
     fi
diff --git a/shell.d/40-fix-ssh-auth-sock.sh b/shell.d/40-fix-ssh-auth-sock.sh
@@ -6,7 +6,7 @@ if test "$SSH_AUTH_SOCK" ; then
     if [ -L "$SSH_AUTH_SOCK" ]; then
         sock_path=$(ls -l ~/.ssh/ssh_auth_sock |awk '{print $NF}'| head -1);
     fi
-    if [ -z "$sock_path" ] || [ basename "$sock_path" != "ssh_auth_sock" ]; then
+    if [ -z "${sock_path+x}" ] || [ basename "$sock_path" != "ssh_auth_sock" ]; then
         ln -sf $SSH_AUTH_SOCK ~/.ssh/ssh_auth_sock
     fi
 fi
diff --git a/shell.d/95-perl.sh b/shell.d/95-perl.sh
@@ -1,5 +1,6 @@
 # Perl Brew
 if [ -f ~/perl5/perlbrew/etc/bashrc ]; then
+    set +u
     source ~/perl5/perlbrew/etc/bashrc
 elif [ -d ~/perl5 ] && perl -Mlocal::lib &> /dev/null; then
     eval $(perl -Mlocal::lib)
diff --git a/shell.d/99-aliases.sh b/shell.d/99-aliases.sh
@@ -13,7 +13,7 @@ elif hash exa &> /dev/null; then
     alias ls='exa --time-style=long-iso -F --color=auto --icons'
 elif hash gls &> /dev/null; then
     alias ls='gls --time-style=long-iso -F --color'
-elif [ "$HOSTOS" == "OpenBSD" ] || [ "$HOSTOS" == "FreeBSD" ]; then
+elif [ "$HOSTOS" = "OpenBSD" ] || [ "$HOSTOS" = "FreeBSD" ]; then
     alias ls="ls -FG -D '%F %T'"
 else
     alias ls='ls --time-style=long-iso -F --color'
diff --git a/zsh.d/01-oh-my-zsh.sh b/zsh.d/01-oh-my-zsh.sh
@@ -0,0 +1,22 @@
+# Path to your Oh My Zsh installation.
+ZSH="$HOME/.oh-my-zsh"
+if [ -d "$ZSH" ]; then
+    export ZSH;
+
+    # OMZ Themes - https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+    ZSH_THEME="re5et"
+
+    # OMZ Settings
+    HIST_STAMPS="yyyy/mm/dd"
+    ZOXIDE_CMD_OVERRIDE="cd"
+
+    # Plugins
+    plugins=(aliases asdf aws battery brew colored-man-pages colorize docker docker-compose emoji-clock fzf gh git git-prompt gitignore gnu-utils golang istioctl iterm2 kubectl macos perl podman postgres ssh themes tmux zoxide)
+
+    set +u
+    source $ZSH/oh-my-zsh.sh
+
+    # User configuration
+    export ZSH_COLORIZE_STYLE="monokai"
+    export ZSH_COLORIZE_CHROMA_FORMATTER=terminal256
+fi
diff --git a/zsh.d/10-zsh-extensions.sh b/zsh.d/10-zsh-extensions.sh
@@ -0,0 +1,21 @@
+# Load ZSH Extensions
+zexts=()
+if hash brew &> /dev/null; then
+    # zsh-completion
+    zcmplt="$(brew --prefix)/share/zsh-completions"
+    if [ -d "$zcmplt" ]; then
+        FPATH="$zcmplt:$FPATH"
+        autoload -Uz compinit
+        compinit
+    fi
+
+
+    # zsh extensions
+    zexts+=(
+        "$(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+        "$(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
+    )
+fi
+for ext in $zexts; do
+    [ -f "$ext" ] && . "$ext"
+done
diff --git a/zshrc b/zshrc
@@ -0,0 +1,35 @@
+# ZSH Profile
+#--------------
+
+# Enable Debugging in the Shell with =1
+DEBUG=0
+
+if [[ -o interactive ]]; then
+    # Interactive session, load ALL THE THINGS!
+    set -u
+    for rc in ~/.shell.d/*.sh; do
+        file=$(basename "$rc")
+        [[ $file == 99* ]] && continue
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
+    for rc in ~/.zsh.d/*.sh; do
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
+    for rc in ~/.shell.d/9*.sh; do
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
+    (( $DEBUG )) && echo "Loaded fully interactive."
+else
+    # Non-interactive, sparse load
+    for rc in ~/.shell.d/{0,9}*.sh; do
+        (( $DEBUG )) && echo "rc loading '$rc'";
+        source $rc;
+    done;
+fi;
+
+# Clear any bad RC's
+true;
+# vim:ft=sh

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ COMPLETION_SCRIPTS="`
`6`	`6`	`/opt/local/etc/bash_completion`
`7`	`7`	`/opt/local/etc/profile.d/bash_completion.sh`
`8`	`8`	`/etc/bash_completion.d/git`
`9`		`- $HOMEBREW_PREFIX/etc/bash_completion`
`10`		`- $HOMEBREW_PREFIX/etc/profile.d/bash_completion.sh`
`11`	`9`	`"`
`12`	`10`
`13`	`11`	`for file in $COMPLETION_SCRIPTS; do`