chore(docker-compose): Tighten up the table formatting in the README

.github/dependabot.yml

@@ -6,23 +6,9 @@ updates:
       interval: "weekly"
       day: "sunday"
     labels: []
-    groups:
-      gha-minor:
-        patterns:
-          - "*"
-        update-types:
-          - minor
-          - patch
   - package-ecosystem: "pip"
     directory: "/.github/workflows/dependencies"
     schedule:
       interval: "weekly"
       day: "sunday"
     labels: []
-    groups:
-      py-minor:
-        patterns:
-          - "*"
-        update-types:
-          - minor
-          - patch

.github/dependencies.yml

@@ -46,10 +46,9 @@ dependencies:
   plugins/z:
     branch: master
     repo: agkozak/zsh-z
-    version: 102fb78036ed76feedf623907483691777a1d510
+    version: acd0e1984df350c189f8f9c4956ec586b6c73fca
     precopy: |
       set -e
-      rm -r tests
       test -e README.md && mv -f README.md MANUAL.md
     postcopy: |
       set -e

.github/workflows/dependencies.yml

@@ -16,12 +16,12 @@ jobs:
       contents: write # this is needed to push commits and branches
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
       - name: Authenticate as @ohmyzsh
@@ -31,7 +31,7 @@ jobs:
           client-id: ${{ secrets.OHMYZSH_CLIENT_ID }}
           private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
       - name: Setup Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.12"
           cache: "pip"

.github/workflows/dependencies/requirements.txt

@@ -1,6 +1,6 @@
-certifi==2026.7.22
+certifi==2026.4.22
-charset-normalizer==3.5.1
+charset-normalizer==3.4.7
-idna==3.19
+idna==3.15
 PyYAML==6.0.3
 requests==2.34.2
 semver==3.0.4

.github/workflows/installer.yml

@@ -26,12 +26,12 @@ jobs:
           - macos-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
       - name: Set up git repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install zsh
         if: runner.os == 'Linux'
         run: sudo apt-get update; sudo apt-get install zsh
@@ -47,12 +47,12 @@ jobs:
       - test
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install Vercel CLI
         run: npm install -g vercel
       - name: Setup project and deploy

.github/workflows/main.yml

@@ -24,12 +24,12 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
       - name: Set up git repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Install zsh
         run: sudo apt-get update; sudo apt-get install zsh
       - name: Check syntax

.github/workflows/project.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
       - name: Authenticate as @ohmyzsh

.github/workflows/scorecard.yml

@@ -36,17 +36,17 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -60,6 +60,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         with:
           sarif_file: results.sarif

lib/cli.zsh

@@ -519,7 +519,7 @@ function _omz::plugin::load {
     # Check if it has completion to reload compinit
     local -a comp_files
     comp_files=($base/_*(N))
-    (( has_completion )) || has_completion=$(( $#comp_files > 0 ))
+    has_completion=$(( $#comp_files > 0 ))
 
     # Load the plugin
     if [[ -f "$base/$plugin.plugin.zsh" ]]; then

lib/diagnostics.zsh

@@ -271,7 +271,7 @@ function _omz_diag_dump_check_core_commands() {
     unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
     zle zmodload zparseopts zregexparse zstyle )
   if is-at-least 5.1; then
-    reserved_words+=( declare export integer float local readonly typeset )
+    reserved_word+=( declare export integer float local readonly typeset )
   else
     builtins+=( declare export integer float local readonly typeset )
   fi

lib/git.zsh

@@ -39,26 +39,6 @@ function _omz_git_prompt_info() {
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref//\%/%%}${upstream//\%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
-# Match an extended regular expression against a subject, forcing the C locale
-# only for the duration of the call.
-#
-# OHMYZSH-13330: zsh's "=~" operator delegates to the C library regex, which
-# aborts with REG_ILLSEQ when the subject contains an invalid byte sequence
-# under a multibyte locale (e.g. a filename with non-UTF-8 bytes in `git
-# status` output). Forcing the C locale makes every byte a valid character,
-# so the regex matching never fails that way. `git status --porcelain` is
-# locale-independent, so this does not change the parsed output.
-#
-# OHMYZSH-13985: the locale must be scoped to this function and not set for
-# the whole caller. Assigning LC_ALL makes zsh re-run setlocale() right away,
-# so leaving it set while the rest of the caller runs breaks multibyte
-# handling there — most visibly, `echo` refuses to expand Unicode escapes in
-# theme prompt symbols ("character not in range").
-function _omz_git_prompt_status_match() {
-  local -x LC_ALL=C
-  [[ "$1" =~ "$2" ]]
-}
-
 function _omz_git_prompt_status() {
   [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
@@ -124,11 +104,11 @@ function _omz_git_prompt_status() {
   status_lines=("${(@f)${status_text}}")
 
   # If the tracking line exists, get and parse it
-  if _omz_git_prompt_status_match "$status_lines[1]" "^## [^ ]+ \[(.*)\]"; then
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
     local branch_statuses
     branch_statuses=("${(@s/,/)match}")
     for branch_status in $branch_statuses; do
-      if ! _omz_git_prompt_status_match "$branch_status" "(behind|diverged|ahead) ([0-9]+)?"; then
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
         continue
       fi
       local last_parsed_status=$prefix_constant_map[$match[1]]
@@ -141,7 +121,7 @@ function _omz_git_prompt_status() {
     local status_constant="${prefix_constant_map[$status_prefix]}"
     local status_regex=$'(^|\n)'"$status_prefix"
 
-    if _omz_git_prompt_status_match "$status_text" "$status_regex"; then
+    if [[ "$status_text" =~ $status_regex ]]; then
       statuses_seen[$status_constant]=1
     fi
   done

oh-my-zsh.sh

@@ -124,11 +124,9 @@ fi
 if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
   source "$ZSH/lib/compfix.zsh"
   # Load only from secure directories
-  # Reset the flag compinit sets when -i excludes insecure entries
-  unset _comp_secure
   compinit -i -d "$ZSH_COMPDUMP"
   # If completion insecurities exist, warn the user
-  [[ "$_comp_secure" == yes ]] && handle_completion_insecurities &|
+  handle_completion_insecurities &|
 else
   # If the user wants it, load from all found directories
   compinit -u -d "$ZSH_COMPDUMP"

plugins/1password/1password.plugin.zsh

@@ -9,11 +9,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_op" ]]; then
   _comps[op]=_op
 fi
 
-zmodload -F zsh/files b:zf_mv
+op completion zsh >| "$ZSH_CACHE_DIR/completions/_op" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_op"
-  zf_mv -f -- =( op completion zsh ) "$TMPPREFIX"
-} &|
 
 # Load opswd function
 autoload -Uz opswd

plugins/archlinux/README.md

@@ -21,7 +21,7 @@ plugins=(... archlinux)
 | pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
 | paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
 | paclr        | `sudo pacman -Scc`                     | Remove all files from the cache                                  |
-| paclsorphans | `pacman -Qdt`                          | List all orphaned packages                                       |
+| paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
 | pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
 | pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
 | pacrem       | `sudo pacman -Rns`                     | Remove packages, including its settings and dependencies         |

plugins/archlinux/archlinux.plugin.zsh

@@ -16,7 +16,7 @@ alias pacloc='pacman -Qi'
 alias paclocs='pacman -Qs'
 alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
-alias paclsorphans='pacman -Qdt'
+alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'

plugins/arduino-cli/arduino-cli.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_arduino-cli" ]]; then
 fi
 
 # Generate and load arduino-cli completion
-zmodload -F zsh/files b:zf_mv
+arduino-cli completion zsh >! "$ZSH_CACHE_DIR/completions/_arduino-cli" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_arduino-cli"
-  zf_mv -f -- =( arduino-cli completion zsh ) "$TMPPREFIX"
-} &|

plugins/argocd/argocd.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_argocd" ]]; then
   _comps[argocd]=_argocd
 fi
 
-zmodload -F zsh/files b:zf_mv
+argocd completion zsh >| "$ZSH_CACHE_DIR/completions/_argocd" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_argocd"
-  zf_mv -f -- =( argocd completion zsh ) "$TMPPREFIX"
-} &|

plugins/asdf/asdf.plugin.zsh

@@ -12,8 +12,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_asdf" ]]; then
   autoload -Uz _asdf
   _comps[asdf]=_asdf
 fi
-zmodload -F zsh/files b:zf_mv
+asdf completion zsh >| "$ZSH_CACHE_DIR/completions/_asdf" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_asdf"
-  zf_mv -f -- =( asdf completion zsh ) "$TMPPREFIX"
-} &|

plugins/aws/aws.plugin.zsh

@@ -9,14 +9,14 @@ function agr() {
 # Update state file if enabled
 function _aws_update_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d "$(dirname "${AWS_STATE_FILE}")" || return 1
+    test -d $(dirname ${AWS_STATE_FILE}) || return 1
     echo "${AWS_PROFILE} ${AWS_REGION}" > "${AWS_STATE_FILE}"
   fi
 }
 
 function _aws_clear_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d "$(dirname "${AWS_STATE_FILE}")" || return 1
+    test -d $(dirname ${AWS_STATE_FILE}) || return 1
     echo -n > "${AWS_STATE_FILE}"
   fi
 }
@@ -69,7 +69,7 @@ function asr() {
   local -a available_regions
   available_regions=($(aws_regions))
   if [[ -z "${available_regions[(r)$1]}" ]]; then
-    echo "${fg[red]}Available regions: \n$(aws_regions)${reset_color}" >&2
+    echo "${fg[red]}Available regions: \n$(aws_regions)"
     return 1
   fi
 

plugins/buf/buf.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_buf" ]]; then
 fi
 
 # Generate and load buf completion
-zmodload -F zsh/files b:zf_mv
+buf completion zsh >! "$ZSH_CACHE_DIR/completions/_buf" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_buf"
-  zf_mv -f -- =( buf completion zsh ) "$TMPPREFIX"
-} &|

plugins/bun/bun.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_bun" ]]; then
   _comps[bun]=_bun
 fi
 
-zmodload -F zsh/files b:zf_mv
+SHELL=zsh bun completions >| "$ZSH_CACHE_DIR/completions/_bun" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_bun"
-  zf_mv -f -- =( SHELL=zsh bun completions ) "$TMPPREFIX"
-} &|

plugins/bundler/README.md

@@ -22,8 +22,7 @@ plugins=(... bundler)
 | `bo`   | `bundle open`     | Opens the source directory for a gem in your bundle      |
 | `bout` | `bundle outdated` | List installed gems with newer versions available        |
 | `bp`   | `bundle package`  | Package your needed .gem files into your application     |
-| `bu`   | `bundle update`   | Update your gems to the latest available versions          |
+| `bu`   | `bundle update --all` | Update your gems to the latest available versions    |
-| `bua`  | `bundle update --all` | Update all gems to the latest available versions      |
 
 ## Gem wrapper
 

plugins/bundler/bundler.plugin.zsh

@@ -9,8 +9,7 @@ alias bl="bundle list"
 alias bo="bundle open"
 alias bout="bundle outdated"
 alias bp="bundle package"
-alias bu="bundle update"
+alias bu="bundle update --all"
-alias bua="bundle update --all"
 
 ## Gem wrapper
 

plugins/cdk/README.md

@@ -1,32 +0,0 @@
-# AWS CDK Plugin
-
-This plugin provides aliases and autocompletion for the [AWS Cloud Development Kit (CDK)](https://aws.amazon.com/cdk/) CLI.
-
-## Usage
-
-Add `cdk` to the plugins array in your `.zshrc`:
-
-```zsh
-plugins=(... cdk)
-```
-
-## Requirements
-
-- [AWS CDK CLI](https://docs.aws.amazon.com/cdk/v2/guide/getting_started.html) installed (`npm install -g aws-cdk`)
-
-## Aliases
-
-| Alias        | Command           | Description                        |
-| ------------ | ----------------- | ---------------------------------- |
-| `cdkl`       | `cdk list`        | List all stacks in the app         |
-| `cdksynth`   | `cdk synth`       | Synthesize CloudFormation template |
-| `cdkdiff`    | `cdk diff`        | Compare deployed vs local stack    |
-| `cdkdeploy`  | `cdk deploy`      | Deploy stack to AWS                |
-| `cdkdestroy` | `cdk destroy`     | Destroy deployed stack             |
-| `cdkboot`    | `cdk bootstrap`   | Bootstrap CDK environment          |
-| `cdkdoc`     | `cdk docs`        | Open CDK documentation             |
-| `cdkinit`    | `cdk init`        | Initialize a new CDK project       |
-| `cdkwatch`   | `cdk watch`       | Watch for changes and auto-deploy  |
-| `cdkctx`     | `cdk context`     | Manage cached context values       |
-| `cdkack`     | `cdk acknowledge` | Acknowledge a notice               |
-| `cdkver`     | `cdk --version`   | Print CDK version                  |

plugins/cdk/_cdk

@@ -1,12 +0,0 @@
-#compdef cdk
-
-# Originally found and adapted from: https://github.com/aws/aws-cdk/discussions/24380#discussioncomment-5158176
-
-local -a reply
-local IFS
-IFS=$'\n' reply=($(COMP_CWORD="$((CURRENT-1))" \
-          COMP_LINE="$BUFFER" \
-          COMP_POINT="$CURSOR" \
-          cdk --get-yargs-completions "${words[@]}"))
-
-_describe 'values' reply

plugins/cdk/cdk.plugin.zsh

@@ -1,13 +0,0 @@
-# Aliases
-alias cdkl='cdk list'
-alias cdksynth='cdk synth'
-alias cdkdiff='cdk diff'
-alias cdkdeploy='cdk deploy'
-alias cdkdestroy='cdk destroy'
-alias cdkboot='cdk bootstrap'
-alias cdkdoc='cdk docs'
-alias cdkinit='cdk init'
-alias cdkwatch='cdk watch'
-alias cdkctx='cdk context'
-alias cdkack='cdk acknowledge'
-alias cdkver='cdk --version'

plugins/charm/charm.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_charm" ]]; then
   _comps[charm]=_charm
 fi
 
-zmodload -F zsh/files b:zf_mv
+charm completion zsh >| "$ZSH_CACHE_DIR/completions/_charm" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_charm"
-  zf_mv -f -- =( charm completion zsh ) "$TMPPREFIX"
-} &|

plugins/chezmoi/chezmoi.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_chezmoi" ]]; then
   _comps[chezmoi]=_chezmoi
 fi
 
-zmodload -F zsh/files b:zf_mv
+chezmoi completion zsh >| "$ZSH_CACHE_DIR/completions/_chezmoi" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_chezmoi"
-  zf_mv -f -- =( chezmoi completion zsh ) "$TMPPREFIX"
-} &|

plugins/codex/README.md

@@ -1,11 +0,0 @@
-# codex Plugin
-
-## Introduction
-
-This `codex` plugin sets up completion for [codex](https://github.com/openai/codex).
-
-To use it, add `codex` to the plugins array of your zshrc file:
-
-```bash
-plugins=(... codex)
-```

plugins/codex/codex.plugin.zsh

@@ -1,18 +0,0 @@
-# COMPLETION FUNCTION
-if (( ! $+commands[codex] )); then
-  return
-fi
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `codex`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_codex" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _codex
-  _comps[codex]=_codex
-fi
-
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_codex"
-  zf_mv -f -- =( codex completion zsh < /dev/null 2> /dev/null ) "$TMPPREFIX"
-} &|

plugins/command-not-found/README.md

@@ -32,6 +32,5 @@ It works out of the box with the command-not-found packages for:
 - [SUSE](https://www.unix.com/man-page/suse/1/command-not-found/)
 - [Gentoo](https://github.com/AndrewAmmerlaan/command-not-found-gentoo/tree/main)
 - [Void Linux](https://codeberg.org/classabbyamp/xbps-command-not-found)
-- [Alpine Linux](https://pkgs.alpinelinux.org/package/edge/main/x86_64/command-not-found)
 
 You can add support for other platforms by submitting a Pull Request.

plugins/command-not-found/command-not-found.plugin.zsh

@@ -74,10 +74,3 @@ if [[ -x /usr/bin/command-not-found ]]; then
     /usr/bin/command-not-found "$1"
   }
 fi
-
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/command-not-found/APKBUILD
-if [[ -x /usr/libexec/command-not-found ]]; then
-  command_not_found_handler() {
-    /usr/libexec/command-not-found "$1"
-  }
-fi

plugins/deno/deno.plugin.zsh

@@ -25,8 +25,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
   _comps[deno]=_deno
 fi
 
-zmodload -F zsh/files b:zf_mv
+deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_deno"
-  zf_mv -f -- =( deno completions zsh ) "$TMPPREFIX"
-} &|

plugins/docker/docker.plugin.zsh

@@ -56,19 +56,14 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_docker" ]]; then
   _comps[docker]=_docker
 fi
 
-zmodload -F zsh/files b:zf_mv
+{
-() {
-
-  local plugin_dir="$1"
-
   # `docker completion` is only available from 23.0.0 on
   # docker version returns `Docker version 24.0.2, build cb74dfcd85`
   # with `s:,:` remove the comma after the version, and select third word of it
   if zstyle -t ':omz:plugins:docker' legacy-completion || \
     ! is-at-least 23.0.0 ${${(s:,:z)"$(command docker --version)"}[3]}; then
-        command cp "${plugin_dir}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
+        command cp "${0:h}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
       else
-        local TMPPREFIX="$ZSH_CACHE_DIR/completions/_docker"
+        command docker completion zsh | tee "$ZSH_CACHE_DIR/completions/_docker" > /dev/null
-        zf_mv -f -- =( command docker completion zsh ) "$TMPPREFIX"
   fi
-} "${0:A:h}" &|
+} &|

plugins/doctl/doctl.plugin.zsh

@@ -14,8 +14,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_doctl" ]]; then
   _comps[doctl]=_doctl
 fi
 
-zmodload -F zsh/files b:zf_mv
+doctl completion zsh >| "$ZSH_CACHE_DIR/completions/_doctl" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_doctl"
-  zf_mv -f -- =( doctl completion zsh ) "$TMPPREFIX"
-} &|

plugins/extract/extract.plugin.zsh

@@ -102,7 +102,7 @@ EOF
       (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$full_path" ;;
       (*.gz) (( $+commands[pigz] )) && pigz -cdk "$full_path" > "${file:t:r}" || gunzip -ck "$full_path" > "${file:t:r}" ;;
       (*.bz2) (( $+commands[pbzip2] )) && pbzip2 -d "$full_path" || bunzip2 "$full_path" ;;
-      (*.xz) xzcat "$full_path" > "${file:t:r}" ;;
+      (*.xz) unxz "$full_path" ;;
       (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$full_path" ;;
       (*.lz4) lz4 -d "$full_path" ;;
       (*.lzma) unlzma "$full_path" ;;

plugins/eza/README.md

@@ -48,11 +48,10 @@ Default: `no`
 ### `show-group`
 
 ```zsh
-zstyle ':omz:plugins:eza' 'show-group' yes|no|smart
+zstyle ':omz:plugins:eza' 'show-group' yes|no
 ```
 
 If `yes` (default), always add `-g` flag to show the group ownership.
-If `smart`, adds the `--smart-group` flag to only show the group if it has a different name from the owner.
 
 Default: `yes`
 

plugins/eza/eza.plugin.zsh

@@ -9,15 +9,9 @@ typeset -a _EZA_TAIL
 function _configure_eza() {
   local _val
   # Get the head flags
-  zstyle -s ':omz:plugins:eza' 'show-group' _val
+  if zstyle -T ':omz:plugins:eza' 'show-group'; then
-  case "${_val:l}" in
-    yes)
     _EZA_HEAD+=("g")
-      ;;
+  fi
-    smart)
-      _EZA_TAIL+=("--smart-group")
-      ;;
-  esac
   if zstyle -t ':omz:plugins:eza' 'header'; then
     _EZA_HEAD+=("h")
   fi
@@ -52,14 +46,9 @@ function _configure_eza() {
   if [[ $_val ]]; then
     _EZA_TAIL+=("--time-style='$_val'")
   fi
-  if zstyle -t ':omz:plugins:eza' 'hyperlink'; then
+  if zstyle -t ":omz:plugins:eza" "hyperlink"; then
-    # eza >= 0.23 needs an explicit WHEN value
-    if command eza --hyperlink=auto --version &>/dev/null; then
-      _EZA_TAIL+=("--hyperlink=auto")
-    else
     _EZA_TAIL+=("--hyperlink")
   fi
-  fi
 }
 
 _configure_eza

plugins/flutter/README.md

@@ -13,20 +13,16 @@ plugins=(... flutter)
 | Alias      | Command                 | Description                                                                |
 | :--------- | :---------------------- | :------------------------------------------------------------------------- |
 | `fl`       | `flutter`               | Shorthand for flutter command                                              |
-| `fla`      | `flutter analyze`       | Analyzes flutter code                                                      |
 | `flattach` | `flutter attach`        | Attaches flutter to a running flutter application with enabled observatory |
 | `flb`      | `flutter build`         | Build flutter application                                                  |
-| `flc`      | `flutter clean`         | Cleans flutter project                                                     |
 | `flchnl`   | `flutter channel`       | Switches flutter channel (requires input of desired channel)               |
-| `fldoc`    | `flutter doctor`        | Runs flutter doctor                                                        |
+| `flc`      | `flutter clean`         | Cleans flutter project                                                     |
 | `fldvcs`   | `flutter devices`       | List connected devices (if any)                                            |
-| `flget`    | `flutter pub get`       | Installs dependencies                                                      |
+| `fldoc`    | `flutter doctor`        | Runs flutter doctor                                                        |
-| `fll`      | `flutter logs`          | Shows flutter logs                                                         |
-| `flpu`     | `flutter pub upgrade`   | Upgrades dependencies                                                      |
 | `flpub`    | `flutter pub`           | Shorthand for flutter pub command                                          |
+| `flget`    | `flutter pub get`       | Installs dependencies                                                      |
 | `flr`      | `flutter run`           | Runs flutter app                                                           |
 | `flrd`     | `flutter run --debug`   | Runs flutter app in debug mode (default mode)                              |
 | `flrp`     | `flutter run --profile` | Runs flutter app in profile mode                                           |
 | `flrr`     | `flutter run --release` | Runs flutter app in release mode                                           |
-| `flt`      | `flutter test`          | Runs flutter tests                                                         |
 | `flupgrd`  | `flutter upgrade`       | Upgrades flutter version depending on the current channel                  |

plugins/flutter/flutter.plugin.zsh

@@ -1,20 +1,16 @@
 alias fl="flutter"
-alias fla="flutter analyze"
 alias flattach="flutter attach"
 alias flb="flutter build"
-alias flc="flutter clean"
 alias flchnl="flutter channel"
-alias fldoc="flutter doctor"
+alias flc="flutter clean"
 alias fldvcs="flutter devices"
-alias flget="flutter pub get"
+alias fldoc="flutter doctor"
-alias fll="flutter logs"
-alias flpu="flutter pub upgrade"
 alias flpub="flutter pub"
+alias flget="flutter pub get"
 alias flr="flutter run"
 alias flrd="flutter run --debug"
 alias flrp="flutter run --profile"
 alias flrr="flutter run --release"
-alias flt="flutter test"
 alias flupgrd="flutter upgrade"
 
 # COMPLETION FUNCTION
@@ -30,8 +26,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_flutter" ]]; then
   _comps[flutter]=_flutter
 fi
 
-zmodload -F zsh/files b:zf_mv
+flutter zsh-completion < /dev/null >| "$ZSH_CACHE_DIR/completions/_flutter" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_flutter"
-  zf_mv -f -- =( flutter zsh-completion < /dev/null ) "$TMPPREFIX"
-} &|

plugins/fluxcd/fluxcd.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_flux" ]]; then
   _comps[flux]=_flux
 fi
 
-zmodload -F zsh/files b:zf_mv
+flux completion zsh >| "$ZSH_CACHE_DIR/completions/_flux" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_flux"
-  zf_mv -f -- =( flux completion zsh ) "$TMPPREFIX"
-} &|

plugins/fnm/fnm.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
   _comps[fnm]=_fnm
 fi
 
-zmodload -F zsh/files b:zf_mv
+fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_fnm"
-  zf_mv -f -- =( fnm completions --shell=zsh ) "$TMPPREFIX"
-} &|
 
 if zstyle -t ':omz:plugins:fnm' autostart; then
   local -a fnm_env_cmd

plugins/gcx/README.md

@@ -1,18 +0,0 @@
-# Grafana CLI plugin
-
-This plugin adds completion for the [Grafana CLI (gcx)](https://github.com/grafana/gcx).
-
-To use it, add `gcx` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... gcx)
-```
-
-This plugin does not add any aliases.
-
-## Cache
-
-This plugin caches the completion script and automatically updates it when the
-plugin is loaded, which is usually when you start a new terminal emulator.
-
-The cache is stored at `$ZSH_CACHE_DIR/completions/_gcx`.

plugins/gcx/gcx.plugin.zsh

@@ -1,18 +0,0 @@
-# Autocompletion for the Grafana CLI (gcx).
-if (( ! $+commands[gcx] )); then
-  return
-fi
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `gcx`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_gcx" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _gcx
-  _comps[gcx]=_gcx
-fi
-
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_gcx"
-  zf_mv -f -- =( gcx completion zsh ) "$TMPPREFIX"
-} &|

plugins/gh/gh.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
   _comps[gh]=_gh
 fi
 
-zmodload -F zsh/files b:zf_mv
+gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_gh"
-  zf_mv -f -- =( gh completion --shell zsh ) "$TMPPREFIX"
-} &|

plugins/git/README.md

@@ -45,7 +45,7 @@ plugins=(... git)
 | `gbgD`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -D`           |
 | `gbm`                  | `git branch --move`                                                                                                             |
 | `gbnm`                 | `git branch --no-merged`                                                                                                        |
-| `gbr`                  | `git branch --remotes`                                                                                                          |
+| `gbr`                  | `git branch --remote`                                                                                                           |
 | `ggsup`                | `git branch --set-upstream-to=origin/$(git_current_branch)`                                                                     |
 | `gbg`                  | `LANG=C git branch -vv \| grep ": gone\]"`                                                                                      |
 | `gco`                  | `git checkout`                                                                                                                  |

plugins/git/git.plugin.zsh

@@ -1,25 +1,6 @@
 # Git version checking
 autoload -Uz is-at-least
-# Running `git version` forks on every startup, so cache the result for a day
-# in $ZSH_CACHE_DIR, keyed on the git command path, mtime, and exec path.
-() {
-  local cache="$ZSH_CACHE_DIR/git-version" key exec_path
-  local -a stat lines
-  zmodload -F zsh/stat b:zstat
-  zstat -A stat +mtime -- "$commands[git]" 2>/dev/null
-  exec_path="$(git --exec-path 2>/dev/null)"
-  key="$commands[git] $stat[1] $exec_path"
-
-  lines=("$cache"(Nm-1))
-  (( $#lines )) && lines=("${(@f)$(<"$cache")}")
-  if [[ "$lines[1]" = "$key" ]]; then
-    git_version="$lines[2]"
-    return
-  fi
-
 git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
-  [[ ! -w "$ZSH_CACHE_DIR" ]] || print -rl -- "$key" "$git_version" >| "$cache"
-}
 
 #
 # Functions Current
@@ -156,9 +137,8 @@ function gbda() {
 # Copied and modified from James Roeder (jmaroeder) under MIT License
 # https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
 function gbds() {
-  local default_branch
+  local default_branch=$(git_main_branch)
-  default_branch=$(git_main_branch) \
+  (( ! $? )) || default_branch=$(git_develop_branch)
-    || default_branch=$(git_develop_branch)
 
   git for-each-ref refs/heads/ "--format=%(refname:short)" | \
     while read branch; do
@@ -173,7 +153,7 @@ alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk
 alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -D'
 alias gbm='git branch --move'
 alias gbnm='git branch --no-merged'
-alias gbr='git branch --remotes'
+alias gbr='git branch --remote'
 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
 alias gbg='LANG=C git branch -vv | grep ": gone\]"'
 alias gco='git checkout'

plugins/gitignore/gitignore.plugin.zsh

@@ -10,48 +10,12 @@ function gi() {
 }
 
 _gitignoreio_get_command_list() {
-  setopt local_options pipe_fail
   _gi_curl "list" | tr "," "\n"
 }
 
-__gitignoreio_caching_policy() {
-  local -a oldp
-  oldp=("$1"(Nm+7))
-  (($#oldp))
-}
-
-_gitignoreio_retrieve_stale_cache() {
-  zstyle -t ":completion:${curcontext}:" use-cache || return 1
-
-  local cache_dir
-  zstyle -s ":completion:${curcontext}:" cache-path cache_dir
-  : ${cache_dir:=${ZDOTDIR:-$HOME}/.zcompcache}
-
-  [[ -e "$cache_dir/gi-list" ]] || return 1
-  . "$cache_dir/gi-list"
-}
-
 _gitignoreio () {
   compset -P '*,'
-
+  compadd -S '' $(_gitignoreio_get_command_list)
-  local cache_policy
-  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-  if [[ -z "$cache_policy" ]]; then
-    zstyle ":completion:${curcontext}:" cache-policy __gitignoreio_caching_policy
-  fi
-
-  local -a _gi_list
-  if _cache_invalid gi-list || ! _retrieve_cache gi-list; then
-    local command_list
-    if command_list="$(_gitignoreio_get_command_list)" && [[ -n "$command_list" ]]; then
-      _gi_list=(${(f)command_list})
-      _store_cache gi-list _gi_list
-    else
-      _gitignoreio_retrieve_stale_cache
-    fi
-  fi
-
-  compadd -S '' -a _gi_list
 }
 
 compdef _gitignoreio gi

plugins/hasura/hasura.plugin.zsh

@@ -9,9 +9,5 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_hasura" ]]; then
   source "$ZSH_CACHE_DIR/completions/_hasura"
 else
   source "$ZSH_CACHE_DIR/completions/_hasura"
-  zmodload -F zsh/files b:zf_mv
+  hasura completion zsh --file "$ZSH_CACHE_DIR/completions/_hasura" >/dev/null &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_hasura"
-    zf_mv -f -- =( hasura completion zsh ) "$TMPPREFIX"
-  } &|
 fi

plugins/hcloud/hcloud.plugin.zsh

@@ -13,11 +13,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_hcloud" ]]; then
   _comps[hcloud]=_hcloud
 fi
 
-zmodload -F zsh/files b:zf_mv
+hcloud completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_hcloud" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_hcloud"
-  zf_mv -f -- =( hcloud completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 # Main alias
 alias hc='hcloud'

plugins/helm/helm.plugin.zsh

@@ -9,11 +9,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
   source "$ZSH_CACHE_DIR/completions/_helm"
 else
   source "$ZSH_CACHE_DIR/completions/_helm"
-  zmodload -F zsh/files b:zf_mv
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_helm"
-    zf_mv -f -- =( helm completion zsh ) "$TMPPREFIX"
-  } &|
 fi
 
 alias h='helm'

plugins/jj/README.md

@@ -19,54 +19,35 @@ plugins=(... jj)
 | jjbd   | `jj bookmark delete`          |
 | jjbf   | `jj bookmark forget`          |
 | jjbl   | `jj bookmark list`            |
-| jjblt  | `jj bookmark list --tracked`  |
 | jjbm   | `jj bookmark move`            |
 | jjbr   | `jj bookmark rename`          |
 | jjbs   | `jj bookmark set`             |
 | jjbt   | `jj bookmark track`           |
 | jjbu   | `jj bookmark untrack`         |
 | jjc    | `jj commit`                   |
-| jjcfg  | `jj config`                   |
-| jjcfgl | `jj config list`              |
 | jjcmsg | `jj commit --message`         |
 | jjd    | `jj diff`                     |
 | jjdmsg | `jj desc --message`           |
 | jjds   | `jj desc`                     |
-| jjdst  | `jj diff --stat`              |
 | jje    | `jj edit`                     |
-| jjev   | `jj evolog`                   |
-| jjf    | `jj file`                     |
-| jjfl   | `jj file list`                |
-| jjg    | `jj git`                      |
 | jjgcl  | `jj git clone`                |
 | jjgf   | `jj git fetch`                |
 | jjgfa  | `jj git fetch --all-remotes`  |
-| jjgi   | `jj git init`                 |
 | jjgp   | `jj git push`                 |
 | jjgpa  | `jj git push --all`           |
 | jjgpd  | `jj git push --deleted`       |
 | jjgpt  | `jj git push --tracked`       |
-| jjgrl  | `jj git remote list`          |
 | jjl    | `jj log`                      |
 | jjla   | `jj log -r "all()"`           |
 | jjn    | `jj new`                      |
 | jjnt   | `jj new "trunk()"`            |
-| jjop   | `jj op`                       |
-| jjopl  | `jj op log`                   |
-| jjor   | `jj op restore`               |
 | jjrb   | `jj rebase`                   |
 | jjrbm  | `jj rebase -d "trunk()"`      |
 | jjrs   | `jj restore`                  |
 | jjrt   | `cd "$(jj root \|\| echo .)"` |
-| jjs    | `jj show`                     |
 | jjsp   | `jj split`                    |
 | jjsq   | `jj squash`                   |
 | jjst   | `jj status`                   |
-| jju    | `jj undo`                     |
-| jjw    | `jj workspace`                |
-| jjwa   | `jj workspace add`            |
-| jjwf   | `jj workspace forget`         |
-| jjwl   | `jj workspace list`           |
 
 ## Prompt usage
 

plugins/jj/jj.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_jj" ]]; then
   _comps[jj]=_jj
 fi
 
-zmodload -F zsh/files b:zf_mv
+COMPLETE=zsh jj >| "$ZSH_CACHE_DIR/completions/_jj" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_jj"
-  zf_mv -f -- =( COMPLETE=zsh jj ) "$TMPPREFIX"
-} &|
 
 function __jj_prompt_jj() {
   local -a flags
@@ -45,51 +41,32 @@ alias jjbc='jj bookmark create'
 alias jjbd='jj bookmark delete'
 alias jjbf='jj bookmark forget'
 alias jjbl='jj bookmark list'
-alias jjblt='jj bookmark list --tracked'
 alias jjbm='jj bookmark move'
 alias jjbr='jj bookmark rename'
 alias jjbs='jj bookmark set'
 alias jjbt='jj bookmark track'
 alias jjbu='jj bookmark untrack'
 alias jjc='jj commit'
-alias jjcfg='jj config'
-alias jjcfgl='jj config list'
 alias jjcmsg='jj commit --message'
 alias jjd='jj diff'
 alias jjdmsg='jj desc --message'
 alias jjds='jj desc'
-alias jjdst='jj diff --stat'
 alias jje='jj edit'
-alias jjev='jj evolog'
-alias jjf='jj file'
-alias jjfl='jj file list'
-alias jjg='jj git'
 alias jjgcl='jj git clone'
 alias jjgf='jj git fetch'
 alias jjgfa='jj git fetch --all-remotes'
-alias jjgi='jj git init'
 alias jjgp='jj git push'
 alias jjgpa='jj git push --all'
 alias jjgpd='jj git push --deleted'
 alias jjgpt='jj git push --tracked'
-alias jjgrl='jj git remote list'
 alias jjl='jj log'
 alias jjla='jj log -r "all()"'
 alias jjn='jj new'
 alias jjnt='jj new "trunk()"'
-alias jjop='jj op'
-alias jjopl='jj op log'
-alias jjor='jj op restore'
 alias jjrb='jj rebase'
 alias jjrbm='jj rebase -d "trunk()"'
 alias jjrs='jj restore'
 alias jjrt='cd "$(jj root || echo .)"'
-alias jjs='jj show'
 alias jjsp='jj split'
 alias jjsq='jj squash'
 alias jjst='jj status'
-alias jju='jj undo'
-alias jjw='jj workspace'
-alias jjwa='jj workspace add'
-alias jjwf='jj workspace forget'
-alias jjwl='jj workspace list'

plugins/k9s/k9s.plugin.zsh

@@ -11,8 +11,4 @@ fi
 
 # and then generate it in the background. On first completion,
 # the actual completion file will be loaded.
-zmodload -F zsh/files b:zf_mv
+k9s completion zsh >| "$ZSH_CACHE_DIR/completions/_k9s" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_k9s"
-  zf_mv -f -- =( k9s completion zsh ) "$TMPPREFIX"
-} &|

plugins/keychain/keychain.plugin.zsh

@@ -4,11 +4,14 @@
 SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
 
 function {
+	local agents
 	local -a identities
 	local -a options
 	local _keychain_env_sh
 	local _keychain_env_sh_gpg
-  local version_string major
+
+	# load agents to start.
+	zstyle -s :omz:plugins:keychain agents agents
 
 	# load identities to manage.
 	zstyle -a :omz:plugins:keychain identities identities
@@ -16,32 +19,16 @@ function {
 	# load additional options
 	zstyle -a :omz:plugins:keychain options options
 
-  # Detect major version robustly: case-insensitive, tolerant of
+	# Check keychain version to decide whether to use --agents
-  # "keychain 3.0.0_beta3" / "Keychain 3.0.0" / etc.
+	local version_string=$(keychain --version 2>&1)
-  version_string=$(keychain --version 2>&1)
+  # start keychain, only use --agents for versions below 2.9.0
-  if [[ "${version_string:l}" =~ '([0-9]+)\.[0-9]+' ]]; then
-    major=${match[1]}
-  else
-    major=2
-  fi
-
-  if (( major >= 3 )); then
-    # Keychain 3.x: subcommand-based CLI, no --agents.
-    keychain add ${^options:-} --host $SHORT_HOST ${^identities}
-  else
-    local agents
-
-    # load agents to start (only used by keychain < 2.9).
-    zstyle -s :omz:plugins:keychain agents agents
-
 	autoload -Uz is-at-least
-    if [[ "${version_string:l}" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
+	if [[ "$version_string" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
       is-at-least 2.9 "$match[1]"; then
 		keychain ${^options:-} ${^identities} --host $SHORT_HOST
 	else
 		keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
 	fi
-  fi
 
 	# Get the filenames to store/lookup the environment from
 	_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"

plugins/kind/kind.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_kind" ]]; then
 fi
 
 # Generate and load kind completion
-zmodload -F zsh/files b:zf_mv
+kind completion zsh >! "$ZSH_CACHE_DIR/completions/_kind" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_kind"
-  zf_mv -f -- =( kind completion zsh ) "$TMPPREFIX"
-} &|
 
 # Register aliases
 alias kicc="kind create cluster"

plugins/kubectl/README.md

@@ -71,7 +71,6 @@ plugins=(... kubectl)
 |          |                                                         | **Secret management**                                                                            |
 | kgsec    | `kubectl get secret`                                    | Get secret for decoding                                                                          |
 | kgseca   | `kubectl get secret --all-namespaces`                   | List secrets across all namespaces                                                               |
-| kesec    | `kubectl edit secret`                                   | Edit secret resource                                                                             |
 | kdsec    | `kubectl describe secret`                               | Describe secret resource in detail                                                               |
 | kdelsec  | `kubectl delete secret`                                 | Delete the secret                                                                                |
 |          |                                                         | **Deployment management**                                                                        |

plugins/kubectl/kubectl.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
   _comps[kubectl]=_kubectl
 fi
 
-zmodload -F zsh/files b:zf_mv
+kubectl completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_kubectl"
-  zf_mv -f -- =( kubectl completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 # This command is used a LOT both below and in daily life
 alias k=kubectl
@@ -93,7 +89,6 @@ alias kdelcm='kubectl delete configmap'
 # Secret management
 alias kgsec='kubectl get secret'
 alias kgseca='kubectl get secret --all-namespaces'
-alias kesec='kubectl edit secret'
 alias kdsec='kubectl describe secret'
 alias kdelsec='kubectl delete secret'
 

plugins/kubectx/README.md

@@ -22,21 +22,6 @@ RPS1='$(kubectx_prompt_info)'
 PROMPT="$PROMPT"'$(kubectx_prompt_info)'
 ```
 
-The context is loaded asynchronously on supported versions of zsh so that
-`kubectl` does not block the prompt. To restore synchronous behavior, add this
-before Oh My Zsh is sourced:
-
-```zsh
-zstyle ':omz:alpha:plugins:kubectx' async-prompt no
-```
-
-If your theme calls `kubectx_prompt_info` indirectly through another function,
-force registration of the async handler instead:
-
-```zsh
-zstyle ':omz:alpha:plugins:kubectx' async-prompt force
-```
-
 ### Custom context names
 
 You can rename the default context name for better readability or additional formatting.

plugins/kubectx/kubectx.plugin.zsh

@@ -1,6 +1,6 @@
 typeset -g -A kubectx_mapping
 
-function _omz_kubectx_prompt_info() {
+function kubectx_prompt_info() {
   (( $+commands[kubectl] )) || return
 
   local current_ctx=$(kubectl config current-context 2> /dev/null)
@@ -13,34 +13,3 @@ function _omz_kubectx_prompt_info() {
   # the context name, as it could contain a % character.
   echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
 }
-
-function kubectx_prompt_info() {
-  if (( ${+_OMZ_ASYNC_OUTPUT} )) \
-    && [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_kubectx_prompt_info]-}" ]]; then
-    echo -n "${_OMZ_ASYNC_OUTPUT[_omz_kubectx_prompt_info]}"
-  fi
-}
-
-local _style
-if zstyle -t ':omz:alpha:plugins:kubectx' async-prompt \
-  || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:plugins:kubectx' async-prompt }; then
-  function _defer_async_kubectx_register() {
-    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT-}:${RPS1-}:${RPS2-}:${RPS3-}:${RPS4-}" in
-    *(\$\(kubectx_prompt_info\)|\`kubectx_prompt_info\`)*)
-      _omz_register_handler _omz_kubectx_prompt_info
-      ;;
-    esac
-
-    add-zsh-hook -d precmd _defer_async_kubectx_register
-    unset -f _defer_async_kubectx_register
-  }
-
-  autoload -Uz add-zsh-hook
-  precmd_functions=(_defer_async_kubectx_register $precmd_functions)
-elif zstyle -s ':omz:alpha:plugins:kubectx' async-prompt _style && [[ $_style == "force" ]]; then
-  _omz_register_handler _omz_kubectx_prompt_info
-else
-  function kubectx_prompt_info() {
-    _omz_kubectx_prompt_info
-  }
-fi

plugins/laravel/README.md

@@ -10,7 +10,6 @@ plugins=(... laravel)
 |:-:|:-:|
 | `artisan`  | `php artisan`  |
 | `pas`  | `php artisan serve` |
-| `pad`  | `php artisan dev` |
 | `pats`  | `php artisan test` |
 
 ## Database
@@ -42,7 +41,6 @@ plugins=(... laravel)
 | `pamen` | `php artisan make:enum` |
 | `pami`  | `php artisan make:interface` |
 | `pamtr` | `php artisan make:trait` |
-| `pamv` | `php artisan make:view` |
 
 ## Clears
 

plugins/laravel/laravel.plugin.zsh

@@ -4,7 +4,6 @@ alias bob='php artisan bob::build'
 
 # Development
 alias pas='php artisan serve'
-alias pad='php artisan dev'
 alias pats='php artisan test'
 
 # Database
@@ -31,7 +30,6 @@ alias pamcl='php artisan make:class'
 alias pamen='php artisan make:enum'
 alias pami='php artisan make:interface'
 alias pamtr='php artisan make:trait'
-alias pamv='php artisan make:view'
 
 
 # Clears

plugins/minikube/minikube.plugin.zsh

@@ -10,8 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_minikube" ]]; then
   _comps[minikube]=_minikube
 fi
 
-zmodload -F zsh/files b:zf_mv
+minikube completion zsh >| "$ZSH_CACHE_DIR/completions/_minikube" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_minikube"
-  zf_mv -f -- =( minikube completion zsh ) "$TMPPREFIX"
-} &|

plugins/mise/mise.plugin.zsh

@@ -1,14 +1,9 @@
-if (( $+commands[mise] )); then
+if (( ! $+commands[mise] )); then
-  _mise_bin=mise
-elif [[ -x ~/.local/bin/mise ]]; then
-  _mise_bin=~/.local/bin/mise
-else
   return
 fi
 
 # Load mise hooks
-eval "$($_mise_bin activate zsh)"
+eval "$(mise activate zsh)"
-unset _mise_bin
 
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `mise`. Otherwise, compinit will have already done that.
@@ -19,8 +14,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_mise" ]]; then
 fi
 
 # Generate and load mise completion
-zmodload -F zsh/files b:zf_mv
+mise completion zsh >| "$ZSH_CACHE_DIR/completions/_mise" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_mise"
-  zf_mv -f -- =( mise completion zsh ) "$TMPPREFIX"
-} &|

plugins/molecule/molecule.plugin.zsh

@@ -11,11 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_molecule" ]]; then
   _comps[molecule]=_molecule
 fi
 
-zmodload -F zsh/files b:zf_mv
+_MOLECULE_COMPLETE=zsh_source molecule >| "$ZSH_CACHE_DIR/completions/_molecule" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_molecule"
-  zf_mv -f -- =( _MOLECULE_COMPLETE=zsh_source molecule ) "$TMPPREFIX"
-} &|
 
 # Alias
 # molecule: https://docs.ansible.com/projects/molecule/

plugins/mongo-atlas/mongo-atlas.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_atlas" ]]; then
   _comps[atlas]=_atlas
 fi
 
-zmodload -F zsh/files b:zf_mv
+atlas completion zsh >| "$ZSH_CACHE_DIR/completions/atlas" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_atlas"
-  zf_mv -f -- =( atlas completion zsh ) "$TMPPREFIX"
-} &|

plugins/nats/nats.plugin.zsh

@@ -7,11 +7,7 @@ if (( $+commands[nsc] )); then
     _comps[nsc]=_nsc
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  nsc completion zsh >| "$ZSH_CACHE_DIR/completions/_nsc" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_nsc"
-    zf_mv -f -- =( nsc completion zsh ) "$TMPPREFIX"
-  } &|
 fi
 
 if (( $+commands[nats] )); then
@@ -23,9 +19,5 @@ if (( $+commands[nats] )); then
     _comps[nats]=_nats
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  nats --completion-script-zsh >| "$ZSH_CACHE_DIR/completions/_nats" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_nats"
-    zf_mv -f -- =( nats --completion-script-zsh ) "$TMPPREFIX"
-  } &|
 fi

plugins/ngrok/ngrok.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_ngrok" ]]; then
   _comps[ngrok]=_ngrok
 fi
 
-zmodload -F zsh/files b:zf_mv
+ngrok completion zsh >| "$ZSH_CACHE_DIR/completions/_ngrok" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_ngrok"
-  zf_mv -f -- =( ngrok completion zsh ) "$TMPPREFIX"
-} &|

plugins/pass-cli/pass-cli.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_pass-cli" ]]; then
   _comps[pass-cli]=_pass-cli
 fi
 
-zmodload -F zsh/files b:zf_mv
+pass-cli completions zsh >| "$ZSH_CACHE_DIR/completions/_pass-cli" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pass-cli"
-  zf_mv -f -- =( pass-cli completions zsh ) "$TMPPREFIX"
-} &|

plugins/per-directory-history/per-directory-history.zsh

@@ -91,14 +91,13 @@ bindkey -M vicmd $PER_DIRECTORY_HISTORY_TOGGLE per-directory-history-toggle-hist
 #-------------------------------------------------------------------------------
 
 _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
-_per_directory_history_global="$HISTFILE"
 
 function _per-directory-history-change-directory() {
   _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
   mkdir -p ${_per_directory_history_directory:h}
   if [[ $_per_directory_history_is_global == false ]]; then
     #save to the global history
-    fc -AI "$_per_directory_history_global"
+    fc -AI $HISTFILE
     #save history to previous file
     local prev="$HISTORY_BASE${OLDPWD:A}/history"
     mkdir -p ${prev:h}
@@ -126,9 +125,10 @@ function _per-directory-history-addhistory() {
       if [[ -o share_history ]] || \
          [[ -o inc_append_history ]] || \
          [[ -o inc_append_history_time ]]; then
-          fc -AI "$_per_directory_history_global"
+          fc -AI $HISTFILE
           fc -AI $_per_directory_history_directory
       fi
+      fc -p $_per_directory_history_directory
   fi
 }
 
@@ -147,13 +147,12 @@ function _per-directory-history-precmd() {
 }
 
 function _per-directory-history-set-directory-history() {
-  fc -AI "$_per_directory_history_global"
+  fc -AI $HISTFILE
   local original_histsize=$HISTSIZE
   HISTSIZE=0
   HISTSIZE=$original_histsize
   if [[ -e "$_per_directory_history_directory" ]]; then
     fc -R "$_per_directory_history_directory"
-    fc -p "$_per_directory_history_directory"
   fi
 }
 
@@ -162,9 +161,8 @@ function _per-directory-history-set-global-history() {
   local original_histsize=$HISTSIZE
   HISTSIZE=0
   HISTSIZE=$original_histsize
-  if [[ -e "$_per_directory_history_global" ]]; then
+  if [[ -e "$HISTFILE" ]]; then
-    fc -R "$_per_directory_history_global"
+    fc -R "$HISTFILE"
-    fc -p "$_per_directory_history_global"
   fi
 }
 

plugins/pipenv/README.md

@@ -10,7 +10,7 @@ plugins=(... pipenv ...)
 
 ## Features
 
-- Adds completion for pipenv ([install the `argcomplete` package to get it working with pipenv >= 2026.5.0](https://pipenv.pypa.io/en/latest/shell.html#shell-completion))
+- Adds completion for pipenv
 - Auto activates and deactivates pipenv shell
 - Adds short aliases for common pipenv commands
   - `pch` is aliased to `pipenv check`
@@ -29,18 +29,6 @@ plugins=(... pipenv ...)
   - `pvenv` is aliased to `pipenv --venv`
   - `ppy` is aliased to `pipenv --py`
 
-## Cache
-
-This plugin caches the Pipenv version to avoid running `pipenv --version` on every shell startup. The cache is automatically refreshed asynchronously when the plugin is loaded, which is usually when you start a new terminal session.
-
-For legacy Pipenv versions, the generated completion script is also cached.
-
-The cache is stored at:
-
-- `$ZSH_CACHE_DIR/pipenv_version` version of Pipenv, used to choose between argcomplete-based completion and legacy Click-based completion.
-
-- `$ZSH_CACHE_DIR/completions/_pipenv` legacy Click-based completion script.
-
 ## Configuration
 
 ### Shell activation

plugins/pipenv/pipenv.plugin.zsh

@@ -2,39 +2,6 @@ if (( ! $+commands[pipenv] )); then
   return
 fi
 
-# Compatibility note:
-# pipenv < 2026.5.0 used Click-based shell completion driven by the
-# _PIPENV_COMPLETE environment variable.
-#
-# pipenv >= 2026.5.0 removed this mechanism and switched to argcomplete-based
-# completion using register-python-argcomplete instead.
-
-autoload -Uz is-at-least
-
-_pipenv_version_cache="$ZSH_CACHE_DIR/pipenv_version"
-
-if [[ -f "$_pipenv_version_cache" ]]; then
-  _pipenv_version="$(< "$_pipenv_version_cache" 2>/dev/null)"
-else
-  _pipenv_version="${$(pipenv --version 2>/dev/null)#pipenv, version }"
-fi
-
-{
-  _pipenv_fresh_version="${$(pipenv --version 2>/dev/null)#pipenv, version }"
-  [[ -n "$_pipenv_fresh_version" ]] && print -r -- "$_pipenv_fresh_version" >| "$_pipenv_version_cache"
-} &|
-
-if is-at-least 2026.5.0 "$_pipenv_version"; then
-  # pipenv >= 2026.5.0: argcomplete-based completion (no legacy fallback)
-  if (( $+commands[register-python-argcomplete] )); then
-    autoload -Uz bashcompinit
-    bashcompinit
-
-    eval "$(register-python-argcomplete pipenv)"
-  fi
-else
-  # legacy Click-based completion via _PIPENV_COMPLETE
-
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `pipenv`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_pipenv" ]]; then
@@ -43,12 +10,7 @@ else
   _comps[pipenv]=_pipenv
 fi
 
-  zmodload -F zsh/files b:zf_mv
+_PIPENV_COMPLETE=zsh_source pipenv >| "$ZSH_CACHE_DIR/completions/_pipenv" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pipenv"
-    zf_mv -f -- =( _PIPENV_COMPLETE=zsh_source pipenv ) "$TMPPREFIX"
-  } &|
-fi
 
 if zstyle -T ':omz:plugins:pipenv' auto-shell; then
   # Automatic pipenv shell activation/deactivation
@@ -56,30 +18,22 @@ if zstyle -T ':omz:plugins:pipenv' auto-shell; then
     # deactivate shell if Pipfile doesn't exist and not in a subdir
     if [[ ! -f "$PWD/Pipfile" ]]; then
       if [[ "$PIPENV_ACTIVE" == 1 ]]; then
-        # Compare whole path components: `$pipfile_dir"*` also matches unrelated
+        if [[ "$PWD" != "$pipfile_dir"* ]]; then
-        # siblings that merely start with the same text (…/proj -> …/proj-docs),
-        # which would keep the virtualenv active outside the project.
-        local project_dir="${pipfile_dir%/}"
-        if [[ "$PWD" != "$project_dir" && "$PWD" != "$project_dir"/* ]]; then
           unset PIPENV_ACTIVE pipfile_dir
           deactivate
         fi
       fi
     fi
 
-    # activate the shell if Pipfile exists and its virtualenv is usable
+    # activate the shell if Pipfile exists
     if [[ "$PIPENV_ACTIVE" != 1 ]]; then
       if [[ -f "$PWD/Pipfile" ]]; then
-        local venv_path
-        if venv_path="$(pipenv --venv 2>/dev/null)" && [[ -n "$venv_path" && -f "$venv_path/bin/activate" ]]; then
         export pipfile_dir="$PWD"
-          source "$venv_path/bin/activate"
+        source "$(pipenv --venv)/bin/activate"
         export PIPENV_ACTIVE=1
       fi
     fi
-    fi
   }
-
   autoload -U add-zsh-hook
   add-zsh-hook chpwd _togglePipenvShell
   _togglePipenvShell

plugins/pm2/_pm2

@@ -314,7 +314,7 @@ _pm2_subcommands() {
 (( $+functions[_pm2_id_names] )) ||
 _pm2_id_names() {
   local app_list=$(pm2 list -m)
-  local -a names=(${(@f)"$(echo $app_list | awk '/^\+---/{sub("\\+--- ", ""); print}')"})
+  local -a names=(${(@f)"$(echo $app_list | awk '/^\+---/{sub("+--- ", ""); print}')"})
   local -a ids=(${(@f)"$(echo $app_list | awk '/^pm2 id/{sub("pm2 id :", ""); print}')"})
 
   if (( ${#ids} > 0 )); then

plugins/podman/podman.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_podman" ]]; then
   _comps[podman]=_podman
 fi
 
-zmodload -F zsh/files b:zf_mv
+podman completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_podman" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_podman"
-  zf_mv -f -- =( podman completion zsh 2> /dev/null ) "$TMPPREFIX"
-} &|
 
 alias pbl='podman build'
 alias pcin='podman container inspect'

plugins/poetry-env/README.md

@@ -1,9 +1,7 @@
 # Poetry Environment Plugin
 
-This plugin automatically activates a Poetry environment when you enter a
+This plugin automatically changes poetry environment when you cd into or out of the project directory.
-directory containing both `pyproject.toml` and `poetry.lock`. It keeps the
+Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment
-environment active in project subdirectories, switches to nested Poetry
-projects, and deactivates it when you leave the project tree.
 
 To use it, add `poetry-env` to the plugins array in your zshrc file:
 

plugins/poetry-env/poetry-env.plugin.zsh

@@ -1,25 +1,16 @@
 _togglePoetryShell() {
   # Determine if currently in a Poetry-managed directory
   local in_poetry_dir=0
-  local in_active_poetry_dir=0
   if [[ -f "$PWD/pyproject.toml" && -f "$PWD/poetry.lock" ]]; then
     in_poetry_dir=1
   fi
 
-  # Deactivate when leaving the active project or entering a nested project
+  # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory
-  if [[ $poetry_active -eq 1 ]]; then
+  if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] || [[ "$PWD" != "$poetry_dir"* ]]; }; then
-    local project_dir="${poetry_dir%/}"
-    if [[ "$PWD" == "$project_dir" || "$PWD" == "$project_dir"/* ]]; then
-      in_active_poetry_dir=1
-    fi
-
-    if [[ $in_active_poetry_dir -eq 0 ]] ||
-      { [[ $in_poetry_dir -eq 1 ]] && [[ "$PWD" != "$poetry_dir" ]]; }; then
     export poetry_active=0
     unset poetry_dir
     (( $+functions[deactivate] )) && deactivate
   fi
-  fi
 
   # Activate the environment if in a Poetry directory and no environment is currently active
   if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then

plugins/poetry/poetry.plugin.zsh

@@ -39,8 +39,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
   _comps[poetry]=_poetry
 fi
 
-zmodload -F zsh/files b:zf_mv
+poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_poetry"
-  zf_mv -f -- =( poetry completions zsh ) "$TMPPREFIX"
-} &|

plugins/procs/procs.plugin.zsh

@@ -10,16 +10,12 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_procs" ]]; then
   _comps[procs]=_procs
 fi
 
-zmodload -F zsh/files b:zf_mv
+{
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_procs"
   autoload -Uz is-at-least
   local _version=$(procs --version)
-  zf_mv -f -- =(
   if is-at-least "0.14" "${_version#procs }"; then
-      procs --gen-completion-out zsh
+    procs --gen-completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
   else
-      procs --completion-out zsh
+    procs --completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
   fi
-  ) "$TMPPREFIX"
 } &|

plugins/pulumi/pulumi.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_pulumi" ]]; then
   _comps[pulumi]=_pulumi
 fi
 
-zmodload -F zsh/files b:zf_mv
+pulumi gen-completion zsh >| "$ZSH_CACHE_DIR/completions/_pulumi" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_pulumi"
-  zf_mv -f -- =( pulumi gen-completion zsh ) "$TMPPREFIX"
-} &|
 
 # Aliases
 alias pul='pulumi'

plugins/qodana/qodana.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_qodana" ]]; then
   _comps[qodana]=_qodana
 fi
 
-zmodload -F zsh/files b:zf_mv
+qodana completion zsh >| "$ZSH_CACHE_DIR/completions/_qodana" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_qodana"
-  zf_mv -f -- =( qodana completion zsh ) "$TMPPREFIX"
-} &|

plugins/rails/README.md

@@ -24,12 +24,11 @@ plugins=(... rails)
 | `rdm`   | `rails db:migrate`               | Run pending db migrations                              |
 | `rdmd`  | `rails db:migrate:down`          | Undo specific db migration                             |
 | `rdmr`  | `rails db:migrate:redo`          | Redo specific db migration                             |
-| `rdmrs` | `rails db:migrate:reset`         | Delete the database and set it up again from scratch.  |
 | `rdms`  | `rails db:migrate:status`        | Show current db migration status                       |
 | `rdmtc` | `rails db:migrate db:test:clone` | Run pending migrations and clone db into test database |
 | `rdmu`  | `rails db:migrate:up`            | Run specific db migration                              |
 | `rdr`   | `rails db:rollback`              | Roll back the last migration                           |
-| `rdrs`  | `rails db:reset`                 | Delete the database and set it up again from schema.   |
+| `rdrs`  | `rails db:reset`                 | Delete the database and set it up again                |
 | `rds`   | `rails db:seed`                  | Seed the database                                      |
 | `rdsl`  | `rails db:schema:load`           | Load the database schema                               |
 | `rdtc`  | `rails db:test:clone`            | Clone the database into the test database              |
@@ -54,33 +53,6 @@ plugins=(... rails)
 | `rta`   | `rails test:all`                 | Runs all Rails tests, including system tests           |
 | `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
-### Multiple databases
-
-Rails applications can define more than one database (`primary`, `cache`, `cable`,
-`queue`, ...), and each one gets its own namespaced task. These commands accept an
-optional database name as the first argument:
-
-`rdc`, `rdd`, `rdm`, `rdmd`, `rdmr`, `rdms`, `rdmu`, `rdr`, `rdrs`, `rdsl`
-
-```zsh
-rdm                    # rails db:migrate
-rdm cache              # rails db:migrate:cache
-rdm VERSION=20231225   # rails db:migrate VERSION=20231225
-rdm cache STEP=2       # rails db:migrate:cache STEP=2
-rdm --trace            # rails db:migrate --trace
-```
-
-The first argument is read as a database name only when it is a bare word. Flags
-(`--trace`), variables (`STEP=2`) and other tasks (`db:seed`) are passed through to
-`rails` unchanged, so previous usage keeps working. When a database name is given,
-the resolved command is printed so it is clear which database is being used.
-
-`rdmrs` is not in the list above because Rails does not define a per-database
-`db:migrate:reset` task.
-
-Note that these are implemented as shell functions rather than aliases, so they will
-not appear in the output of `alias`.
-
 ### Foreman
 
 | Alias  | Command         | Description                               |

plugins/rails/_rails

@@ -214,7 +214,6 @@ _rails_subcommands() {
       "db\:migrate[Migrate the database]"
       "db\:migrate\:down[Run the 'down' for a given migration VERSION]"
       "db\:migrate\:redo[Roll back the database one migration and re-migrate up]"
-      "db\:migrate\:reset[Drop and recreate all databases from scratch for the current environment]"
       "db\:migrate\:status[Display status of migrations]"
       "db\:migrate\:up[Run the 'up' for a given migration VERSION]"
       "db\:prepare[Run setup if database does not exist, or run migrations if it does]"

plugins/rails/rails.plugin.zsh

@@ -47,9 +47,18 @@ alias rc='rails console'
 alias rcs='rails console --sandbox'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
-alias rdmrs='rails db:migrate:reset'
+alias rdc='rails db:create'
+alias rdd='rails db:drop'
+alias rdm='rails db:migrate'
+alias rdmd='rails db:migrate:down'
+alias rdmr='rails db:migrate:redo'
+alias rdms='rails db:migrate:status'
 alias rdmtc='rails db:migrate db:test:clone'
+alias rdmu='rails db:migrate:up'
+alias rdr='rails db:rollback'
+alias rdrs='rails db:reset'
 alias rds='rails db:seed'
+alias rdsl='rails db:schema:load'
 alias rdtc='rails db:test:clone'
 alias rdtp='rails db:test:prepare'
 alias rgen='rails generate'
@@ -96,47 +105,6 @@ alias rkn='rake notes'
 alias rksts='rake stats'
 alias rkt='rake test'
 
-# Database tasks
-#
-# Rails applications can define more than one database (primary, cache, cable,
-# queue, ...). Each one gets its own namespaced task, e.g. `db:migrate:cache`.
-# The functions below take an optional database name as the first argument:
-#
-#   rdm                    ->  rails db:migrate
-#   rdm cache              ->  rails db:migrate:cache
-#   rdm VERSION=20231225   ->  rails db:migrate VERSION=20231225
-#   rdm cache STEP=2       ->  rails db:migrate:cache STEP=2
-#   rdm --trace            ->  rails db:migrate --trace
-#
-# The first argument is read as a database name only when it is a bare word.
-# Flags (--trace), variables (STEP=2) and other tasks (db:seed) are passed
-# through to rails untouched, so the previous alias behavior still works.
-function _rails_db_command() {
-  local task="$1"
-  shift
-
-  if [[ $# -gt 0 && "$1" != -* && "$1" != *=* && "$1" != *:* ]]; then
-    task="$task:$1"
-    shift
-    # Echo the resolved task so it is clear which database is being used
-    local -a cmd=(rails "$task" "$@")
-    print -u2 -r -- "Running: ${cmd[*]}"
-  fi
-
-  rails "$task" "$@"
-}
-
-function rdc()  { _rails_db_command db:create "$@" }
-function rdd()  { _rails_db_command db:drop "$@" }
-function rdm()  { _rails_db_command db:migrate "$@" }
-function rdmd() { _rails_db_command db:migrate:down "$@" }
-function rdmr() { _rails_db_command db:migrate:redo "$@" }
-function rdms() { _rails_db_command db:migrate:status "$@" }
-function rdmu() { _rails_db_command db:migrate:up "$@" }
-function rdr()  { _rails_db_command db:rollback "$@" }
-function rdrs() { _rails_db_command db:reset "$@" }
-function rdsl() { _rails_db_command db:schema:load "$@" }
-
 # legacy stuff
 alias sc='ruby script/console'
 alias sd='ruby script/destroy'

plugins/rbw/rbw.plugin.zsh

@@ -10,11 +10,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
   _comps[rbw]=_rbw
 fi
 
-zmodload -F zsh/files b:zf_mv
+rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rbw"
-  zf_mv -f -- =( rbw gen-completions zsh ) "$TMPPREFIX"
-} &|
 
 # rbwpw function copies the password of a service to the clipboard
 # and clears it after 20 seconds

plugins/rclone/rclone.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rclone" ]]; then
   _comps[rclone]=_rclone
 fi
 
-zmodload -F zsh/files b:zf_mv
+rclone completion zsh - >| "$ZSH_CACHE_DIR/completions/_rclone" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rclone"
-  zf_mv -f -- =( rclone completion zsh - ) "$TMPPREFIX"
-} &|

plugins/ruff/README.md

@@ -1,22 +0,0 @@
-# ruff plugin
-
-This plugin automatically installs [ruff](https://github.com/astral-sh/ruff)'s completions for you,
-and keeps them up to date. It also adds convenient aliases for common usage.
-
-To use it, add `ruff` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... ruff)
-```
-
-## Aliases
-
-| Alias | Command              | Description                                                  |
-| :---- | -------------------- | :----------------------------------------------------------- |
-| ruc   | `ruff check`         | Run Ruff linter on the given files or directories            |
-| rucf  | `ruff check --fix`   | Run Ruff linter and fix auto-fixable issues                  |
-| ruf   | `ruff format`        | Run the Ruff formatter on the given files or directories     |
-| rufc  | `ruff format --check`| Check if files are already formatted without making changes  |
-| rur   | `ruff rule`          | Explain a rule (or all rules)                                |
-| rul   | `ruff linter`        | List all supported upstream linters                          |
-| rucl  | `ruff clean`         | Clear any caches in the current directory and subdirectories |

plugins/ruff/ruff.plugin.zsh

@@ -1,27 +0,0 @@
-# Return immediately if ruff is not found
-if (( ! ${+commands[ruff]} )); then
-  return
-fi
-
-alias ruc='ruff check'
-alias rucf='ruff check --fix'
-alias ruf='ruff format'
-alias rufc='ruff format --check'
-alias rur='ruff rule'
-alias rul='ruff linter'
-alias rucl='ruff clean'
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_ruff" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _ruff
-  _comps[ruff]=_ruff
-fi
-
-# Overwrites the file each time as completions might change with ruff versions.
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_ruff"
-  zf_mv -f -- =( ruff generate-shell-completion zsh ) "$TMPPREFIX"
-} &|

plugins/rust/rust.plugin.zsh

@@ -19,11 +19,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
 fi
 
 # Generate completion files in the background
-zmodload -F zsh/files b:zf_mv
+rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_rustup"
-  zf_mv -f -- =( rustup completions zsh ) "$TMPPREFIX"
-} &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
 source "$(rustup run ${${(z)$(rustup default)}[1]} rustc --print sysroot)"/share/zsh/site-functions/_cargo

plugins/sigstore/sigstore.plugin.zsh

@@ -12,11 +12,7 @@ function install_autocompletion {
     _comps[$1]=_$1
   fi
 
-  zmodload -F zsh/files b:zf_mv
+  $1 completion zsh >| "$ZSH_CACHE_DIR/completions/_$1" &|
-  () {
-    local TMPPREFIX="$ZSH_CACHE_DIR/completions/_$1"
-    zf_mv -f -- =( $1 completion zsh ) "$TMPPREFIX"
-  } "$1" &|
 }
 
 install_autocompletion cosign

plugins/skaffold/skaffold.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_skaffold" ]]; then
   _comps[skaffold]=_skaffold
 fi
 
-zmodload -F zsh/files b:zf_mv
+skaffold completion zsh >| "$ZSH_CACHE_DIR/completions/_skaffold" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_skaffold"
-  zf_mv -f -- =( skaffold completion zsh ) "$TMPPREFIX"
-} &|

plugins/ssh-agent/ssh-agent.plugin.zsh

@@ -101,18 +101,10 @@ if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
    && [[ -n "$SSH_AUTH_SOCK" ]]; then
   if [[ ! -L "$SSH_AUTH_SOCK" ]]; then
     if [[ -n "$TERMUX_VERSION" ]]; then
-      _omz_ssh_agent_link="$PREFIX"/tmp/ssh-agent-$USERNAME-screen
+      ln -sf "$SSH_AUTH_SOCK" "$PREFIX"/tmp/ssh-agent-$USERNAME-screen
     else
-      _omz_ssh_agent_link=/tmp/ssh-agent-$USERNAME-screen
+      ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
     fi
-    # `ln -sf` unlinks the old symlink and then creates the new one: two
-    # syscalls, no atomic swap. Shells starting concurrently (a tmux window
-    # opening several panes at once) interleave those steps and all but one
-    # fail with "ln: ...: File exists". Stage the link under a PID-unique
-    # name and move it into place, since rename(2) is atomic.
-    command ln -sf "$SSH_AUTH_SOCK" "$_omz_ssh_agent_link.$$" \
-      && command mv -f "$_omz_ssh_agent_link.$$" "$_omz_ssh_agent_link"
-    unset _omz_ssh_agent_link
   fi
 else
   _start_agent

plugins/stripe/stripe.plugin.zsh

@@ -10,8 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_stripe" ]]; then
   _comps[stripe]=_stripe
 fi
 
-zmodload -F zsh/files b:zf_mv
+stripe completion --shell zsh --write-to-stdout >| "$ZSH_CACHE_DIR/completions/_stripe" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_stripe"
-  zf_mv -f -- =( stripe completion --shell zsh --write-to-stdout ) "$TMPPREFIX"
-} &|

plugins/sublime-merge/sublime-merge.plugin.zsh

@@ -19,7 +19,6 @@
 				ssm_run_sudo() {sudo $_sublime_merge_path "$@" >/dev/null 2>&1}
 				alias ssm=ssm_run_sudo
 				alias sm=sm_run
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done
@@ -34,7 +33,6 @@
 			if [[ -a $_sublime_merge_path ]]; then
 				subm () { "$_sublime_merge_path" "$@" }
 				alias sm=subm
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done
@@ -47,7 +45,6 @@
 			if [[ -a $_sublime_merge_path ]]; then
 				subm () { "$_sublime_merge_path" "$@" }
 				alias sm=subm
-				alias smerge="'$_sublime_merge_path'"
 				break
 			fi
 		done

plugins/symfony6/symfony6.plugin.zsh

@@ -15,8 +15,8 @@
 #   - https://github.com/symfony/symfony/blob/5.4/src/Symfony/Component/Console/Resources/completion.bash
 #
 _sf_console() {
-    local lastParam out comp sf_cmd
+    local lastParam flagPrefix requestComp out comp
-    local -a completions flagPrefix requestComp inputs
+    local -a completions
 
     # The user could have moved the cursor backwards on the command-line.
     # We need to trigger completion from the $CURRENT location, so we need
@@ -29,20 +29,11 @@ _sf_console() {
     setopt local_options BASH_REMATCH
     if [[ "${lastParam}" =~ '-.*=' ]]; then
         # We are dealing with a flag with an =
-        flagPrefix=(-P "${BASH_REMATCH}")
+        flagPrefix="-P ${BASH_REMATCH}"
     fi
 
-    # Prepare the command to obtain completions. An alias is resolved here,
+    # Prepare the command to obtain completions
-    # because the request is no longer read again by the shell.
+    requestComp="${words[0]} ${words[1]} _complete --no-interaction -szsh -a1 -c$((CURRENT-1))" i=""
-    sf_cmd="${words[1]}"
-    if [[ -n "${aliases[$sf_cmd]}" ]]; then
-        requestComp=(${(z)aliases[$sf_cmd]})
-    else
-        requestComp=(${~sf_cmd})
-    fi
-
-    requestComp+=(_complete --no-interaction -szsh -a1 "-c$((CURRENT-1))")
-
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
@@ -56,18 +47,19 @@ _sf_console() {
         fi
         # empty values are ignored
         if [ ! -z "$w" ]; then
-            inputs+=("-i$w")
+            i="${i}-i${w} "
         fi
     done
 
     # Ensure at least 1 input
-    if (( ! $#inputs )); then
+    if [ "${i}" = "" ]; then
-        inputs=(-i' ')
+        requestComp="${requestComp} -i\" \""
+    else
+        requestComp="${requestComp} ${i}"
     fi
 
-    # The request is run without being read again by the shell, so that a
+    # Use eval to handle any environment variables and such
-    # "$(...)" or a backtick typed on the command line is not executed
+    out=$(eval ${requestComp} 2>/dev/null)
-    out=$(SHELL_VERBOSITY=0 "${requestComp[@]}" "${inputs[@]}" 2>/dev/null)
 
     while IFS='\n' read -r comp; do
         if [ -n "$comp" ]; then
@@ -83,7 +75,7 @@ _sf_console() {
     done < <(printf "%s\n" "${out[@]}")
 
     # Let inbuilt _describe handle completions
-    _describe "completions" completions "${flagPrefix[@]}"
+    eval _describe "completions" completions $flagPrefix
     return $?
 }
 

plugins/systemadmin/systemadmin.plugin.zsh

@@ -138,7 +138,7 @@ function consume100() {
 
 # Website traffic statistics (G)
 function webtraffic() {
-  awk '{sum+=$10} END {print sum/1024/1024/1024}' "$(retlog)"
+  awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
 }
 
 # Statistical connections 404

plugins/tailscale/tailscale.plugin.zsh

@@ -22,8 +22,4 @@ if (( $+aliases[tailscale] )); then
   _comps[${aliases[tailscale]:t}]=_tailscale
 fi
 
-zmodload -F zsh/files b:zf_mv
+tailscale completion zsh >| "$ZSH_CACHE_DIR/completions/_tailscale" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_tailscale"
-  zf_mv -f -- =( tailscale completion zsh ) "$TMPPREFIX"
-} &|

plugins/task/task.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_task" ]]; then
 fi
 
 # Generate and load task completion
-zmodload -F zsh/files b:zf_mv
+task --completion zsh >! "$ZSH_CACHE_DIR/completions/_task" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_task"
-  zf_mv -f -- =( task --completion zsh ) "$TMPPREFIX"
-} &|

plugins/timoni/timoni.plugin.zsh

@@ -11,8 +11,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_timoni" ]]; then
   _comps[timoni]=_timoni
 fi
 
-zmodload -F zsh/files b:zf_mv
+timoni completion zsh >| "$ZSH_CACHE_DIR/completions/_timoni" &|
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_timoni"
-  zf_mv -f -- =( timoni completion zsh ) "$TMPPREFIX"
-} &|

plugins/tmux/tmux.plugin.zsh

@@ -167,7 +167,7 @@ function _zsh_tmux_plugin_preexec()
   local -a tmux_cmd
   tmux_cmd=(command tmux)
 
-  eval "$($tmux_cmd show-environment -s)"
+  eval $($tmux_cmd show-environment -s)
 }
 
 # Use the completions for tmux for our function

plugins/ufw/README.md

@@ -16,4 +16,3 @@ Some of the commands include:
 * `deny <port>/<optional: protocol>` add deny rule
 * `disable` disables the firewall
 * `enable` enables the firewall
-* `route` add route rule