fix(git plugin): include git exec path in version cache key

Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>

.github/dependencies.yml

@@ -12,7 +12,7 @@ dependencies:
   plugins/gradle:
     repo: gradle/gradle-completion
     branch: master
-    version: e7c881dbef7462bc35ad05328397e1582fe25cb8
+    version: 63578c9bc56134b80766e88957ba0239e6be2343
     precopy: |
       set -e
       find . ! -name _gradle ! -name LICENSE -delete

.github/workflows/dependencies.yml

@@ -16,7 +16,7 @@ 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@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

.github/workflows/installer.yml

@@ -26,7 +26,7 @@ jobs:
           - macos-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 
@@ -47,7 +47,7 @@ jobs:
       - test
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

.github/workflows/main.yml

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

.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@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
       - name: Authenticate as @ohmyzsh

.github/workflows/scorecard.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
         with:
           egress-policy: audit
 

README.md

@@ -23,14 +23,6 @@ Twitter), and join us on [Discord](https://discord.gg/ohmyzsh).
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/111169632522566717?label=%40ohmyzsh&domain=https%3A%2F%2Fmstdn.social&logo=mastodon&style=flat)](https://mstdn.social/@ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
 
-<a href="https://commitgoods.com/collections/oh-my-zsh?utm_source=github">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://cdn.shopify.com/s/files/1/0101/8752/files/commitgoods-badge-stacked-navy-dark.svg">
-    <img src="https://cdn.shopify.com/s/files/1/0101/8752/files/commitgoods-badge-stacked-navy.svg" height="28" alt="Official merch on commitgoods.com">
-  </picture>
-</a>
-
-
 <details>
 <summary>Table of Contents</summary>
 

lib/prompt_info_functions.zsh

@@ -21,7 +21,6 @@ function chruby_prompt_info \
   azure_prompt_info \
   tf_prompt_info \
   conda_prompt_info \
-  go_prompt_info \
 {
   return 1
 }

lib/spectrum.zsh

@@ -14,16 +14,10 @@ FX=(
   reverse   "%{%}" no-reverse   "%{%}"
 )
 
-# Build the tables with array operations instead of a 256-iteration loop
+for color in {000..255}; do
-() {
+  FG[$color]="%{[38;5;${color}m%}"
-  setopt localoptions noksharrays
+  BG[$color]="%{[48;5;${color}m%}"
-  local -a codes fg bg
+done
-  codes=({000..255})
-  fg=( "%{"$'\e'"[38;5;"${^codes}"m%}" )
-  bg=( "%{"$'\e'"[48;5;"${^codes}"m%}" )
-  FG=( ${codes:^fg} )
-  BG=( ${codes:^bg} )
-}
 
 # Show all 256 colors with color number
 function spectrum_ls() {

lib/termsupport.zsh

@@ -31,12 +31,7 @@ function title {
       else
         # Try to use terminfo to set the title if the feature is available
         if (( ${+terminfo[fsl]} && ${+terminfo[tsl]} )); then
-          # Emit the capabilities with echoti so terminfo does its own parameter
+          print -Pn "${terminfo[tsl]}$1${terminfo[fsl]}"
-          # substitution: some terminals (vt320) take a column argument, and
-          # running prompt expansion over the capability string mangles it.
-          echoti tsl 0
-          print -Pn "$1"
-          echoti fsl
         fi
       fi
       ;;

oh-my-zsh.sh

@@ -64,7 +64,7 @@ if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
 fi
 
 # Create cache and completions dir and add to $fpath
-[[ -d "$ZSH_CACHE_DIR/completions" ]] || mkdir -p "$ZSH_CACHE_DIR/completions"
+mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
@@ -114,17 +114,9 @@ fi
 zcompdump_revision="#omz revision: $(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)"
 zcompdump_fpath="#omz fpath: $fpath"
 
-# Check whether the zcompdump file carries the current OMZ metadata lines
-_omz_compdump_has_metadata() {
-  local -a lines
-  [[ -r "$ZSH_COMPDUMP" ]] || return 1
-  lines=("${(@f)$(<"$ZSH_COMPDUMP")}")
-  (( ${lines[(Ie)$zcompdump_revision]} && ${lines[(Ie)$zcompdump_fpath]} ))
-}
-
 # Delete the zcompdump file if OMZ zcompdump metadata changed
-zcompdump_refresh=0
+if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
-if ! _omz_compdump_has_metadata; then
+   || ! command grep -q -Fx "$zcompdump_fpath" "$ZSH_COMPDUMP" 2>/dev/null; then
   command rm -f "$ZSH_COMPDUMP"
   zcompdump_refresh=1
 fi
@@ -142,8 +134,9 @@ else
   compinit -u -d "$ZSH_COMPDUMP"
 fi
 
-# Append zcompdump metadata if missing (compinit may have regenerated the file)
+# Append zcompdump metadata if missing
-if (( zcompdump_refresh )) || ! _omz_compdump_has_metadata; then
+if (( $zcompdump_refresh )) \
+  || ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null; then
   # Use `tee` in case the $ZSH_COMPDUMP filename is invalid, to silence the error
   # See https://github.com/ohmyzsh/ohmyzsh/commit/dd1a7269#commitcomment-39003489
   tee -a "$ZSH_COMPDUMP" &>/dev/null <<EOF
@@ -153,12 +146,9 @@ $zcompdump_fpath
 EOF
 fi
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
-unset -f _omz_compdump_has_metadata
 
 # zcompile the completion dump file if the .zwc is older or missing.
-# Test that first so the lock directory and zrecompile are skipped when it's fresh.
+if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
-if [[ ! "${ZSH_COMPDUMP}.zwc" -nt "$ZSH_COMPDUMP" ]] \
-   && command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
   zrecompile -q -p "$ZSH_COMPDUMP"
   command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
 fi

plugins/aws/aws.plugin.zsh

@@ -241,7 +241,7 @@ function aws_regions() {
 function aws_profiles() {
   aws --no-cli-pager configure list-profiles 2> /dev/null && return
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  command grep -Eo '^[[:space:]]*\[[[:space:]]*(profile[[:space:]]+)?[^][:space:]]+[[:space:]]*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | command sed -E 's/^[[:space:]]*\[[[:space:]]*(profile[[:space:]]+)?([^][:space:]]+)[[:space:]]*\]$/\2/'
+  grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }
 
 function _aws_regions() {

plugins/common-aliases/README.md

@@ -99,21 +99,18 @@ $ find . -type f 2>/dev/null
 ## File extension aliases
 
 These are special aliases that are triggered when a file name is passed as the command. For example,
-if the pdf file extension is aliased to `open_command`, running `file.pdf` opens that file with
+if the pdf file extension is aliased to `acroread` (a popular Linux pdf reader), when running `file.pdf`
-whatever application your system uses for PDFs.
+that file will be open with `acroread`.
 
 ### Reading Docs
 
-These use `open_command`, which picks the right opener for your platform: `open` on macOS,
+| Alias | Command    | Description                        |
-`xdg-open` on Linux, `cygstart` on Cygwin.
+| ----- | ---------- | ---------------------------------- |
-
+| pdf   | `acroread` | Opens up a document using acroread |
-| Alias | Command        | Description                                     |
+| ps    | `gv`       | Opens up a .ps file using gv       |
-| ----- | -------------- | ----------------------------------------------- |
+| dvi   | `xdvi`     | Opens up a .dvi file using xdvi    |
-| pdf   | `open_command` | Opens up a .pdf file in your default viewer     |
+| chm   | `xchm`     | Opens up a .chm file using xchm    |
-| ps    | `open_command` | Opens up a .ps file in your default viewer      |
+| djvu  | `djview`   | Opens up a .djvu file using djview |
-| dvi   | `open_command` | Opens up a .dvi file in your default viewer     |
-| chm   | `open_command` | Opens up a .chm file in your default viewer     |
-| djvu  | `open_command` | Opens up a .djvu file in your default viewer    |
 
 ### Listing files inside a packed file
 

plugins/common-aliases/common-aliases.plugin.zsh

@@ -71,9 +71,12 @@ if is-at-least 4.2.0; then
   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts; do alias -s $ft=mplayer; done
 
-  # read documents with the platform's default application
+  #read documents
-  _doc_fts=(pdf ps dvi chm djvu)
+  alias -s pdf=acroread
-  for ft in $_doc_fts; do alias -s $ft=open_command; done
+  alias -s ps=gv
+  alias -s dvi=xdvi
+  alias -s chm=xchm
+  alias -s djvu=djview
 
   #list what's inside packed file
   alias -s zip="unzip -l"

plugins/emacs/emacsclient.sh

@@ -1,33 +1,14 @@
 #!/bin/sh
 
 emacsfun() {
-  local cmd frames arg tty
+  local cmd frames
 
   # Build the Emacs Lisp command to check for suitable frames
   # See https://www.gnu.org/software/emacs/manual/html_node/elisp/Frames.html#index-framep
-  for arg in "$@"; do
+  case "$*" in
-    case "$arg" in
+  *-t*|*--tty*|*-nw*) cmd="(memq 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are tty frames
-    -t|--tty|-nw) tty=1; break ;;
+  *) cmd="(delete 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are graphical terminals (x, w32, ns)
-    esac
+  esac
-  done
-
-  if [ -n "$tty" ]; then
-    cmd="(memq 't (mapcar 'framep (frame-list)))" # if != nil, there are tty frames
-  else
-    cmd="(delete 't (mapcar 'framep (frame-list)))" # if != nil, there are graphical terminals (x, w32, ns)
-  fi
-
-  # A tty frame needs the client to stay attached, so drop the --no-wait the
-  # `emacs` alias adds. Otherwise emacsclient returns at once and nothing opens.
-  if [ -n "$tty" ]; then
-    for arg do
-      shift
-      case "$arg" in
-      --no-wait) continue ;;
-      esac
-      set -- "$@" "$arg"
-    done
-  fi
 
   # Check if there are suitable frames
   frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null |sed 's/.*\x07//g' )"

plugins/gh/README.md

@@ -15,6 +15,9 @@ This plugin does not add any aliases.
 This plugin caches the completion script and is automatically updated when the
 plugin is loaded, which is usually when you start up a new terminal emulator.
 
-The completion script is stored at `$ZSH_CACHE_DIR/completions/_gh`. If an
+The cache is stored at:
-update fails, the plugin keeps the last successfully generated completion
+
-script.
+- `$ZSH/plugins/gh/_gh` completions script
+
+- `$ZSH_CACHE_DIR/gh_version` version of GitHub CLI, used to invalidate
+  the cache.

plugins/gh/gh.plugin.zsh

@@ -13,12 +13,6 @@ fi
 
 zmodload -F zsh/files b:zf_mv
 () {
-  local completion_file="$ZSH_CACHE_DIR/completions/_gh"
+  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_gh"
-  local completion_tmp="${completion_file}.$$.${RANDOM}"
+  zf_mv -f -- =( gh completion --shell zsh ) "$TMPPREFIX"
-
-  if gh completion --shell zsh >| "$completion_tmp" && [[ -s "$completion_tmp" ]]; then
-    zf_mv -f -- "$completion_tmp" "$completion_file"
-  fi
-
-  command rm -f -- "$completion_tmp"
 } &|

plugins/git/git.plugin.zsh

@@ -1,6 +1,25 @@
 # Git version checking
 autoload -Uz is-at-least
-git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
+# 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

plugins/github/README.md

@@ -1,43 +1,45 @@
 # github plugin
 
-> [!WARNING]
+This plugin supports working with GitHub from the command line. It provides a few things:
-> This plugin is deprecated and will be removed in a future release. It supports
-> the legacy [`hub`](https://github.com/mislav/hub) CLI, not the current GitHub
-> CLI. For `gh` completion, use the [`gh` plugin](../gh) instead.
 
-The plugin provides compatibility for existing `hub` users by:
+* Sets up the `hub` wrapper and completions for the `git` command if you have [`hub`](https://github.com/github/hub) installed.
+* Completion for the [`github` Ruby gem](https://github.com/defunkt/github-gem).
+* Convenience functions for working with repos and URLs.
 
-- aliasing `git` to `hub` when `hub` is installed;
+### Functions
-- adding completion for `hub`; and
-- defining convenience functions for creating repositories.
 
-## Migrating to GitHub CLI
+* `empty_gh` - Creates a new empty repo (with a `README.md`) and pushes it to GitHub
+* `new_gh` - Initializes an existing directory as a repo and pushes it to GitHub
+* `exist_gh` - Takes an existing repo and pushes it to GitHub
 
-Install [GitHub CLI](https://cli.github.com/), replace `github` with `gh` in
+
-your plugin list, and restart your shell:
+## Installation
+
+[Hub](https://github.com/github/hub) needs to be installed if you want to use it. On OS X with Homebrew, this can be done with `brew install hub`. The `hub` completion definition needs to be added to your `$FPATH` before initializing OMZ.
+
+The [`github` Ruby gem](https://github.com/defunkt/github-gem) needs to be installed if you want to use it.
+
+### Configuration
+
+These settings affect `github`'s behavior.
+
+#### Environment variables
+
+* `$GITHUB_USER`
+* `$GITHUB_PASSWORD`
+
+#### Git configuration options
+
+* `github.user` - GitHub username for repo operations
+
+See `man hub` for more details.
+
+### Homebrew installation note
+
+If you have installed `hub` using Homebrew, its completions may not be on your `$FPATH` if you are using the system `zsh`. Homebrew installs `zsh` completion definitions to `/usr/local/share/zsh/site-functions`, which will be on `$FPATH` for the Homebrew-installed `zsh`, but not for the system `zsh`. If you want it to work with the system `zsh`, add this to your `~/.zshrc` before it sources `oh-my-zsh.sh`.
 
 ```zsh
-plugins=(... gh)
+if (( ! ${fpath[(I)/usr/local/share/zsh/site-functions]} )); then
+  FPATH=/usr/local/share/zsh/site-functions:$FPATH
+fi
 ```
-
-The `gh` plugin supplies completion for the installed GitHub CLI. It does not
-alias `git`, because `gh` is not a Git wrapper.
-
-The closest replacement for creating a GitHub repository from an existing
-local repository is:
-
-```zsh
-gh repo create --source=. --push
-```
-
-## Deprecated functions
-
-- `empty_gh` - creates a new repository with a `README.md` and pushes it to GitHub
-- `new_gh` - initializes an existing directory and pushes it to GitHub
-- `exist_gh` - pushes an existing Git repository to GitHub
-
-These functions remain available during the deprecation period and require
-`hub`. They will be removed with the plugin.
-
-If you continue using `hub`, see its documentation for authentication and
-configuration details.

plugins/github/github.plugin.zsh

@@ -1,6 +1,3 @@
-print -Pru2 -- '%F{yellow}[oh-my-zsh] The %Bgithub%b plugin is deprecated and will be removed in a future release.'
-print -Pru2 -- 'It supports the legacy %Bhub%b CLI. Use the %Bgh%b plugin for GitHub CLI completion.%f'
-
 # Set up hub wrapper for git, if it is available; https://github.com/github/hub
 if (( $+commands[hub] )); then
   alias git=hub
@@ -29,7 +26,7 @@ empty_gh() { # [NAME_OF_REPO]
 # This function will add all non-hidden files to git.
 new_gh() { # [DIRECTORY]
   emulate -L zsh
-  local repo="${1:-.}"
+  local repo="$1"
   cd "$repo" \
     || return
 
@@ -45,7 +42,7 @@ new_gh() { # [DIRECTORY]
     || return
   hub create \
     || return
-  git push -u origin HEAD \
+  git push -u origin master \
     || return
 }
 
@@ -55,19 +52,18 @@ new_gh() { # [DIRECTORY]
 # to your GitHub.
 exist_gh() { # [DIRECTORY]
   emulate -L zsh
-  local repo="${1:-.}"
+  local repo=$1
-  cd "$repo" \
+  cd "$repo"
-    || return
 
   hub create \
     || return
-  git push -u origin HEAD
+  git push -u origin master
 }
 
 # git.io "GitHub URL"
 #
 # Shorten GitHub url, example:
-#   https://github.com/nvogel/dotzsh    > https://git.io/8nU25w
+#   https://github.com/nvogel/dotzsh    >   https://git.io/8nU25w
 # source: https://github.com/nvogel/dotzsh
 # documentation: https://github.com/blog/985-git-io-github-url-shortener
 #
@@ -78,3 +74,4 @@ git.io() {
 }
 
 # End Functions #############################################################
+

plugins/golang/README.md

@@ -39,18 +39,3 @@ plugins=(... golang)
 | gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
 | gove   | `go version`      | Prints Go version                                             |
 | gow    | `go work`         | Work provides access to operations on workspaces              |
-
-## Prompt
-
-This plugin provides the `go_prompt_info` function to add the installed Go
-version to your prompt.
-
-For example:
-```
-PROMPT="%~$ "
-RPROMPT='$(go_prompt_info)'
-```
-changes your prompt to:
-```
-~/go/project$ ▋                                                     1.22.3
-```

plugins/golang/golang.plugin.zsh

@@ -36,12 +36,3 @@ alias gotofx='go tool fix'
 alias gov='go vet'
 alias gove='go version'
 alias gow='go work'
-
-## prompt
-function go_prompt_info() {
-  (( $+commands[go] )) || return
-  local go_prompt
-  go_prompt=$(go version | awk '{ print substr($3, 3) }')
-  [[ -z "${go_prompt}" ]] && return
-  echo "${ZSH_THEME_GO_PROMPT_PREFIX}${go_prompt:gs/%/%%}${ZSH_THEME_GO_PROMPT_SUFFIX}"
-}

plugins/gradle/_gradle

@@ -284,9 +284,6 @@ __gradle_subcommand() {
                 '-Dorg.gradle.debug.suspend=[]' \
                 '-Dorg.gradle.debug=[]:org.gradle.debug:(true false)' \
                 '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Supported values are 'strict', 'lenient', or 'off'.]:org.gradle.dependency.verification:(strict lenient off)' \
-                '-Dorg.gradle.isolated-projects.dangerously-ignore-problems=[]' \
-                '-Dorg.gradle.isolated-projects.diagnostics=[]' \
-                '-Dorg.gradle.isolated-projects=[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`.]' \
                 '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories' \
                 '-Dorg.gradle.java.installations.auto-detect=[]' \
                 '-Dorg.gradle.java.installations.auto-download=[]' \
@@ -302,6 +299,8 @@ __gradle_subcommand() {
                 '-Dorg.gradle.problems.report=[Enables the HTML problems report.]' \
                 '-Dorg.gradle.projectcachedir=[Specifies the project-specific cache directory. Default is .gradle in the root project directory.]:org.gradle.projectcachedir:_directories' \
                 '-Dorg.gradle.tooling.parallel=[]' \
+                '-Dorg.gradle.unsafe.isolated-projects.diagnostics=[]' \
+                '-Dorg.gradle.unsafe.isolated-projects=[]' \
                 '-Dorg.gradle.vfs.verbose=[]' \
                 '-Dorg.gradle.vfs.watch=[Enables file system watching. Reuses file system data for subsequent builds.]:org.gradle.vfs.watch:(true false)' \
                 '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Supported values are 'all', 'fail', 'summary' (default), or 'none'.]' \
@@ -329,14 +328,12 @@ __gradle_subcommand() {
                 \*'--include-build[Includes the specified build in the composite.]:include build:_directories' \
                 (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Sets the log level to info.]' \
                 \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle(|.kts)' \
-                (--no-isolated-projects)'--isolated-projects[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`. (incubating)]' \
                 '--max-workers[Configures the maximum number of concurrent workers Gradle is allowed to use.]' \
                 (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
                 (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
                 (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
                 (--continue)'--no-continue[Stops task execution after a task failure.]' \
                 (--daemon)'--no-daemon[Runs the build without the Gradle daemon. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
-                (--isolated-projects)'--no-isolated-projects[Disables Isolated Projects. (incubating)]' \
                 (--parallel)'--no-parallel[Disables parallel project execution.]' \
                 (--problems-report)'--no-problems-report[Disables the HTML problems report. (incubating)]' \
                 {-a,--no-rebuild}'[Disables rebuilding of project dependencies.]' \
@@ -424,9 +421,6 @@ _gradle() {
         '-Dorg.gradle.debug.suspend=[]:->argument-expected' \
         '-Dorg.gradle.debug=[]:org.gradle.debug:(true false):->argument-expected' \
         '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Supported values are 'strict', 'lenient', or 'off'.]:org.gradle.dependency.verification:(strict lenient off):->argument-expected' \
-        '-Dorg.gradle.isolated-projects.dangerously-ignore-problems=[]:->argument-expected' \
-        '-Dorg.gradle.isolated-projects.diagnostics=[]:->argument-expected' \
-        '-Dorg.gradle.isolated-projects=[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`.]:->argument-expected' \
         '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories:->argument-expected' \
         '-Dorg.gradle.java.installations.auto-detect=[]:->argument-expected' \
         '-Dorg.gradle.java.installations.auto-download=[]:->argument-expected' \
@@ -442,6 +436,8 @@ _gradle() {
         '-Dorg.gradle.problems.report=[Enables the HTML problems report.]:->argument-expected' \
         '-Dorg.gradle.projectcachedir=[Specifies the project-specific cache directory. Default is .gradle in the root project directory.]:org.gradle.projectcachedir:_directories:->argument-expected' \
         '-Dorg.gradle.tooling.parallel=[]:->argument-expected' \
+        '-Dorg.gradle.unsafe.isolated-projects.diagnostics=[]:->argument-expected' \
+        '-Dorg.gradle.unsafe.isolated-projects=[]:->argument-expected' \
         '-Dorg.gradle.vfs.verbose=[]:->argument-expected' \
         '-Dorg.gradle.vfs.watch=[Enables file system watching. Reuses file system data for subsequent builds.]:org.gradle.vfs.watch:(true false):->argument-expected' \
         '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Supported values are 'all', 'fail', 'summary' (default), or 'none'.]:->argument-expected' \
@@ -470,14 +466,12 @@ _gradle() {
         \*'--include-build[Includes the specified build in the composite.]:include build:_directories:->argument-expected' \
         (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Sets the log level to info.]' \
         \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle(|.kts):->argument-expected' \
-        (--no-isolated-projects)'--isolated-projects[Enables Isolated Projects. Projects are configured in parallel. Implies `--configuration-cache`. (incubating)]' \
         '--max-workers[Configures the maximum number of concurrent workers Gradle is allowed to use.]:->argument-expected' \
         (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
         (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
         (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
         (--continue)'--no-continue[Stops task execution after a task failure.]' \
         (--daemon)'--no-daemon[Runs the build without the Gradle daemon. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
-        (--isolated-projects)'--no-isolated-projects[Disables Isolated Projects. (incubating)]' \
         (--parallel)'--no-parallel[Disables parallel project execution.]' \
         (--problems-report)'--no-problems-report[Disables the HTML problems report. (incubating)]' \
         {-a,--no-rebuild}'[Disables rebuilding of project dependencies.]' \

plugins/herdr/README.md

@@ -1,163 +0,0 @@
-# herdr plugin
-
-This plugin adds completion, aliases, an interactive session picker and a prompt
-function for [herdr](https://herdr.dev), the runtime your
-coding agents live on. herdr keeps agent terminals running in the background across
-projects and machines, so you can close your terminal, reconnect later, and pick up
-where the agents left off.
-
-To use it, add `herdr` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... herdr)
-```
-
-Install herdr first if you have not already:
-
-```sh
-curl -fsSL https://herdr.dev/install.sh | sh   # or: brew install herdr
-```
-
-## Learning herdr from the terminal
-
-The fastest way to explore herdr is tab completion. Every command group and flag shows a
-short description, so you can discover what is available without leaving the shell:
-
-```
-$ herdr <TAB>
-agent         -- Control and inspect agent panes
-session       -- Manage named persistent sessions
-workspace     -- Manage workspaces over the socket API
-worktree      -- Manage Git worktree-backed workspaces
-...
-$ herdr agent <TAB>
-list          -- List agents
-prompt        -- Submit a prompt to an agent
-start         -- Start a supported interactive agent in an existing pane
-wait          -- Wait until an agent reaches one of the requested states
-...
-```
-
-A few other ways to learn as you go:
-
-- `herdr <group>` with no subcommand prints that group's help, for example `herdr pane`.
-- `herdr --skill` prints the instructions herdr gives to agents that drive it. It is a
-  good tour of the full command surface.
-- Most control commands return JSON, so you can pipe them into `jq` in scripts.
-
-## Common workflows
-
-### Start and reconnect
-
-```sh
-herdr                          # launch, or attach to the default session
-herdr --session work           # use or create a named session
-herdr session list             # see running and stopped sessions
-herdr session attach work      # reconnect to a named session
-herdr status                   # check the local client and running server
-herdr update                   # install the latest release
-```
-
-### Organize work into workspaces and tabs
-
-```sh
-herdr workspace list
-herdr workspace create --cwd ~/projects/app
-herdr tab create
-herdr pane split --direction right
-herdr worktree create --branch feature/login   # open a Git worktree in its own workspace
-```
-
-### Run and watch agents
-
-```sh
-herdr agent list                               # what is running, and is it idle, working or blocked
-herdr agent start reviewer --kind claude --pane w1:p2
-herdr agent prompt reviewer "review the last commit" --wait
-herdr agent read reviewer                      # read the agent's terminal output
-herdr agent wait reviewer --until idle
-herdr agent attach reviewer                    # jump straight into that terminal
-```
-
-### Work across machines
-
-```sh
-herdr --remote user@build-box                  # attach through SSH with your local keybindings
-```
-
-### Keep the server healthy
-
-```sh
-herdr config check                             # validate config.toml
-herdr server reload-config                     # apply config changes without restarting panes
-herdr server stop
-herdr channel set preview                      # switch between stable and preview releases
-herdr integration status                       # which agent CLIs have herdr hooks installed
-```
-
-See the [CLI reference](https://herdr.dev/docs/cli-reference/) for every command and flag.
-
-## Aliases
-
-| Alias   | Command                       |
-| ------- | ----------------------------- |
-| `hrdr`   | `herdr`                       |
-| `hrdrst` | `herdr status`                |
-| `hrdrup` | `herdr update`                |
-| `hrdrsl` | `herdr session list`          |
-| `hrdrsa` | `herdr session attach`        |
-| `hrdrr`  | `herdr --remote`              |
-| `hrdral` | `herdr agent list`            |
-| `hrdrwl` | `herdr workspace list`        |
-| `hrdrwc` | `herdr workspace create`      |
-| `hrdrwt` | `herdr worktree create`       |
-| `hrdrps` | `herdr pane split`            |
-| `hrdrrc` | `herdr server reload-config`  |
-
-Tab completion works through the aliases too, so `hrdr agent <TAB>` completes the same
-way `herdr agent <TAB>` does.
-
-## Session picker
-
-`hrdrs` lists your herdr sessions and attaches to the one you pick. It uses
-[fzf](https://github.com/junegunn/fzf) when it is installed and falls back to a numbered
-menu otherwise, so it works everywhere.
-
-```
-$ hrdrs
-name                 status   directory
-1) default              running  /Users/me/.config/herdr
-2) work                 stopped  /Users/me/projects/app
-Attach to session: 2
-```
-
-## Prompt
-
-This plugin provides the `herdr_prompt_info` function to show the current pane ID in
-your prompt when the shell is running inside herdr. It reads environment variables only,
-so it adds no cost to prompt rendering.
-
-For example:
-```
-PROMPT="%~$ "
-RPROMPT='$(herdr_prompt_info)'
-```
-changes your prompt inside a herdr pane to:
-```
-~/projects/app$ ▋                                                    w1:p4
-```
-and shows nothing outside herdr.
-
-Wrap it with `ZSH_THEME_HERDR_PROMPT_PREFIX` and `ZSH_THEME_HERDR_PROMPT_SUFFIX`, for
-example:
-```
-ZSH_THEME_HERDR_PROMPT_PREFIX="%{$fg[cyan]%}[herdr "
-ZSH_THEME_HERDR_PROMPT_SUFFIX="]%{$reset_color%}"
-```
-
-## 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/_herdr`.

plugins/herdr/herdr.plugin.zsh

@@ -1,68 +0,0 @@
-# Aliases, helpers and completion for herdr (https://herdr.dev), the runtime for coding agents.
-
-# PROMPT
-# Defined before the herdr check so themes can reference it on machines without herdr.
-function herdr_prompt_info {
-  [[ "$HERDR_ENV" == 1 ]] || return
-  echo "${ZSH_THEME_HERDR_PROMPT_PREFIX}${HERDR_PANE_ID:gs/%/%%}${ZSH_THEME_HERDR_PROMPT_SUFFIX}"
-}
-
-if (( ! $+commands[herdr] )); then
-  return
-fi
-
-# ALIASES
-alias hrdr='herdr'
-alias hrdrst='herdr status'
-alias hrdrup='herdr update'
-alias hrdrsl='herdr session list'
-alias hrdrsa='herdr session attach'
-alias hrdrr='herdr --remote'
-alias hrdral='herdr agent list'
-alias hrdrwl='herdr workspace list'
-alias hrdrwc='herdr workspace create'
-alias hrdrwt='herdr worktree create'
-alias hrdrps='herdr pane split'
-alias hrdrrc='herdr server reload-config'
-
-# FUNCTIONS
-# Pick a session and attach to it, with fzf if available or a numbered menu otherwise.
-function hrdrs {
-  setopt localoptions extendedglob
-  local -a lines
-  lines=("${(@f)$(herdr session list 2>/dev/null)}")
-  lines=("${(@)lines%%[[:space:]]#[^[:space:]]#}")  # drop the socket column
-  if (( $#lines < 2 )); then
-    print "hrdrs: no herdr sessions found" >&2
-    return 1
-  fi
-
-  local choice
-  if (( $+commands[fzf] )); then
-    choice=$(print -l -- "${lines[@]}" | fzf --header-lines=1 --prompt='herdr session> ') || return
-  else
-    print -- "${lines[1]}"
-    local PS3="Attach to session: "
-    select choice in "${lines[@]:1}"; do
-      [[ -n "$choice" ]] && break
-    done
-  fi
-  [[ -n "$choice" ]] || return 1
-
-  herdr session attach "${${(z)choice}[1]}"
-}
-
-# COMPLETION
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `herdr`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_herdr" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _herdr
-  _comps[herdr]=_herdr
-fi
-
-zmodload -F zsh/files b:zf_mv
-() {
-  local TMPPREFIX="$ZSH_CACHE_DIR/completions/_herdr"
-  zf_mv -f -- =( herdr completion zsh < /dev/null 2> /dev/null ) "$TMPPREFIX"
-} &|

plugins/jj/README.md

@@ -55,7 +55,7 @@ plugins=(... jj)
 | jjopl  | `jj op log`                   |
 | jjor   | `jj op restore`               |
 | jjrb   | `jj rebase`                   |
-| jjrbm  | `jj rebase -o "trunk()"`      |
+| jjrbm  | `jj rebase -d "trunk()"`      |
 | jjrs   | `jj restore`                  |
 | jjrt   | `cd "$(jj root \|\| echo .)"` |
 | jjs    | `jj show`                     |
@@ -120,10 +120,10 @@ that.
 
 ### Git async-prompt compatibility
 
-If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with the default
+If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with
-git async-prompt mode. This is because async-prompt only registers its background worker when it detects
+the default git async-prompt mode. This is because async-prompt only registers its background worker
-`$(git_prompt_info)` literally in your prompt variables. A wrapper like `$(_my_theme_vcs_info)` won't match,
+when it detects `$(git_prompt_info)` literally in your prompt variables. A wrapper like
-so the async output stays empty.
+`$(_my_theme_vcs_info)` won't match, so the async output stays empty.
 
 To fix this, add one of the following to your `.zshrc` **before** Oh My Zsh is sourced:
 

plugins/jj/jj.plugin.zsh

@@ -81,7 +81,7 @@ alias jjop='jj op'
 alias jjopl='jj op log'
 alias jjor='jj op restore'
 alias jjrb='jj rebase'
-alias jjrbm='jj rebase -o "trunk()"'
+alias jjrbm='jj rebase -d "trunk()"'
 alias jjrs='jj restore'
 alias jjrt='cd "$(jj root || echo .)"'
 alias jjs='jj show'

plugins/juju/juju.plugin.zsh

@@ -35,7 +35,6 @@ alias jdlr='juju debug-log --ms --replay'
 alias jcon='juju consume'
 alias jeb='juju export-bundle'
 alias jex='juju expose'
-alias junex='juju unexpose'
 alias jh='juju help'
 alias jkc='juju kill-controller -y -t 0'
 alias jm='juju models'

plugins/kubectl/README.md

@@ -23,7 +23,6 @@ plugins=(... kubectl)
 | kcsc     | `kubectl config set-context`                            | Set a context entry in kubeconfig                                                                |
 | kcdc     | `kubectl config delete-context`                         | Delete the specified context from the kubeconfig                                                 |
 | kccc     | `kubectl config current-context`                        | Display the current-context                                                                      |
-| kcrc     | `kubectl config rename-context`                         | Rename a context from the kubeconfig file                                                        |
 | kcgc     | `kubectl config get-contexts`                           | List of contexts available                                                                       |
 |          |                                                         | **General aliases**                                                                              |
 | kdel     | `kubectl delete`                                        | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
@@ -131,7 +130,7 @@ plugins=(... kubectl)
 | kdss     | `kubectl describe statefulset`                          | Describe statefulset resource in detail                                                          |
 | kdelss   | `kubectl delete statefulset`                            | Delete the statefulset                                                                           |
 | ksss     | `kubectl scale statefulset`                             | Scale a statefulset                                                                              |
-| krsss    | `kubectl rollout status statefulset`                    | Check the rollout status of a statefulset                                                        |
+| krsss    | `kubectl rollout status statefulset`                    | Check the rollout status of a deployment                                                         |
 | krrss    | `kubectl rollout restart statefulset`                   | Rollout restart a statefulset                                                                    |
 |          |                                                         | **Service Accounts management**                                                                  |
 | kdsa     | `kubectl describe sa`                                   | Describe a service account in details                                                            |

plugins/kubectl/kubectl.plugin.zsh

@@ -36,7 +36,6 @@ alias kcuc='kubectl config use-context'
 alias kcsc='kubectl config set-context'
 alias kcdc='kubectl config delete-context'
 alias kccc='kubectl config current-context'
-alias kcrc='kubectl config rename-context'
 
 # List all contexts
 alias kcgc='kubectl config get-contexts'

plugins/laravel/README.md

@@ -43,7 +43,6 @@ plugins=(... laravel)
 | `pami`  | `php artisan make:interface` |
 | `pamtr` | `php artisan make:trait` |
 | `pamv` | `php artisan make:view` |
-| `pammig` | `php artisan make:migration` |
 
 ## Clears
 

plugins/laravel/laravel.plugin.zsh

@@ -32,7 +32,6 @@ alias pamen='php artisan make:enum'
 alias pami='php artisan make:interface'
 alias pamtr='php artisan make:trait'
 alias pamv='php artisan make:view'
-alias pammig='php artisan make:migration'
 
 
 # Clears

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

@@ -23,7 +23,7 @@ _togglePoetryShell() {
 
   # 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
-    local venv_dir=$(poetry env info --path 2>/dev/null)
+    venv_dir=$(poetry env info --path 2>/dev/null)
     # Handle case where poetry returns "." for in-project virtual environments
     if [[ "$venv_dir" == "." ]]; then
       venv_dir="$PWD/.venv"

plugins/rails/rails.plugin.zsh

@@ -139,6 +139,7 @@ function rdsl() { _rails_db_command db:schema:load "$@" }
 
 # legacy stuff
 alias sc='ruby script/console'
+alias sd='ruby script/destroy'
 alias sd='ruby script/server --debugger'
 alias sg='ruby script/generate'
 alias sp='ruby script/plugin'

plugins/safe-paste/safe-paste.plugin.zsh

@@ -11,6 +11,7 @@
 # Load bracketed-paste-magic if zsh version is >= 5.1
 autoload -Uz is-at-least
 if is-at-least 5.1; then
+  set zle_bracketed_paste  # Explicitly restore this zsh default
   autoload -Uz bracketed-paste-magic
   zle -N bracketed-paste bracketed-paste-magic
   return  ### The rest of this file is NOT executed on zsh version >= 5.1 ###

plugins/ssh-agent/README.md

@@ -21,18 +21,6 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding yes
 ```
 
-### `honor-existing`
-
-If your session already provides an ssh-agent — a desktop keyring, `gpg-agent`,
-KeePassXC, or an agent forwarded over SSH — the plugin normally ignores it and
-starts one of its own, which leaves you with two agents. Set this to reuse the
-running agent instead, and only start a new one when `$SSH_AUTH_SOCK` is empty
-or does not answer:
-
-```zsh
-zstyle :omz:plugins:ssh-agent honor-existing yes
-```
-
 ### `helper`
 
 To set an **external helper** to ask for the passwords and possibly store

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

@@ -1,28 +1,16 @@
 # Get the filename to store/lookup the environment from
 ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-# Test if $SSH_AUTH_SOCK points at a listening agent
-function _is_agent_running() {
-  local REPLY
-  [[ -n "$SSH_AUTH_SOCK" && -S "$SSH_AUTH_SOCK" ]] || return 1
-  zmodload zsh/net/socket 2>/dev/null || return 1
-  zsocket "$SSH_AUTH_SOCK" 2>/dev/null || return 1
-  exec {REPLY}>&- # close the probe connection
-  return 0
-}
-
 function _start_agent() {
-  # Reuse an agent the session already provides, if enabled
-  if zstyle -t :omz:plugins:ssh-agent honor-existing && _is_agent_running; then
-    return 0
-  fi
-
   # Check if ssh-agent is already running
   if [[ -f "$ssh_env_cache" ]]; then
     . "$ssh_env_cache" > /dev/null
 
     # Test if $SSH_AUTH_SOCK is visible
-    _is_agent_running && return 0
+    zmodload zsh/net/socket
+    if [[ -S "$SSH_AUTH_SOCK" ]] && zsocket "$SSH_AUTH_SOCK" 2>/dev/null; then
+      return 0
+    fi
   fi
 
   if [[ ! -d "$HOME/.ssh" ]]; then
@@ -136,4 +124,4 @@ if ! zstyle -t :omz:plugins:ssh-agent lazy; then
 fi
 
 unset agent_forwarding ssh_env_cache
-unfunction _start_agent _add_identities _is_agent_running
+unfunction _start_agent _add_identities

plugins/suse/README.md

@@ -71,6 +71,7 @@ Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 | Alias | Commands            | Description                              |
 | ----- | ------------------- | ---------------------------------------- |
 | zar   | `sudo zypper ar`    | add a repository                         |
+| zcl   | `sudo zypper clean` | clean cache                              |
 | zlr   | `zypper lr`         | list repositories                        |
 | zmr   | `sudo zypper mr`    | modify repositories                      |
 | znr   | `sudo zypper nr`    | rename repositories (for the alias only) |

plugins/suse/suse.plugin.zsh

@@ -38,6 +38,7 @@ alias zwp='zypper --no-refresh wp'
 
 #Repositories commands
 alias zar='sudo zypper ar'
+alias zcl='sudo zypper clean'
 alias zlr='zypper lr'
 alias zmr='sudo zypper mr'
 alias znr='sudo zypper nr'

plugins/systemd/README.md

@@ -45,7 +45,6 @@ plugins=(... systemd)
 | `sc-set-environment`   | `sudo systemctl set-environment`   | Set one or more systemd manager environment variables            |
 | `sc-unset-environment` | `sudo systemctl unset-environment` | Unset one or more systemd manager environment variables          |
 | `sc-edit`              | `sudo systemctl edit`              | Edit a drop-in snippet or a whole replacement file with `--full` |
-| `sc-edit-full`         | `sudo systemctl edit --full`       | Edit the whole unit file instead of a drop-in snippet            |
 | `sc-enable-now`        | `sudo systemctl enable --now`      | Enable and start unit(s)                                         |
 | `sc-disable-now`       | `sudo systemctl disable --now`     | Disable and stop unit(s)                                         |
 | `sc-mask-now`          | `sudo systemctl mask --now`        | Mask and stop unit(s)                                            |

plugins/systemd/systemd.plugin.zsh

@@ -97,10 +97,6 @@ alias scu-mask-now="scu-mask --now"
 alias scu-failed='systemctl --user --failed'
 alias sc-failed='systemctl --failed'
 
-# --full commands
-alias sc-edit-full="sc-edit --full"
-alias scu-edit-full="scu-edit --full"
-
 function systemd_prompt_info {
   local unit
   for unit in "$@"; do

plugins/vagrant/_vagrant

@@ -127,7 +127,7 @@ case $state in
       (box)
           __vagrant-box
       ;;
-      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status|suspend|rdp)
+      (up|provision|port|package|destroy|reload|ssh|ssh-config|halt|resume|status)
       _arguments ':feature:__vm_list'
     esac
   ;;

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

@@ -39,7 +39,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       # Get absolute path, resolving symlinks
       local PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
-          && ! -e "$PROJECT_ROOT/.git" ]]; do
+          && ! -d "$PROJECT_ROOT/.git" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
 

plugins/web-search/README.md

@@ -51,11 +51,6 @@ Available search contexts are:
 | `npmpkg`              | `https://www.npmjs.com/search?q=`               |
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
-| `maven`               | `https://central.sonatype.com/search?q=`        |
-| `pypi`                | `https://pypi.org/search/?q=`                   |
-| `aur`                 | `https://aur.archlinux.org/packages?O=0&K=`     |
-| `archwiki`            | `https://wiki.archlinux.org/index.php?search=`  |
-| `wikipedia`           | `https://en.wikipedia.org/w/index.php?search=`  |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
 | `claudeai`            | `https://claude.ai/new?q=`                      |
 | `grokcom`             | `https://grok.com/?q=`                          |

plugins/web-search/web-search.plugin.zsh

@@ -32,11 +32,6 @@ function web_search() {
     npmpkg          "https://www.npmjs.com/search?q="
     packagist       "https://packagist.org/?query="
     gopkg           "https://pkg.go.dev/search?m=package&q="
-    maven           "https://central.sonatype.com/search?q="
-    pypi            "https://pypi.org/search/?q="
-    aur             "https://aur.archlinux.org/packages?O=0&K="
-    archwiki        "https://wiki.archlinux.org/index.php?search="
-    wikipedia       "https://en.wikipedia.org/w/index.php?search="
     chatgpt         "https://chatgpt.com/?q="
     grok            "https://grok.com/?q="
     claudeai        "https://claude.ai/new?q="
@@ -97,11 +92,6 @@ alias gems='web_search gems'
 alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
-alias maven='web_search maven'
-alias pypi='web_search pypi'
-alias aur='web_search aur'
-alias archwiki='web_search archwiki'
-alias wikipedia='web_search wikipedia'
 alias chatgpt='web_search chatgpt'
 alias grokcom='web_search grok'
 alias claudeai='web_search claudeai'
@@ -126,3 +116,4 @@ if [[ ${#ZSH_WEB_SEARCH_ENGINES} -gt 0 ]]; then
   done
   unset engines key
 fi
+

themes/agnoster.zsh-theme

@@ -314,11 +314,8 @@ prompt_dir() {
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
-  # Skip the conda segment when conda is already showing the environment itself,
+  if [ -n "$CONDA_DEFAULT_ENV" ]; then
-  # i.e. when changeps1 is left on. This mirrors how VIRTUAL_ENV_DISABLE_PROMPT
+    prompt_segment magenta $CURRENT_FG "🐍 $CONDA_DEFAULT_ENV"
-  # is handled below, and stops the name appearing twice in the prompt.
-  if [[ -n "$CONDA_DEFAULT_ENV" && -z "$CONDA_PROMPT_MODIFIER" ]]; then
-    prompt_segment magenta $CURRENT_FG "🐍 ${CONDA_DEFAULT_ENV:t:gs/%/%%}"
   fi
   if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
     prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"

themes/jonathan.zsh-theme

@@ -14,7 +14,7 @@ function theme_precmd {
   if (( promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize > TERMWIDTH )); then
     (( PR_PWDLEN = TERMWIDTH - promptsize ))
   elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
-    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::─:)}"
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${PR_HBAR}:)}"
   else
     PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi

themes/strug.zsh-theme

@@ -4,8 +4,8 @@ export LSCOLORS=dxFxCxDxBxegedabagacad
 
 local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)'
 
-PROMPT="%{%(#~$fg[red]~$fg[green])%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
+PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
-%{%(#~$fg[red]~$fg[green])%}╰%(#~#~\$) %{$reset_color%}"
+%{$fg[green]%}╰\$ %{$reset_color%}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on "
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

tools/check_for_upgrade.sh

@@ -23,32 +23,12 @@ zstyle -s ':omz:update' mode update_mode || {
 # - the automatic update is disabled
 # - the current user doesn't have write permissions nor owns the $ZSH directory
 # - is not run from a tty
-if [[ "$update_mode" = disabled ]] \
-   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
-   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]]; then
-  unset update_mode
-  return
-fi
-
-# Cancel update if it's not time to check yet. This runs before the git checks
-# below because those fork on every startup. Skipped when a background update
-# left a result that still needs to be reported (EXIT_STATUS is set).
-() {
-  local LAST_EPOCH EXIT_STATUS ERROR epoch_target
-  zmodload zsh/datetime
-  source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || return 1
-  [[ -n "$LAST_EPOCH" && -z "$EXIT_STATUS" ]] || return 1
-  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
-  (( ( EPOCHSECONDS / 60 / 60 / 24 - LAST_EPOCH ) < epoch_target ))
-} && {
-  unset update_mode
-  return
-}
-
-# Cancel update if:
 # - git is unavailable on the system
 # - $ZSH is not a git repository
-if ! command git --version >/dev/null 2>&1 \
+if [[ "$update_mode" = disabled ]] \
+   || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
+   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
+   || ! command git --version >/dev/null 2>&1 \
    || (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
   unset update_mode
   return

tools/install.sh

@@ -528,10 +528,9 @@ print_success() {
     "$(fmt_code "$(fmt_link ".zshrc" "file://$zdot/.zshrc" --text)")" \
     "file to select plugins, themes, and options."
   printf '\n'
-  printf '%s\n' "• Follow along on X ($(fmt_link @ohmyzsh https://x.com/ohmyzsh)) or Bluesky ($(fmt_link @ohmyz.sh https://bsky.app/profile/ohmyz.sh))"
+  printf '%s\n' "• Follow us on X: $(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
-  printf '%s\n' "• Questions or ideas? Join the community on $(fmt_link Discord https://discord.gg/ohmyzsh)"
+  printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-  printf '%s\n' "• Help support the project: sponsor us on $(fmt_link "Open Collective" https://opencollective.com/ohmyzsh),"
+  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
-  printf '%s\n' "  or grab stickers, shirts, and swag from $(fmt_link CommitGoods https://commitgoods.com/ohmyzsh)"
   printf '%s\n' $FMT_RESET
 }
 

tools/upgrade.sh

@@ -271,18 +271,9 @@ if LANG= git pull --quiet --rebase $remote $branch; then
     printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
     printf '\n'
     printf "${BLUE}%s${RESET}\n\n" "$message"
-    printf "${BLUE}${BOLD}%s %s %s %s${RESET}\n" \
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on X:" "$(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
-      "Follow along on X" "($(fmt_link @ohmyzsh https://x.com/ohmyzsh))" \
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-      "or Bluesky" "($(fmt_link @ohmyz.sh https://bsky.app/profile/ohmyz.sh))"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "Questions or ideas? Join the community on" \
-      "$(fmt_link Discord https://discord.gg/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s,${RESET}\n" \
-      "Help support the project: sponsor us on" \
-      "$(fmt_link "Open Collective" https://opencollective.com/ohmyzsh)"
-    printf "${BLUE}${BOLD}%s %s${RESET}\n" \
-      "or grab stickers, shirts, and swag from" \
-      "$(fmt_link CommitGoods https://commitgoods.com/ohmyzsh)"
   elif [[ $verbose_mode == minimal ]]; then
     printf "${BLUE}%s${RESET}\n" "$message"
   fi