Merge branch 'ohmyzsh:master' into master

2025-12-05 01:46:46 +01:00 · 2025-08-10 22:07:15 +02:00 · 2025-08-10 22:07:15 +02:00 · 424286cab1
commit 424286cab1
parent 6a6e321c61 9d8d4cf414
19 changed files with 114 additions and 77 deletions
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@ -4,6 +4,9 @@ on:
  schedule:
    - cron: "0 6 * * 0"

+permissions:
+  contents: read
+
 jobs:
  check:
    name: Check for updates
@ -15,11 +18,11 @@ jobs:
        with:
          fetch-depth: 0
      - name: Authenticate as @ohmyzsh
-        id: generate_token
-        uses: ohmyzsh/github-app-token@v2
+        id: generate-token
+        uses: actions/create-github-app-token@v2
        with:
-          app_id: ${{ secrets.OHMYZSH_APP_ID }}
-          private_key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
+          app-id: ${{ secrets.OHMYZSH_APP_ID }}
+          private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
      - name: Setup Python
        uses: actions/setup-python@v5
        with:
@ -27,7 +30,7 @@ jobs:
          cache: "pip"
      - name: Process dependencies
        env:
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
          GIT_APP_NAME: ohmyzsh[bot]
          GIT_APP_EMAIL: 54982679+ohmyzsh[bot]@users.noreply.github.com
          TMP_DIR: ${{ runner.temp }}
--- a/.github/workflows/dependencies/requirements.txt
+++ b/.github/workflows/dependencies/requirements.txt
@ -1,4 +1,4 @@
-certifi==2025.4.26
+certifi==2025.7.14
 charset-normalizer==3.4.2
 idna==3.10
 PyYAML==6.0.2
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@ -17,13 +17,13 @@ jobs:
    if: github.repository == 'ohmyzsh/ohmyzsh'
    steps:
      - name: Authenticate as @ohmyzsh
-        id: generate_token
-        uses: ohmyzsh/github-app-token@v2
+        id: generate-token
+        uses: actions/create-github-app-token@v2
        with:
-          app_id: ${{ secrets.OHMYZSH_APP_ID }}
-          private_key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
+          app-id: ${{ secrets.OHMYZSH_APP_ID }}
+          private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
      - name: Store app token
-        run: echo "GH_TOKEN=${{ steps.generate_token.outputs.token }}" >> "$GITHUB_ENV"
+        run: echo "GH_TOKEN=${{ steps.generate-token.outputs.token }}" >> "$GITHUB_ENV"
      - name: Read project data
        env:
          ORGANIZATION: ohmyzsh
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@ -40,7 +40,7 @@ fi
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories

-# Use caching so that commands like apt and dpkg complete are useable
+# Use caching so that commands like apt and dpkg complete are usable
 zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' cache-path $ZSH_CACHE_DIR

--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@ -53,7 +53,7 @@ function omz_termsupport_precmd {

 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return 0

  emulate -L zsh
  setopt extended_glob
--- a/plugins/alias-finder/README.md
+++ b/plugins/alias-finder/README.md
@ -11,6 +11,8 @@ plugins=(... alias-finder)

 To enable it for every single command, set zstyle in your `~/.zshrc`.

+If the user has installed `rg`([ripgrep](https://github.com/BurntSushi/ripgrep)), it will be used because it's faster. Otherwise, it will use the `grep` command.
+
 ```zsh
 # ~/.zshrc

--- a/plugins/alias-finder/alias-finder.plugin.zsh
+++ b/plugins/alias-finder/alias-finder.plugin.zsh
@ -43,7 +43,11 @@ alias-finder() {
      filter="^'?.{1,$((cmdLen - 1))}'?=" # some aliases is surrounded by single quotes
    fi

+    if (( $+commands[rg] )); then
+      alias | rg "$filter" | rg "=$finder"
+    else
      alias | grep -E "$filter" | grep -E "=$finder"
+    fi

    if [[ $exact == true ]]; then
      break # because exact case is only one
--- a/plugins/dnf/_dnf5
+++ b/plugins/dnf/_dnf5
@ -272,7 +272,7 @@ _dnf5-repoquery() {
  for v in enhance obsolete provide recommend require suggest supplement; do
    opts+=( "--what${v}s=[limit to packages that $v specified capabilities]:list of capability: ")
  done
-  # mutually exclusive formating options
+  # mutually exclusive formatting options
  opts+=(
    + '(format)'
    '--conflicts[display capabilities that the package conflicts with]'
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@ -10,7 +10,7 @@ _dotnet_completion() {

 compdef _dotnet_completion dotnet

-# Aliases bellow are here for backwards compatibility
+# Aliases below are here for backwards compatibility
 # added by Shaun Tabone (https://github.com/xontab)

 alias dn='dotnet new'
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@ -15,9 +15,8 @@ plugins=(... extract)
 ## Supported file extensions

 | Extension         | Description                             |
-| :---------------- | :----------------------------------- |
+| :---------------- | :-------------------------------------- |
 | `7z`              | 7zip file                               |
-| `Z`               | Z archive (LZW)                      |
 | `apk`             | Android app file                        |
 | `aar`             | Android library file                    |
 | `bz2`             | Bzip2 file                              |
@ -34,6 +33,9 @@ plugins=(... extract)
 | `lz4`             | LZ4 archive                             |
 | `lzma`            | LZMA archive                            |
 | `obscpio`         | cpio archive used on OBS                |
+| `pk3`             | Renamed Zip archive used by Quake games |
+| `pk4`             | Renamed Zip archive used by Quake games |
+| `pk7`             | Renamed 7zip file used by Quake games   |
 | `rar`             | WinRAR archive                          |
 | `rpm`             | RPM package                             |
 | `sublime-package` | Sublime Text package                    |
@ -57,6 +59,7 @@ plugins=(... extract)
 | `whl`             | Python wheel file                       |
 | `xpi`             | Mozilla XPI module file                 |
 | `xz`              | LZMA2 archive                           |
+| `Z`               | Z archive (LZW)                         |
 | `zip`             | Zip archive                             |
 | `zlib`            | zlib archive                            |
 | `zst`             | Zstandard file (zstd)                   |
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@ -19,6 +19,9 @@ local -a exts=(
  lz4
  lzma
  obscpio
+  pk3
+  pk4
+  pk7
  rar
  rpm
  sublime-package
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@ -76,11 +76,11 @@ EOF
      (*.lz4) lz4 -d "$full_path" ;;
      (*.lzma) unlzma "$full_path" ;;
      (*.z) uncompress "$full_path" ;;
-      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx) unzip "$full_path" ;;
+      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx|*.pk3|*.pk4) unzip "$full_path" ;;
      (*.rar) unrar x -ad "$full_path" ;;
      (*.rpm)
        rpm2cpio "$full_path" | cpio --quiet -id ;;
-      (*.7z | *.7z.[0-9]*) 7za x "$full_path" ;;
+      (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;
      (*.deb)
        command mkdir -p "control" "data"
        ar vx "$full_path" > /dev/null
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@ -86,7 +86,7 @@ function work_in_progress() {
 # Aliases
 # (sorted alphabetically by command)
 # (order should follow README)
-# (in some cases force the alisas order to match README, like for example gke and gk)
+# (in some cases force the alias order to match README, like for example gke and gk)
 #

 alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@ -19,8 +19,15 @@ function {
 	# load additional options
 	zstyle -a :omz:plugins:keychain options options

-	# start keychain...
+	# Check keychain version to decide whether to use --agents
+	local version_string=$(keychain --version 2>&1 | head -n 2 | tail -n 1 | cut -d ' ' -f 4)
+  # start keychain, only use --agents for versions below 2.9.0
+	autoload -Uz is-at-least
+	if is-at-least 2.9 "$version_string"; then
+		keychain ${^options:-} ${^identities} --host $SHORT_HOST
+	else
 		keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
+	fi

 	# Get the filenames to store/lookup the environment from
 	_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@ -49,4 +49,4 @@ plugins=(... systemadmin)
 | geteip      | Gather information regarding an external IP address using [icanhazip.com](https://icanhazip.com)                      |
 | getip       | Determine the local IP Address with `ip addr` or `ifconfig`                                                           |
 | clrz        | Clear zombie processes                                                                                                |
-| conssec     | Show number of concurrent connections per second based on ngnix/access.log file or another log file if specified      |
+| conssec     | Show number of concurrent connections per second based on nginx/access.log file or another log file if specified      |
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@ -188,7 +188,7 @@ function _tmux_directory_session() {
 alias tds=_tmux_directory_session

 # Autostart if not already in tmux and enabled.
-if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" ]]; then
+if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" && -z "$ZED_TERM" ]]; then
  # Actually don't autostart if we already did and multiple autostarts are disabled.
  if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]; then
    export ZSH_TMUX_AUTOSTARTED=true
--- a/plugins/web-search/README.md
+++ b/plugins/web-search/README.md
@ -47,10 +47,13 @@ Available search contexts are:
 | `youtube`             | `https://www.youtube.com/results?search_query=` |
 | `deepl`               | `https://www.deepl.com/translator#auto/auto/`   |
 | `dockerhub`           | `https://hub.docker.com/search?q=`              |
+| `gems`                | `https://rubygems.org/search?query=`            |
 | `npmpkg`              | `https://www.npmjs.com/search?q=`               |
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
+| `claudeai`            | `https://claude.ai/new?q=`                      |
+| `grok`                | `https://grok.com/?q=`                          |
 | `reddit`              | `https://www.reddit.com/search/?q=`             |
 | `ppai`                | `https://www.perplexity.ai/search/new?q=`       |

--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@ -28,12 +28,17 @@ function web_search() {
    youtube         "https://www.youtube.com/results?search_query="
    deepl           "https://www.deepl.com/translator#auto/auto/"
    dockerhub       "https://hub.docker.com/search?q="
+    gems            "https://rubygems.org/search?query="
    npmpkg          "https://www.npmjs.com/search?q="
    packagist       "https://packagist.org/?query="
    gopkg           "https://pkg.go.dev/search?m=package&q="
    chatgpt         "https://chatgpt.com/?q="
+    grok            "https://grok.com/?q="
+    claudeai        "https://claude.ai/new?q="
    reddit          "https://www.reddit.com/search/?q="
    ppai            "https://www.perplexity.ai/search/new?q="
+    rscrate         "https://crates.io/search?q="
+    rsdoc           "https://docs.rs/releases/search?query="
  )

  # check whether the search engine is supported
@ -83,12 +88,17 @@ alias ask='web_search ask'
 alias youtube='web_search youtube'
 alias deepl='web_search deepl'
 alias dockerhub='web_search dockerhub'
+alias gems='web_search gems'
 alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
 alias chatgpt='web_search chatgpt'
+alias grok='web_search grok'
+alias claudeai='web_search claudeai'
 alias reddit='web_search reddit'
 alias ppai='web_search ppai'
+alias rscrate='web_search rscrate'
+alias rsdoc='web_search rsdoc'

 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
@ -106,3 +116,4 @@ if [[ ${#ZSH_WEB_SEARCH_ENGINES} -gt 0 ]]; then
  done
  unset engines key
 fi
+
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@ -8,14 +8,15 @@ function theme_precmd {
  local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
  local pwdsize=${#${(%):-%~}}
  local venvpromptsize=$((${#$(virtualenv_prompt_info)}))
+  local condapromptsize=$((${#$(conda_prompt_info)}))

  # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize + venvpromptsize > TERMWIDTH )); then
+  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 ) ))::${PR_HBAR}:)}"
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${PR_HBAR}:)}"
  else
-    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
  fi
 }

@ -104,7 +105,7 @@ fi
 PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
 ${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
 ${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
-${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
+${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)$(conda_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
 ${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
 ${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\