[automated commit or incremental update]

Author: sammcj

1-zgen.rc

@@ -18,37 +18,55 @@ export SHOW_AWS_PROMPT=false
 # compinit -u
 
 if ! zgen saved; then
-  # echo "Creating a zgen save"
+  # Use mkdir as an atomic lock to prevent concurrent zgen save races
+  _zgen_lockdir="${HOME}/.zgen/init.zsh.lock"
+  if mkdir "$_zgen_lockdir" 2>/dev/null; then
+    trap 'rmdir "$_zgen_lockdir" 2>/dev/null' EXIT INT TERM
 
-  ## load omz plugins ##
-  zgen oh-my-zsh plugins/fzf # https://github.com/ohmyzsh/ohmyzsh/issues/12412
-  zgen oh-my-zsh plugins/command-not-found
+    ## load omz plugins ##
+    zgen oh-my-zsh plugins/fzf # https://github.com/ohmyzsh/ohmyzsh/issues/12412
+    zgen oh-my-zsh plugins/command-not-found
 
-  if [ -z "$RUNNING_IN_VSCODE" ]; then
-    zgen oh-my-zsh plugins/docker-compose
-    zgen oh-my-zsh plugins/aws
-    zgen oh-my-zsh plugins/colored-man-pages
-    zgen oh-my-zsh plugins/gitfast
-  fi
+    if [ -z "$RUNNING_IN_VSCODE" ]; then
+      zgen oh-my-zsh plugins/docker-compose
+      zgen oh-my-zsh plugins/aws
+      zgen oh-my-zsh plugins/colored-man-pages
+      zgen oh-my-zsh plugins/gitfast
+    fi
 
-  ## load normal plugins ##
-  zgen loadall <<EOPLUGINS
-    zsh-users/zsh-completions src
-    zsh-users/zsh-autosuggestions
-    zsh-users/zsh-history-substring-search
-    zdharma-continuum/fast-syntax-highlighting
+    ## load normal plugins ##
+    zgen loadall <<EOPLUGINS
+      zsh-users/zsh-completions src
+      zsh-users/zsh-autosuggestions
+      zsh-users/zsh-history-substring-search
+      zdharma-continuum/fast-syntax-highlighting
 EOPLUGINS
 
-  if [ -z "$RUNNING_IN_VSCODE" ]; then
-    zgen loadall <<EOPLUGINS
+    if [ -z "$RUNNING_IN_VSCODE" ]; then
+      zgen loadall <<EOPLUGINS
 
-    # git related
-    peterhurford/git-it-on.zsh
-    bigH/git-fuzzy
+      # git related
+      peterhurford/git-it-on.zsh
+      bigH/git-fuzzy
 EOPLUGINS
     fi
 
-  # save zgen cache
-  zgen save
+    # save zgen cache
+    zgen save
+
+    rmdir "$_zgen_lockdir" 2>/dev/null
+    trap - EXIT INT TERM
+  else
+    # Another shell is already regenerating init.zsh - warn if the lock looks stale
+    zmodload -F zsh/stat b:zstat 2>/dev/null
+    if [[ -d "$_zgen_lockdir" ]]; then
+      _lock_mtime=$(zstat +mtime "$_zgen_lockdir" 2>/dev/null)
+      if [[ -n "$_lock_mtime" ]] && (( EPOCHSECONDS - _lock_mtime > 60 )); then
+        echo "zgen: stale lock detected ($(( EPOCHSECONDS - _lock_mtime ))s old). Run: rmdir ~/.zgen/init.zsh.lock" >&2
+      fi
+      unset _lock_mtime
+    fi
+  fi
+  unset _zgen_lockdir
 fi
 

16-ai.rc

@@ -39,6 +39,8 @@ alias ccrd='ccr --dangerously-skip-permissions'
 alias ccra='CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1 ccrd'
 alias claude-history='claude-code-viewer' # requires: pnpm install -g @kimuson/claude-code-viewer@latest
 
+alias oc='opencode'
+
 # Claude Code non-interactive functions
 alias '??'='claude_helper'
 alias '??!'='claude_helper_exec'
@@ -288,3 +290,9 @@ EOF
 #   local -r prompt=$(git diff --cached --name-only | xargs -I{} echo "Why did you change {}?")
 #   local -r api_url="http://localhost:11434/api/generate"
 # }
+
+# Commands that only run within Claude Code sessions
+# if [[ -n "$CLAUDECODE" ]]; then
+
+#   eval "$(direnv hook zsh)" # https://github.com/direnv/direnv
+# fi

4-aliases.rc

@@ -56,7 +56,7 @@ alias gitwip="git add .; git commit -m '[automated commit or incremental update]
 alias hotfix-checkout="checkout-hotfix"
 alias hotfix-commit="commit-hotfix"
 alias hotfix="checkout-hotfix"
-alias L="ls -ltarh"
+alias ll="ls -ltarh"
 alias j="checkout-jira"
 alias jira-checkout="checkout-jira"
 alias jira-commit="commit-jira"
@@ -180,6 +180,7 @@ alias -s {jpg,jpeg,png,gif,bmp,ico,svg,webp}=open
 
 # Glow for Markdown
 alias -s md=glow
+alias mdpdf='~/.claude/skills/extract-wisdom/scripts/render_pdf.sh'
 
 # Networking
 alias ip6="curl -s 6.ipquail.com/ip"

5-exports.rc

@@ -81,3 +81,5 @@ export FFMPEG_DIR="/opt/homebrew/opt/ffmpeg"
 # Custom user locate path
 export LOCATE_PATH="$HOME/.locatedb"
 
+# opencode
+export PATH=/Users/samm/.opencode/bin:$PATH

9-functions.rc

@@ -1442,12 +1442,12 @@ nas_dcup() {
 # Yazi https://github.com/sxyazi/yazi
 # https://github.com/sxyazi/yazi/tree/main/config/docs
 function y() {
-  tmp="$(mktemp -t "yazi-cwd.XXXXX")"
-  yazi --cwd-file="$tmp"
-  if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
-    cd -- "$cwd"
-  fi
-  rm -f -- "$tmp"
+	local tmp
+  tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+	command yazi "$@" --cwd-file="$tmp"
+	IFS= read -r -d '' cwd < "$tmp"
+	[ "$cwd" != "$PWD" ] && [ -d "$cwd" ] && builtin cd -- "$cwd"
+	rm -f -- "$tmp"
 }
 
 function brewbackup() {
@@ -1717,6 +1717,7 @@ EOF
   echo "source $aws_creds_file"
 }
 alias aws-ai="aws-sso aisandpit"
+alias aws-kbdev="aws-sso kb-dev"
 # shellcheck disable=SC2139
 alias awl="source ${HOME}/.tmp/awltmp"
 
@@ -1773,31 +1774,6 @@ cline-workflows() {
   cp -r $SOURCE_DIR/*.md $DEST_DIR/
 }
 
-# Track previous directory for z - / cd - functionality
-# Uses chpwd hook so it works with z, cd, pushd, etc.
-typeset -g _ZOXIDE_OLDPWD="$PWD"
-typeset -g _ZOXIDE_CURPWD="$PWD"
-
-_track_directory() {
-  _ZOXIDE_OLDPWD="$_ZOXIDE_CURPWD"
-  _ZOXIDE_CURPWD="$PWD"
-}
-autoload -Uz add-zsh-hook
-add-zsh-hook chpwd _track_directory
-
-# Go to previous directory with z -
-z() {
-  if [[ "$1" == "-" ]]; then
-    if [[ -n "$_ZOXIDE_OLDPWD" && -d "$_ZOXIDE_OLDPWD" ]]; then
-      __zoxide_z "$_ZOXIDE_OLDPWD"
-    else
-      echo "z: no previous directory" >&2
-      return 1
-    fi
-  else
-    __zoxide_z "$@"
-  fi
-}
 
 
 # Quick navigation to git repositories, optionally taking a subdirectory as an argument
@@ -1847,7 +1823,8 @@ npm-global-update() {
     # TODO: switch to pnpm, detect if packages are installed with pnpm or npm and use the appropriate tool or migrated npm packages to pnpm
     # Define allowed package patterns (substring matches)
     local allowed_patterns
-    allowed_patterns=("@anthropic-ai/claude-code" "@google/gemini-cli" "@qwen-code/qwen-code" "ccstatusline" "claude-code-router" "claudekit" "ccusage" "npm-check-updates" "playwright" "ccexp" "vibe-kanban" "@vscode/vsce" "yaml-language-server" "typescript-language-server" "typescript" "corepack" "npm" "pnpm" "jest" "tweakcc" "@modelcontextprotocol/inspector" "happy-coder" "@github/copilot" "cline@nightly" "cline" "@anthropic-ai/sandbox-runtime" "@kimuson/claude-code-viewer@latest" "@mermaid-js/mermaid-cli")
+    allowed_patterns=("@anthropic-ai/claude-code" "@google/gemini-cli" "@qwen-code/qwen-code" "ccstatusline" "claude-code-router" "claudekit" "ccusage" "npm-check-updates" "playwright" "ccexp" "vibe-kanban" "@vscode/vsce" "yaml-language-server" "typescript-language-server" "typescript" "corepack" "npm" "pnpm" "jest" "tweakcc" "@modelcontextprotocol/inspector" "happy-coder" "@github/copilot" "cline@nightly" "cline" "@anthropic-ai/sandbox-runtime" "@kimuson/claude-code-viewer@latest" "@mermaid-js/mermaid-cli"
+    "@googleworkspace/cli")
 
     cspell_packages=( "cspell" "@cspell/dict-en-au" "@cspell/dict-en-gb" "@cspell/dict-companies" "@cspell/dict-html"
                       "@cspell/dict-python" "@cspell/dict-rust" "@cspell/dict-typescript" "@cspell/dict-node" "@cspell/dict-terraform"

ghostty-config

@@ -80,7 +80,7 @@ font-size = 15
 font-feature = -calt
 
 cursor-text = #000000
-auto-update = check
+#auto-update = check
 auto-update-channel = tip
 quit-after-last-window-closed = false
 

zshrc

@@ -105,12 +105,6 @@ fi
 # fi
 # <<< conda initialize <<<
 
-### zoxide ###
-if [ -z "$RUNNING_IN_VSCODE" ]; then
-  eval "$(zoxide init zsh)"
-fi
-### zoxide ###
-
 # Load custom aliases
 export PATH="$PATH:/Users/samm/Fltr"
 
@@ -132,13 +126,6 @@ export PATH="/opt/homebrew/opt/tcl-tk@8/bin:$PATH"
 # The next line enables shell command completion for gcloud.
 # if [ -f '/Users/samm/Downloads/google-cloud-sdk/completion.zsh.inc' ] && if_not_in_vscode; then . '/Users/samm/Downloads/google-cloud-sdk/completion.zsh.inc'; fi
 
-# # Amazon Q post block. Keep at the bottom of this file.
-if [[ "$LOADING_Q" == "true" ]]; then
-# Amazon Q post block. Keep at the bottom of this file.
-  # This is in an if statement because Amazon Q / Kiro CLI is _really_ poorly written and slows down your terminal
-  # See https://github.com/aws/amazon-q-developer-cli/discussions/202
-  [[ -f "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh"
-fi
 
 # ####### PROFILING #######
 # # Uncomment below to enable debug timing
@@ -159,5 +146,41 @@ export PATH="$HOME/.local/bin:$PATH"
 # Added by Antigravity
 # export PATH="/Users/samm/.antigravity/antigravity/bin:$PATH"
 
-# opencode
-export PATH=/Users/samm/.opencode/bin:$PATH
+### zoxide ###
+if [ -z "$RUNNING_IN_VSCODE" ]; then
+  eval "$(zoxide init zsh)"
+
+  # Override z to support z - (go to previous directory)
+  typeset -g _ZOXIDE_OLDPWD="$PWD"
+  typeset -g _ZOXIDE_CURPWD="$PWD"
+
+  _track_directory() {
+    _ZOXIDE_OLDPWD="$_ZOXIDE_CURPWD"
+    _ZOXIDE_CURPWD="$PWD"
+  }
+  autoload -Uz add-zsh-hook
+  add-zsh-hook chpwd _track_directory
+
+  z() {
+    if [[ "$1" == "-" ]]; then
+      if [[ -n "$_ZOXIDE_OLDPWD" && -d "$_ZOXIDE_OLDPWD" ]]; then
+        __zoxide_z "$_ZOXIDE_OLDPWD"
+      else
+        echo "z: no previous directory" >&2
+        return 1
+      fi
+    else
+      __zoxide_z "$@"
+    fi
+  }
+fi
+### zoxide ###
+
+
+# # Amazon Q post block. Keep at the bottom of this file.
+if [[ "$LOADING_Q" == "true" ]]; then
+# Amazon Q post block. Keep at the bottom of this file.
+  # This is in an if statement because Amazon Q / Kiro CLI is _really_ poorly written and slows down your terminal
+  # See https://github.com/aws/amazon-q-developer-cli/discussions/202
+  [[ -f "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh"
+fi