Merge branch 'master' into renovate/major-24-major

Author: sammcj

.gitignore

@@ -193,3 +193,6 @@ hugo_stats.json
 hugo.linux
 hugo.darwin
 /.hugo_build.lock
+
+# aws thing I'm trying
+update-aws-creds.sh

0-paths.rc

@@ -56,3 +56,6 @@ esac
 export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
 export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
 export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+
+# to fix Library not loaded: @rpath/libllama.dylib
+export PATH="${HOME}/git/llama.cpp/bin:$PATH"

1-zgen.rc

@@ -40,32 +40,14 @@ if ! zgen saved; then
     zsh-users/zsh-history-substring-search
     zdharma-continuum/fast-syntax-highlighting
 
-    ocodo/ollama_zsh_completion
-
     # git related
     peterhurford/git-it-on.zsh
 
     # fzf wrappers
-    sunlei/zsh-ssh
     bigH/git-fuzzy
 EOPLUGINS
-
-  # olivierverdier/zsh-git-prompt # hasn't been updated in 9 years
-
-  # MichaelAquilina/zsh-you-should-us
-  # paulirish/git-open
-  # lukechilds/zsh-better-npm-completion
-  # 3v1n0/zsh-bash-completions-fallback
-  # mrkmg/borgbackup-zsh-completion
-  # torifat/npms
-
-  ## zsh completion generator ##
-  # zgen load RobSis/zsh-completion-generator # Disabled for now as was the cause of 25% of my load time
-
-  ## Not in use at present ##
-  # nnao45/zsh-kubectl-completion
-  # trejo08/kubecolor-zsh
-  # ascii-soup/zsh-url-highlighter
+  # sunlei/zsh-ssh
+  # ocodo/ollama_zsh_completion
 
   # save zgen cache
   zgen save

14-source-files.rc

@@ -8,13 +8,13 @@ eval "$(/opt/homebrew/bin/fnm env --use-on-cd --corepack-enabled)"
 eval "$(saml2aws --completion-script-zsh)"
 
 #asdf
-. /opt/homebrew/opt/asdf/libexec/asdf.sh
+# . /opt/homebrew/opt/asdf/libexec/asdf.sh
 
 #pyenv
 export PYENV_ROOT="$HOME/.pyenv"
 command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
-# uv
+
 . ~/.venv/bin/activate
 
 # # pnpm
@@ -30,6 +30,6 @@ eval "$(pyenv init -)"
 # nav bindkeys
 
 #cargo
-if [ -d "$HOME/.cargo/env" ]; then
+if [ -f "$HOME/.cargo/env" ]; then
   . "$HOME/.cargo/env"
 fi

4-aliases.rc

@@ -92,7 +92,7 @@ alias flushdns='sudo discoveryutil udnsflushcaches'
 alias httpserver='sudo python3 -m http.server 80'
 alias cc='colorize.py'
 alias rmid="ssh-keygen -R"
-# alias aria="aria2c -s 5 -j 5 -x 5 -c --enable-http-pipelining=true --http-accept-gzip=true --max-connection-per-server=10"
+# alias aria="aria2c -s 5 -j 5 -x 5 -c --enable-http-pipelining=true --http-accept-gzip=true --max-connection-per-server=10 --content-disposition-default-utf8=true"
 # alias a=aria
 alias dmesg="dmesg -LT"
 alias cpuinfo="sysctl -n machdep.cpu.brand_string"
@@ -197,7 +197,11 @@ alias rotate_min_supports='tweaker3 -vb -x -min sur -i'
 
 alias obsidian='cd /Users/samm/Library/Mobile\ Documents/iCloud~md~obsidian/Documents/Main && ls -ltarh'
 
-# ML / Github Copilot
+# ML / AI
+# shellcheck disable=SC2139
+alias clinerules="code /Users/samm/Library/Mobile\ Documents/com\~apple\~CloudDocs/Documents/Cline"
+alias clinerulesd="cd /Users/samm/Library/Mobile\ Documents/com\~apple\~CloudDocs/Documents/Cline"
+alias sync_ollama_models="${HOME}/git/sammcj/scripts/ollama/export_ollama_model.py"
 alias copilot="gh copilot suggest -t shell"
 alias copilot-explain="gh copilot explain"
 alias '??'='copilot'

5-exports.rc

@@ -12,7 +12,8 @@ export MU_REPO_SERIAL=false
 export EDITOR=vim
 
 # colima / docker
-export DOCKER_HOST="unix://$HOME/.colima/docker.sock"
+# export DOCKER_HOST="unix://$HOME/.colima/docker.sock"
+# export DOCKER_HOST="unix:///Users/samm/.colima/default/docker.sock"
 
 # Tells 'less' not to paginate if less than a page
 export LESS="-F -X $LESS"

9-functions.rc

@@ -1109,6 +1109,9 @@ function ba() {
   # link all ollama models to lm-studio
   llamalink >>"${log_file}" 2>&1 &
 
+  # update vscode packages
+  code --update-extensions >>"${log_file}" 2>&1 &
+
   # update homebrew and all apps
   brew update >>"${error_log}" 2>&1
 
@@ -1416,18 +1419,61 @@ function touchid_sudo() {
 }
 
 a() {
-  # Run aria2c with the specified options
-  aria2c \
-    --split=12 \
-    --always-resume=true \
-    --enable-http-pipelining=true \
-    --http-accept-gzip=true \
-    --max-connection-per-server=10 \
-    --max-concurrent-downloads=8 \
-    --auto-file-renaming=false \
-    "$1"
+  # Extract filename from the URL (the part after the last slash)
+  local filename
+  filename=$(basename "$1")
+
+  # Base aria2c options
+  local aria_opts=(
+    --split=16
+    --always-resume=true
+    --max-tries=15
+    --retry-wait=3
+    --enable-http-pipelining=true
+    --http-accept-gzip=true
+    --max-connection-per-server=16
+    --max-concurrent-downloads=5
+    --min-split-size=10M
+    --auto-file-renaming=false
+    --content-disposition-default-utf8=true
+    --disk-cache=64M
+    --file-allocation=prealloc
+    --out="$filename"
+  )
 
-  echo "downloaded ${1}"
+  # Check if URL is from Huggingface
+  if [[ "$1" == *"huggingface.co"* ]] || [[ "$1" == *"hf.co"* ]]; then
+    # Check if HUGGINGFACE_TOKEN is set
+    if [ -z "${HUGGINGFACE_TOKEN}" ]; then
+      echo "Warning: HUGGINGFACE_TOKEN is not set. You may experience rate limiting."
+    else
+      # Verify token is valid by making a test request to the newer endpoint
+      echo "Verifying Huggingface token..."
+      local token_check
+      token_check=$(curl -s -I -H "Authorization: Bearer ${HUGGINGFACE_TOKEN}" "https://huggingface.co/api/whoami-v2" | grep -c "HTTP/2 200")
+
+      if [ "$token_check" -eq 1 ]; then
+        echo "✅ Huggingface token is valid."
+        aria_opts+=(--header="Authorization: Bearer ${HUGGINGFACE_TOKEN}")
+      else
+        echo "⚠️ Huggingface token appears to be invalid. Downloads may be rate limited."
+        echo "Note: If your token starts with 'hf_', this is expected format for newer tokens."
+        # shellcheck disable=SC2162
+        read -p "Continue anyway? (y/n): " confirm
+        if [[ "$confirm" != "y" ]]; then
+          echo "Download cancelled."
+          return 1
+        fi
+        # Add the token anyway as it might still work for downloads even if validation fails
+        aria_opts+=(--header="Authorization: Bearer ${HUGGINGFACE_TOKEN}")
+      fi
+    fi
+  fi
+
+  # Run aria2c with the assembled options
+  aria2c "${aria_opts[@]}" "$1"
+
+  echo "downloaded ${1} as ${filename}"
 }
 
 rename_files() {
@@ -1634,6 +1680,10 @@ function aws-sso() {
 }
 alias aws-ai="aws-sso aisandpit"
 
+function aws-nas() {
+  /Users/samm/Library/Mobile\ Documents/com~apple~CloudDocs/Dropbox\ Import/dotfiles/shell_config/update-aws-creds.sh aisandpit
+}
+
 ollama_extend_models() {
   local ctx_size=${1:-32768}
 
@@ -1666,3 +1716,11 @@ EOF
     echo "Created extended model: $base_name-$ctx_size:$variant"
   done
 }
+
+if_not_in_vscode() {
+  # if not running in vscode, run the rest of the arguments
+  # requires setting RUNNING_IN_VSCODE to true in vscode's terminal env settings
+  if [ -z "$RUNNING_IN_VSCODE" ]; then
+    "$@"
+  fi
+}

zshrc

@@ -1,11 +1,28 @@
-# shellcheck disable=SC2148 disable=SC1090 shell=bash
+# Amazon Q pre block. Keep at the top of this file.
+### q slow debugging ###
+# date
+# echo "STARTING: amazon q pre block loading from .zshrc"
+# # set zsh to echo verbose
+# set -x
+# ###
+# [[ -f "${HOME}/Library/Application Support/amazon-q/shell/zshrc.pre.zsh" ]] && builtin source "${HOME}/Library/Application Support/amazon-q/shell/zshrc.pre.zsh"
+# ### q slow debugging ###
+# date
+# # unset zsh to echo verbose
+# set +x
+# echo "DONE: amazon q pre block loaded from .zshrc"
+###
+## AMAZON Q MAKES EVERYTHING SLOWWWWWW
 
+# shellcheck disable=SC2148 disable=SC1090 shell=bash
 # ~/.zshrc
 
 # set +x
 
-set +m # Make jobs quiet by default
-
+# only run set +m if we're interactive
+if [[ $- == *i* ]]; then
+    set +m # Make jobs quiet by default
+fi
 # There is an alias to jump to the directory with the various
 # included zsh configs, simply type `zshconfig` at the prompt.
 
@@ -30,7 +47,7 @@ if [[ -d $HOME/Library/Mobile\ Documents/com\~apple\~CloudDocs/Dropbox\ Import/d
 fi
 
 ## Add ssh keys to agent if not already added
-ssh-add-keys
+# ssh-add-keys # TODO: disabled 2025-03-16 to see if it helps performance, reenable if ssh stops working
 
 ### Below are items added by installer scripts (usually homebrew) ####
 
@@ -40,12 +57,15 @@ source /opt/homebrew/Cellar/fzf/*/shell/key-bindings.zsh
 # Enable direnv - https://direnv.net
 # eval "$(direnv hook zsh)"
 
-test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+if_not_in_vscode bg_silent test -e "${HOME}/.iterm2_shell_integration.zsh" && bg_silent source "${HOME}/.iterm2_shell_integration.zsh"
 
 zstyle ':completion:*' menu select
 fpath+=~/.zfunc
 
-set -m # reenable job output
+# only run set -m if we're interactive
+if [[ $- == *i* ]]; then
+    set -m # reenable job output
+fi
 
 # >>> mamba initialize >>>
 # !! Contents within this block are managed by 'mamba init' !!
@@ -88,14 +108,29 @@ export PATH="$PATH:/Users/samm/Fltr"
 
 # tabtab source for electron-forge package
 # uninstall by removing these lines or running `tabtab uninstall electron-forge`
-[[ -f /Users/samm/.npm/_npx/6913fdfd1ea7a741/node_modules/tabtab/.completions/electron-forge.zsh ]] && . /Users/samm/.npm/_npx/6913fdfd1ea7a741/node_modules/tabtab/.completions/electron-forge.zsh
-autoload -Uz compinit
+# [[ -f /Users/samm/.npm/_npx/6913fdfd1ea7a741/node_modules/tabtab/.completions/electron-forge.zsh ]] && . /Users/samm/.npm/_npx/6913fdfd1ea7a741/node_modules/tabtab/.completions/electron-forge.zsh
 
 # Added by LM Studio CLI tool (lms)
 export PATH="$PATH:/Users/samm/.cache/lm-studio/bin"
+if [ -f "/Users/samm/.config/fabric/fabric-bootstrap.inc" ] && if_not_in_vscode; then . "/Users/samm/.config/fabric/fabric-bootstrap.inc"; fi
 
-####### PROFILING #######
-# Uncomment below to enable debug timing
+fpath+=~/.zfunc
+
+export PATH="/opt/homebrew/opt/tcl-tk@8/bin:$PATH"
+
+# Amazon Q post block. Keep at the bottom of this file.
+# # The next line updates PATH for the Google Cloud SDK.
+if [ -f '/Users/samm/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/samm/Downloads/google-cloud-sdk/path.zsh.inc'; fi
+
+# The next line enables shell command completion for gcloud.
+if [ -f '/Users/samm/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/samm/Downloads/google-cloud-sdk/completion.zsh.inc'; fi
+
+# # Amazon Q post block. Keep at the bottom of this file.
+# [[ -f "${HOME}/Library/Application Support/amazon-q/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/amazon-q/shell/zshrc.post.zsh"
+
+# ####### PROFILING #######
+# # Uncomment below to enable debug timing
 # zprof
-#### END PROFILING ######
-if [ -f "/Users/samm/.config/fabric/fabric-bootstrap.inc" ]; then . "/Users/samm/.config/fabric/fabric-bootstrap.inc"; fi
+# #### END PROFILING ######
+
+# echo ".zshrc loaded now"