merge

2026-01-30 02:44:42 +01:00 · 2024-04-17 12:12:12 -07:00 · 2024-04-17 12:12:12 -07:00 · 8274156fae
commit 8274156fae
parent a8c56f5231
296 changed files with 6279 additions and 3141 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,11 +1,14 @@
 # Plugin owners
 plugins/archlinux/                  @ratijas
+plugins/dbt/                        @msempere
+plugins/eza/                        @pepoluan
 plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
 plugins/react-native                @esthor
 plugins/sdk/                        @rgoldberg
 plugins/shell-proxy/                @septs
+plugins/starship/                   @axieax
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
 plugins/zoxide/                     @ajeetdsouza
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+  - package-ecosystem: "pip"
+    directory: "/.github/workflows/dependencies"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
--- a/.github/dependencies.yml
+++ b/.github/dependencies.yml
@ -0,0 +1,38 @@
+dependencies:
+  plugins/gitfast:
+    repo: felipec/git-completion
+    branch: master
+    version: tag:v2.1
+    postcopy: |
+      set -e
+      rm -rf git-completion.plugin.zsh Makefile README.adoc t tools
+      test -e git-completion.zsh && mv -f git-completion.zsh _git
+  plugins/z:
+    branch: master
+    repo: agkozak/zsh-z
+    version: afaf2965b41fdc6ca66066e09382726aa0b6aa04
+    precopy: |
+      set -e
+      test -e README.md && mv -f README.md MANUAL.md
+    postcopy: |
+      set -e
+      test -e _zshz && mv -f _zshz _z
+      test -e zsh-z.plugin.zsh && mv -f zsh-z.plugin.zsh z.plugin.zsh
+  plugins/history-substring-search:
+    repo: zsh-users/zsh-history-substring-search
+    branch: master
+    version: 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
+    precopy: |
+      set -e
+      rm -f zsh-history-substring-search.plugin.zsh
+      test -e zsh-history-substring-search.zsh && mv zsh-history-substring-search.zsh history-substring-search.zsh
+    postcopy: |
+      set -e
+      test -e dependencies/OMZ-README.md && cat dependencies/OMZ-README.md >> README.md
+  plugins/gradle:
+    repo: gradle/gradle-completion
+    branch: master
+    version: 25da917cf5a88f3e58f05be3868a7b2748c8afe6
+    precopy: |
+      set -e
+      find . ! -name _gradle ! -name LICENSE -delete
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@ -0,0 +1,29 @@
+name: Update dependencies
+on:
+  workflow_dispatch: {}
+  # schedule:
+  #   - cron: '34 3 * * */8'
+
+jobs:
+  check:
+    name: Check for updates
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Authenticate as @ohmyzsh
+        id: generate_token
+        uses: ohmyzsh/github-app-token@v2
+        with:
+          app_id: ${{ secrets.OHMYZSH_APP_ID }}
+          private_key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
+      - name: Process dependencies
+        env:
+          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 }}
+        run: |
+          pip install -r .github/workflows/dependencies/requirements.txt
+          python3 .github/workflows/dependencies/updater.py
--- a/.github/workflows/dependencies/requirements.txt
+++ b/.github/workflows/dependencies/requirements.txt
@ -0,0 +1,2 @@
+PyYAML~=6.0.1
+requests~=2.31.0
--- a/.github/workflows/dependencies/updater.py
+++ b/.github/workflows/dependencies/updater.py
@ -0,0 +1,450 @@
+import os
+import subprocess
+import sys
+import requests
+import shutil
+import yaml
+from copy import deepcopy
+from typing import Optional, TypedDict
+
+# Get TMP_DIR variable from environment
+TMP_DIR = os.path.join(os.environ.get("TMP_DIR", "/tmp"), "ohmyzsh")
+# Relative path to dependencies.yml file
+DEPS_YAML_FILE = ".github/dependencies.yml"
+# Dry run flag
+DRY_RUN = os.environ.get("DRY_RUN", "0") == "1"
+
+import timeit
+class CodeTimer:
+  def __init__(self, name=None):
+    self.name = " '"  + name + "'" if name else ''
+
+  def __enter__(self):
+    self.start = timeit.default_timer()
+
+  def __exit__(self, exc_type, exc_value, traceback):
+    self.took = (timeit.default_timer() - self.start) * 1000.0
+    print('Code block' + self.name + ' took: ' + str(self.took) + ' ms')
+
+
+### YAML representation
+def str_presenter(dumper, data):
+  """
+  Configures yaml for dumping multiline strings
+  Ref: https://stackoverflow.com/a/33300001
+  """
+  if len(data.splitlines()) > 1:  # check for multiline string
+    return dumper.represent_scalar('tag:yaml.org,2002:str', data, style='|')
+  return dumper.represent_scalar('tag:yaml.org,2002:str', data)
+
+yaml.add_representer(str, str_presenter)
+yaml.representer.SafeRepresenter.add_representer(str, str_presenter)
+
+
+# Types
+class DependencyDict(TypedDict):
+  repo: str
+  branch: str
+  version: str
+  precopy: Optional[str]
+  postcopy: Optional[str]
+
+class DependencyYAML(TypedDict):
+  dependencies: dict[str, DependencyDict]
+
+class UpdateStatus(TypedDict):
+  has_updates: bool
+  version: Optional[str]
+  compare_url: Optional[str]
+  head_ref: Optional[str]
+  head_url: Optional[str]
+
+
+class CommandRunner:
+  class Exception(Exception):
+    def __init__(self, message, returncode, stage, stdout, stderr):
+      super().__init__(message)
+      self.returncode = returncode
+      self.stage = stage
+      self.stdout = stdout
+      self.stderr = stderr
+
+  @staticmethod
+  def run_or_fail(command: list[str], stage: str, *args, **kwargs):
+    if DRY_RUN and command[0] == "gh":
+      command.insert(0, "echo")
+
+    result = subprocess.run(command, *args, capture_output=True, **kwargs)
+
+    if result.returncode != 0:
+      raise CommandRunner.Exception(
+        f"{stage} command failed with exit code {result.returncode}", returncode=result.returncode,
+        stage=stage,
+        stdout=result.stdout.decode("utf-8"),
+        stderr=result.stderr.decode("utf-8")
+      )
+
+    return result
+
+
+class DependencyStore:
+  store: DependencyYAML = {
+    "dependencies": {}
+  }
+
+  @staticmethod
+  def set(data: DependencyYAML):
+    DependencyStore.store = data
+
+  @staticmethod
+  def update_dependency_version(path: str, version: str) -> DependencyYAML:
+    with CodeTimer(f"store deepcopy: {path}"):
+      store_copy = deepcopy(DependencyStore.store)
+
+    dependency = store_copy["dependencies"].get(path, {})
+    dependency["version"] = version
+    store_copy["dependencies"][path] = dependency
+
+    return store_copy
+
+  @staticmethod
+  def write_store(file: str, data: DependencyYAML):
+    with open(file, "w") as yaml_file:
+      yaml.safe_dump(data, yaml_file, sort_keys=False)
+
+
+class Dependency:
+  def __init__(self, path: str, values: DependencyDict):
+    self.path = path
+    self.values = values
+
+    self.name: str = ""
+    self.desc: str = ""
+    self.kind: str = ""
+
+    match path.split("/"):
+      case ["plugins", name]:
+        self.name = name
+        self.kind = "plugin"
+        self.desc = f"{name} plugin"
+      case ["themes", name]:
+        self.name = name.replace(".zsh-theme", "")
+        self.kind = "theme"
+        self.desc = f"{self.name} theme"
+      case _:
+        self.name = self.desc = path
+
+  def __str__(self):
+    output: str = ""
+    for key in DependencyDict.__dict__['__annotations__'].keys():
+      if key not in self.values:
+        output += f"{key}: None\n"
+        continue
+
+      value = self.values[key]
+      if "\n" not in value:
+        output += f"{key}: {value}\n"
+      else:
+        output += f"{key}:\n  "
+        output += value.replace("\n", "\n  ", value.count("\n") - 1)
+    return output
+
+  def update_or_notify(self):
+    # Print dependency settings
+    print(f"Processing {self.desc}...", file=sys.stderr)
+    print(self, file=sys.stderr)
+
+    # Check for updates
+    repo = self.values["repo"]
+    remote_branch = self.values["branch"]
+    version = self.values["version"]
+    is_tag = version.startswith("tag:")
+
+    try:
+      with CodeTimer(f"update check: {repo}"):
+        if is_tag:
+          status = GitHub.check_newer_tag(repo, version.replace("tag:", ""))
+        else:
+          status = GitHub.check_updates(repo, remote_branch, version)
+
+      if status["has_updates"]:
+        short_sha = status["head_ref"][:8]
+        new_version = status["version"] if is_tag else short_sha
+
+        try:
+          # Create new branch
+          branch = Git.create_branch(self.path, new_version)
+
+          # Update dependencies.yml file
+          self.__update_yaml(f"tag:{new_version}" if is_tag else status["version"])
+
+          # Update dependency files
+          self.__apply_upstream_changes()
+
+          # Add all changes and commit
+          Git.add_and_commit(self.name, short_sha)
+
+          # Push changes to remote
+          Git.push(branch)
+
+          # Create GitHub PR
+          GitHub.create_pr(
+            branch,
+            f"feat({self.name}): update to version {new_version}",
+            f"""## Description
+
+Update for **{self.desc}**: update to version [{new_version}]({status['head_url']}).
+Check out the [list of changes]({status['compare_url']}).
+"""
+          )
+
+          # Clean up repository
+          Git.clean_repo()
+        except (CommandRunner.Exception, shutil.Error) as e:
+          # Handle exception on automatic update
+          match type(e):
+            case CommandRunner.Exception:
+              # Print error message
+              print(f"Error running {e.stage} command: {e.returncode}", file=sys.stderr)
+              print(e.stderr, file=sys.stderr)
+            case shutil.Error:
+              print(f"Error copying files: {e}", file=sys.stderr)
+
+          try:
+            Git.clean_repo()
+          except CommandRunner.Exception as e:
+            print(f"Error reverting repository to clean state: {e}", file=sys.stderr)
+            sys.exit(1)
+
+          # Create a GitHub issue to notify maintainer
+          title = f"{self.path}: update to {new_version}"
+          body = (
+            f"""## Description
+
+There is a new version of `{self.name}` {self.kind} available.
+
+New version: [{new_version}]({status['head_url']})
+Check out the [list of changes]({status['compare_url']}).
+"""
+          )
+
+          print(f"Creating GitHub issue", file=sys.stderr)
+          print(f"{title}\n\n{body}", file=sys.stderr)
+          GitHub.create_issue(title, body)
+    except Exception as e:
+      print(e, file=sys.stderr)
+
+  def __update_yaml(self, new_version: str) -> None:
+    dep_yaml = DependencyStore.update_dependency_version(self.path, new_version)
+    DependencyStore.write_store(DEPS_YAML_FILE, dep_yaml)
+
+  def __apply_upstream_changes(self) -> None:
+    # Patterns to ignore in copying files from upstream repo
+    GLOBAL_IGNORE = [
+      ".git",
+      ".github",
+      ".gitignore"
+    ]
+
+    path = os.path.abspath(self.path)
+    precopy = self.values.get("precopy")
+    postcopy = self.values.get("postcopy")
+
+    repo = self.values["repo"]
+    branch = self.values["branch"]
+    remote_url = f"https://github.com/{repo}.git"
+    repo_dir = os.path.join(TMP_DIR, repo)
+
+    # Clone repository
+    Git.clone(remote_url, branch, repo_dir, reclone=True)
+
+    # Run precopy on tmp repo
+    if precopy is not None:
+      print("Running precopy script:", end="\n  ", file=sys.stderr)
+      print(precopy.replace("\n", "\n  ", precopy.count("\n") - 1), file=sys.stderr)
+      CommandRunner.run_or_fail(["bash", "-c", precopy], cwd=repo_dir, stage="Precopy")
+
+    # Copy files from upstream repo
+    print(f"Copying files from {repo_dir} to {path}", file=sys.stderr)
+    shutil.copytree(repo_dir, path, dirs_exist_ok=True, ignore=shutil.ignore_patterns(*GLOBAL_IGNORE))
+
+    # Run postcopy on our repository
+    if postcopy is not None:
+      print("Running postcopy script:", end="\n  ", file=sys.stderr)
+      print(postcopy.replace("\n", "\n  ", postcopy.count("\n") - 1), file=sys.stderr)
+      CommandRunner.run_or_fail(["bash", "-c", postcopy], cwd=path, stage="Postcopy")
+
+
+class Git:
+  default_branch = "master"
+
+  @staticmethod
+  def clone(remote_url: str, branch: str, repo_dir: str, reclone=False):
+    # If repo needs to be fresh
+    if reclone and os.path.exists(repo_dir):
+      shutil.rmtree(repo_dir)
+
+    # Clone repo in tmp directory and checkout branch
+    if not os.path.exists(repo_dir):
+      print(f"Cloning {remote_url} to {repo_dir} and checking out {branch}", file=sys.stderr)
+      CommandRunner.run_or_fail(["git", "clone", "--depth=1", "-b", branch, remote_url, repo_dir], stage="Clone")
+
+  @staticmethod
+  def create_branch(path: str, version: str):
+    # Get current branch name
+    result = CommandRunner.run_or_fail(["git", "rev-parse", "--abbrev-ref", "HEAD"], stage="GetDefaultBranch")
+    Git.default_branch = result.stdout.decode("utf-8").strip()
+
+    # Create new branch and return created branch name
+    branch_name = f"update/{path}/{version}"
+    CommandRunner.run_or_fail(["git", "checkout", "-b", branch_name], stage="CreateBranch")
+    return branch_name
+
+  @staticmethod
+  def add_and_commit(scope: str, version: str):
+    user_name = os.environ.get("GIT_APP_NAME")
+    user_email = os.environ.get("GIT_APP_EMAIL")
+
+    # Add all files to git staging
+    CommandRunner.run_or_fail(["git", "add", "-A", "-v"], stage="AddFiles")
+
+    # Reset environment and git config
+    clean_env = os.environ.copy()
+    clean_env["LANG"]="C.UTF-8"
+    clean_env["GIT_CONFIG_GLOBAL"]="/dev/null"
+    clean_env["GIT_CONFIG_NOSYSTEM"]="1"
+
+    # Commit with settings above
+    CommandRunner.run_or_fail([
+      "git",
+      "-c", f"user.name={user_name}",
+      "-c", f"user.email={user_email}",
+      "commit",
+      "-m", f"feat({scope}): update to {version}"
+    ], stage="CreateCommit", env=clean_env)
+
+  @staticmethod
+  def push(branch: str):
+    CommandRunner.run_or_fail(["git", "push", "-u", "origin", branch], stage="PushBranch")
+
+  @staticmethod
+  def clean_repo():
+    CommandRunner.run_or_fail(["git", "reset", "--hard", "HEAD"], stage="ResetRepository")
+    CommandRunner.run_or_fail(["git", "checkout", Git.default_branch], stage="CheckoutDefaultBranch")
+
+
+class GitHub:
+  @staticmethod
+  def check_newer_tag(repo, current_tag) -> UpdateStatus:
+    # GET /repos/:owner/:repo/git/refs/tags
+    url = f"https://api.github.com/repos/{repo}/git/refs/tags"
+
+    # Send a GET request to the GitHub API
+    response = requests.get(url)
+
+    # If the request was successful
+    if response.status_code == 200:
+      # Parse the JSON response
+      data = response.json()
+
+      if len(data) == 0:
+        return {
+          "has_updates": False,
+        }
+
+      latest_ref = data[-1]
+      latest_tag = latest_ref["ref"].replace("refs/tags/", "")
+
+      if latest_tag == current_tag:
+        return {
+          "has_updates": False,
+        }
+
+      return {
+        "has_updates": True,
+        "version": latest_tag,
+        "compare_url": f"https://github.com/{repo}/compare/{current_tag}...{latest_tag}",
+        "head_ref": latest_ref["object"]["sha"],
+        "head_url": f"https://github.com/{repo}/releases/tag/{latest_tag}",
+      }
+    else:
+      # If the request was not successful, raise an exception
+      raise Exception(f"GitHub API request failed with status code {response.status_code}: {response.json()}")
+
+  @staticmethod
+  def check_updates(repo, branch, version) -> UpdateStatus:
+    # TODO: add support for semver updating (based on tags)
+    # Check if upstream github repo has a new version
+    # GitHub API URL for comparing two commits
+    url = f"https://api.github.com/repos/{repo}/compare/{version}...{branch}"
+
+    # Send a GET request to the GitHub API
+    response = requests.get(url)
+
+    # If the request was successful
+    if response.status_code == 200:
+      # Parse the JSON response
+      data = response.json()
+
+      # If the base is behind the head, there is a newer version
+      has_updates = data["status"] != "identical"
+
+      if not has_updates:
+        return {
+          "has_updates": False,
+        }
+
+      return {
+        "has_updates": data["status"] != "identical",
+        "version": data["commits"][-1]["sha"],
+        "compare_url": data["permalink_url"],
+        "head_ref": data["commits"][-1]["sha"],
+        "head_url": data["commits"][-1]["html_url"]
+      }
+    else:
+      # If the request was not successful, raise an exception
+      raise Exception(f"GitHub API request failed with status code {response.status_code}: {response.json()}")
+
+  @staticmethod
+  def create_issue(title: str, body: str) -> None:
+    cmd = [
+      "gh",
+      "issue",
+      "create",
+      "-t", title,
+      "-b", body
+    ]
+    CommandRunner.run_or_fail(cmd, stage="CreateIssue")
+
+  @staticmethod
+  def create_pr(branch: str, title: str, body: str) -> None:
+    cmd = [
+      "gh",
+      "pr",
+      "create",
+      "-B", Git.default_branch,
+      "-H", branch,
+      "-t", title,
+      "-b", body
+    ]
+    CommandRunner.run_or_fail(cmd, stage="CreatePullRequest")
+
+
+def main():
+  # Load the YAML file
+  with open(DEPS_YAML_FILE, "r") as yaml_file:
+    data: DependencyYAML = yaml.safe_load(yaml_file)
+
+  if "dependencies" not in data:
+    raise Exception(f"dependencies.yml not properly formatted")
+
+  # Cache YAML version
+  DependencyStore.set(data)
+
+  dependencies = data["dependencies"]
+  for path in dependencies:
+    dependency = Dependency(path, dependencies[path])
+    dependency.update_or_notify()
+
+if __name__ == "__main__":
+  main()
--- a/.github/workflows/installer.yml
+++ b/.github/workflows/installer.yml
@ -0,0 +1,56 @@
+name: Test and Deploy installer
+on:
+  workflow_dispatch: {}
+  push:
+    paths:
+      - 'tools/install.sh'
+      - '.github/workflows/installer/**'
+      - '.github/workflows/installer.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read # to checkout
+
+jobs:
+  test:
+    name: Test installer
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    steps:
+      - name: Set up git repository
+        uses: actions/checkout@v4
+      - name: Install zsh
+        if: runner.os == 'Linux'
+        run: sudo apt-get update; sudo apt-get install zsh
+      - name: Test installer
+        run: sh ./tools/install.sh
+
+  deploy:
+    name: Deploy installer in install.ohmyz.sh
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    environment: vercel
+    needs:
+      - test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Vercel CLI
+        run: npm install -g vercel
+      - name: Setup project and deploy
+        env:
+          VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+          VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+          VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+        run: |
+          cp tools/install.sh .github/workflows/installer/install.sh
+          cd .github/workflows/installer
+          vc deploy --prod -t "$VERCEL_TOKEN"
--- a/.github/workflows/installer/.gitignore
+++ b/.github/workflows/installer/.gitignore
@ -0,0 +1 @@
+install.sh
--- a/.github/workflows/installer/.vercelignore
+++ b/.github/workflows/installer/.vercelignore
@ -0,0 +1,2 @@
+/*
+!/install.sh
--- a/.github/workflows/installer/vercel.json
+++ b/.github/workflows/installer/vercel.json
@ -0,0 +1,23 @@
+{
+  "headers": [
+    {
+      "source": "/((?!favicon.ico).*)",
+      "headers": [
+        {
+          "key": "Content-Type",
+          "value": "text/plain"
+        },
+        {
+          "key": "Content-Disposition",
+          "value": "inline; filename=\"install.sh\""
+        }
+      ]
+    }
+  ],
+  "rewrites": [
+    {
+      "source": "/((?!favicon.ico|install.sh).*)",
+      "destination": "/install.sh"
+    }
+  ]
+}
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -20,19 +20,13 @@ permissions:
 jobs:
  tests:
    name: Run tests
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
    if: github.repository == 'ohmyzsh/ohmyzsh'
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
    steps:
      - name: Set up git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Install zsh
-        if: runner.os == 'Linux'
        run: sudo apt-get update; sudo apt-get install zsh
-      - name: Test installer
-        run: sh ./tools/install.sh
      - name: Check syntax
        run: |
          for file in ./oh-my-zsh.sh \
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@ -15,9 +15,15 @@ jobs:
    name: Add to project
    runs-on: ubuntu-latest
    if: github.repository == 'ohmyzsh/ohmyzsh'
-    env:
-      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
    steps:
+      - name: Authenticate as @ohmyzsh
+        id: generate_token
+        uses: ohmyzsh/github-app-token@v2
+        with:
+          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"
      - name: Read project data
        env:
          ORGANIZATION: ohmyzsh
--- a/README.md
+++ b/README.md
@ -13,38 +13,43 @@ Finally, you'll begin to get the sort of attention that you have always felt you
 To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and join us on [Discord](https://discord.gg/ohmyzsh).

 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
-[![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
+[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/ohmyzsh?label=%40ohmyzsh&logo=x&style=flat)](https://twitter.com/intent/follow?screen_name=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)
 [![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
-[![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)

 <details>
 <summary>Table of Contents</summary>

 - [Getting Started](#getting-started)
+  - [Operating System Compatibility](#operating-system-compatibility)
  - [Prerequisites](#prerequisites)
  - [Basic Installation](#basic-installation)
-    - [Manual inspection](#manual-inspection)
+    - [Manual Inspection](#manual-inspection)
 - [Using Oh My Zsh](#using-oh-my-zsh)
  - [Plugins](#plugins)
    - [Enabling Plugins](#enabling-plugins)
    - [Using Plugins](#using-plugins)
  - [Themes](#themes)
-    - [Selecting a Theme](#selecting-a-theme)
+    - [Selecting A Theme](#selecting-a-theme)
  - [FAQ](#faq)
 - [Advanced Topics](#advanced-topics)
  - [Advanced Installation](#advanced-installation)
    - [Custom Directory](#custom-directory)
-    - [Unattended install](#unattended-install)
-    - [Installing from a forked repository](#installing-from-a-forked-repository)
+    - [Unattended Install](#unattended-install)
+    - [Installing From A Forked Repository](#installing-from-a-forked-repository)
    - [Manual Installation](#manual-installation)
  - [Installation Problems](#installation-problems)
-  - [Custom Plugins and Themes](#custom-plugins-and-themes)
+  - [Custom Plugins And Themes](#custom-plugins-and-themes)
+  - [Enable GNU ls In macOS And freeBSD Systems](#enable-gnu-ls-in-macos-and-freebsd-systems)
+  - [Skip Aliases](#skip-aliases)
+  - [Disable async git prompt](#disable-async-git-prompt)
 - [Getting Updates](#getting-updates)
+  - [Updates Verbosity](#updates-verbosity)
  - [Manual Updates](#manual-updates)
 - [Uninstalling Oh My Zsh](#uninstalling-oh-my-zsh)
- [How do I contribute to Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
-  - [Do NOT send us themes](#do-not-send-us-themes)
+- [How Do I Contribute To Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
+  - [Do Not Send Us Themes](#do-not-send-us-themes)
 - [Contributors](#contributors)
 - [Follow Us](#follow-us)
 - [Merchandise](#merchandise)
@ -55,9 +60,21 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi

 ## Getting Started

+### Operating System Compatibility
+
+| O/S            | Status  |
+| :------------- | :-----: |
+| Android        |   ✅    |
+| freeBSD        |   ✅    |
+| LCARS          |   🛸    |
+| Linux          |   ✅    |
+| macOS          |   ✅    |
+| OS/2 Warp      |   ❌    |
+| Windows (WSL2) |   ✅    |
+
+
 ### Prerequisites

- A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL2 is preferred, but cygwin or msys also mostly work.
 - [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
 - `curl` or `wget` should be installed
 - `git` should be installed (recommended v2.4.11 or higher)
@ -72,9 +89,17 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |

+Alternatively, the installer is also mirrored outside GitHub. Using this URL instead may be required if you're in a country like India or China, that blocks `raw.githubusercontent.com`:
+
+| Method    | Command                                                                                           |
+| :-------- | :------------------------------------------------------------------------------------------------ |
+| **curl**  | `sh -c "$(curl -fsSL https://install.ohmyz.sh/)"`                                                 |
+| **wget**  | `sh -c "$(wget -O- https://install.ohmyz.sh/)"`                                                   |
+| **fetch** | `sh -c "$(fetch -o - https://install.ohmyz.sh/)"`                                                 |
+
 _Note that any previous `.zshrc` will be renamed to `.zshrc.pre-oh-my-zsh`. After installation, you can move the configuration you want to preserve into the new `.zshrc`._

-#### Manual inspection
+#### Manual Inspection

 It's a good idea to inspect the install script from projects you don't yet know. You can do
 that by downloading the install script first, looking through it so everything looks normal,
@ -85,6 +110,8 @@ wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```

+If the above URL times out or otherwise fails, you may have to substitute the URL for `https://install.ohmyz.sh` to be able to get the script.
+
 ## Using Oh My Zsh

 ### Plugins
@ -123,7 +150,7 @@ Each built-in plugin includes a **README**, documenting it. This README should s

 We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred and fifty themes now bundled. Most of them have [screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki (We are working on updating this!). Check them out!

-#### Selecting a Theme
+#### Selecting A Theme

 _Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._

@ -194,7 +221,7 @@ like this:
 ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 ```

-#### Unattended install
+#### Unattended Install

 If you're running the Oh My Zsh install script as part of an automated install, you can pass the `--unattended`
 flag to the `install.sh` script. This will have the effect of not trying to change
@ -204,7 +231,9 @@ the default shell, and it also won't run `zsh` when the installation has finishe
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```

-#### Installing from a forked repository
+If you're in China, India, or another country that blocks `raw.githubusercontent.com`, you may have to substitute the URL for `https://install.ohmyz.sh` for it to install.
+
+#### Installing From A Forked Repository

 The install script also accepts these variables to allow installation of a different repository:

@ -229,19 +258,19 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh

 #### Manual Installation

-##### 1. Clone the repository <!-- omit in toc -->
+##### 1. Clone The Repository <!-- omit in toc -->

 ```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```

-##### 2. _Optionally_, backup your existing `~/.zshrc` file <!-- omit in toc -->
+##### 2. _Optionally_, Backup Your Existing `~/.zshrc` File <!-- omit in toc -->

 ```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```

-##### 3. Create a new zsh configuration file <!-- omit in toc -->
+##### 3. Create A New Zsh Configuration File <!-- omit in toc -->

 You can create a new zsh config file by copying the template that we have included for you.

@ -249,7 +278,7 @@ You can create a new zsh config file by copying the template that we have includ
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```

-##### 4. Change your default shell <!-- omit in toc -->
+##### 4. Change Your Default Shell <!-- omit in toc -->

 ```sh
 chsh -s $(which zsh)
@ -257,7 +286,7 @@ chsh -s $(which zsh)

 You must log out from your user session and log back in to see this change.

-##### 5. Initialize your new zsh configuration <!-- omit in toc -->
+##### 5. Initialize Your New Zsh Configuration <!-- omit in toc -->

 Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.

@ -268,7 +297,7 @@ If you have any hiccups installing, here are a few common fixes.
 - You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
 - If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.

-### Custom Plugins and Themes
+### Custom Plugins And Themes

 If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.

@ -276,16 +305,83 @@ If you have many functions that go well together, you can put them as a `XYZ.plu

 If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.

-### Remove directories aliases
+### Enable GNU ls In macOS And freeBSD Systems

-If you want to skip ohmyzsh default
-[directories aliases](https://github.com/ohmyzsh/ohmyzsh/blob/master/lib/directories.zsh) you can add the
-following snippet to your `zshrc`, before loading `oh-my-zsh.sh` script:
+<a name="enable-gnu-ls"></a>
+
+The default behaviour in Oh My Zsh is to use BSD `ls` in macOS and freeBSD systems. If GNU `ls` is installed
+(as `gls` command), you can choose to use it instead. To do it, you can use zstyle-based config before
+sourcing `oh-my-zsh.sh`:

 ```zsh
+zstyle ':omz:lib:theme-and-appearance' gnu-ls yes
+```
+
+_Note: this is not compatible with `DISABLE_LS_COLORS=true`_
+
+### Skip Aliases
+
+<a name="remove-directories-aliases"></a>
+
+If you want to skip default Oh My Zsh aliases (those defined in `lib/*` files) or plugin aliases,
+you can use the settings below in your `~/.zshrc` file, **before Oh My Zsh is loaded**. Note that
+there are many different ways to skip aliases, depending on your needs.
+
+```sh
+# Skip all aliases, in lib files and enabled plugins
+zstyle ':omz:*' aliases no
+
+# Skip all aliases in lib files
+zstyle ':omz:lib:*' aliases no
+# Skip only aliases defined in the directories.zsh lib file
+zstyle ':omz:lib:directories' aliases no
+
+# Skip all plugin aliases
+zstyle ':omz:plugins:*' aliases no
+# Skip only the aliases from the git plugin
+zstyle ':omz:plugins:git' aliases no
+```
+
+You can combine these in other ways taking into account that more specific scopes takes precedence:
+
+```sh
+# Skip all plugin aliases, except for the git plugin
+zstyle ':omz:plugins:*' aliases no
+zstyle ':omz:plugins:git' aliases yes
+```
+
+A previous version of this feature was using the setting below, which has been removed:
+
+```sh
 zstyle ':omz:directories' aliases no
 ```

+Instead, you can now use the following:
+
+```sh
+zstyle ':omz:lib:directories' aliases no
+```
+
+### Disable async git prompt
+
+Async prompt functions are an experimental feature (included on April 3, 2024) that allows Oh My Zsh to render prompt information
+asyncronously. This can improve prompt rendering performance, but it might not work well with some setups. We hope that's not an
+issue, but if you're seeing problems with this new feature, you can turn it off by setting the following in your .zshrc file,
+before Oh My Zsh is sourced:
+
+```sh
+zstyle ':omz:alpha:lib:git' async-prompt no
+```
+
+#### Notice <!-- omit in toc -->
+
+> This feature is currently in a testing phase and it may be subject to change in the future.
+> It is also not currently compatible with plugin managers such as zpm or zinit, which don't
+> source the init script (`oh-my-zsh.sh`) where this feature is implemented in.
+
+> It is also not currently aware of "aliases" that are defined as functions. Example of such
+> are `gccd`, `ggf`, or `ggl` functions from the git plugin.
+
 ## Getting Updates

 By default, you will be prompted to check for updates every 2 weeks. You can choose other update modes by adding a line to your `~/.zshrc` file, **before Oh My Zsh is loaded**:
@ -317,6 +413,18 @@ zstyle ':omz:update' frequency 7
 zstyle ':omz:update' frequency 0
 ```

+### Updates Verbosity
+
+You can also limit the update verbosity with the following settings:
+
+```sh
+zstyle ':omz:update' verbose default # default update prompt
+
+zstyle ':omz:update' verbose minimal # only few lines
+
+zstyle ':omz:update' verbose silent # only errors
+```
+
 ### Manual Updates

 If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
@ -333,7 +441,7 @@ Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy b

 If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.

-## How do I contribute to Oh My Zsh?
+## How Do I Contribute To Oh My Zsh?

 Before you participate in our delightful community, please read the [code of conduct](CODE_OF_CONDUCT.md).

@ -343,7 +451,7 @@ We also need people to test out pull requests. So take a look through [the open

 See [Contributing](CONTRIBUTING.md) for more details.

-### Do NOT send us themes
+### Do Not Send Us Themes

 We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/ohmyzsh/ohmyzsh/wiki/External-themes) wiki page.

@ -353,6 +461,10 @@ Oh My Zsh has a vibrant community of happy users and delightful contributors. Wi

 Thank you so much!

+<a href="https://github.com/ohmyzsh/ohmyzsh/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=ohmyzsh/ohmyzsh" width="100%"/>
+</a>
+
 ## Follow Us

 We're on social media:
--- a/SECURITY.md
+++ b/SECURITY.md
@ -17,8 +17,7 @@ In the near future we will introduce versioning, so expect this section to chang

 **Do not submit an issue or pull request**: this might reveal the vulnerability.

-Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
+Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh),
+or using the link to [privately report a vulnerability with GitHub](https://github.com/ohmyzsh/ohmyzsh/security/advisories/new).

 We will deal with the vulnerability privately and submit a patch as soon as possible.
-
-You can also submit your vulnerability report to [huntr.dev](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh) and see if you can get a bounty reward.
--- a/custom/example.zsh
+++ b/custom/example.zsh
@ -0,0 +1,12 @@
+# Put files in this folder to add your own custom functionality.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization
+#
+# Files in the custom/ directory will be:
+# - loaded automatically by the init script, in alphabetical order
+# - loaded last, after all built-ins in the lib/ directory, to override them
+# - ignored by git by default
+#
+# Example: add custom/shortcuts.zsh for shortcuts to your local projects
+#
+# brainstormr=~/Projects/development/planetargon/brainstormr
+# cd $brainstormr
--- a/custom/plugins/example/example.plugin.zsh
+++ b/custom/plugins/example/example.plugin.zsh
@ -0,0 +1,3 @@
+# Add your own custom plugins in the custom/plugins directory. Plugins placed
+# here will override ones with the same name in the main plugins directory.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-plugins
--- a/custom/themes/example.zsh-theme
+++ b/custom/themes/example.zsh-theme
@ -0,0 +1,6 @@
+# Put your custom themes in this folder.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes
+#
+# Example:
+
+PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "
--- a/lib/async_prompt.zsh
+++ b/lib/async_prompt.zsh
@ -0,0 +1,144 @@
+# The async code is taken from
+# https://github.com/zsh-users/zsh-autosuggestions/blob/master/src/async.zsh
+# https://github.com/woefe/git-prompt.zsh/blob/master/git-prompt.zsh
+
+zmodload zsh/system
+autoload -Uz is-at-least
+
+# For now, async prompt function handlers are set up like so:
+# First, define the async function handler and register the handler
+# with _omz_register_handler:
+#
+#  function _git_prompt_status_async {
+#    # Do some expensive operation that outputs to stdout
+#  }
+#  _omz_register_handler _git_prompt_status_async
+#
+# Then add a stub prompt function in `$PROMPT` or similar prompt variables,
+# which will show the output of "$_OMZ_ASYNC_OUTPUT[handler_name]":
+#
+#  function git_prompt_status {
+#    echo -n $_OMZ_ASYNC_OUTPUT[_git_prompt_status_async]
+#  }
+#
+#  RPROMPT='$(git_prompt_status)'
+#
+# This API is subject to change and optimization. Rely on it at your own risk.
+
+function _omz_register_handler {
+  setopt localoptions noksharrays
+  typeset -ga _omz_async_functions
+  # we want to do nothing if there's no $1 function or we already set it up
+  if [[ -z "$1" ]] || (( ! ${+functions[$1]} )) \
+    || (( ${_omz_async_functions[(Ie)$1]} )); then
+    return
+  fi
+  _omz_async_functions+=("$1")
+  # let's add the hook to async_request if it's not there yet
+  if (( ! ${precmd_functions[(Ie)_omz_async_request]} )) \
+    && (( ${+functions[_omz_async_request]})); then
+    autoload -Uz add-zsh-hook
+    add-zsh-hook precmd _omz_async_request
+  fi
+}
+
+# Set up async handlers and callbacks
+function _omz_async_request {
+  local -i ret=$?
+  typeset -gA _OMZ_ASYNC_FDS _OMZ_ASYNC_PIDS _OMZ_ASYNC_OUTPUT
+
+  # executor runs a subshell for all async requests based on key
+  local handler
+  for handler in ${_omz_async_functions}; do
+    (( ${+functions[$handler]} )) || continue
+
+    local fd=${_OMZ_ASYNC_FDS[$handler]:--1}
+    local pid=${_OMZ_ASYNC_PIDS[$handler]:--1}
+
+    # If we've got a pending request, cancel it
+    if (( fd != -1 && pid != -1 )) && { true <&$fd } 2>/dev/null; then
+      # Close the file descriptor and remove the handler
+      exec {fd}<&-
+      zle -F $fd
+
+      # Zsh will make a new process group for the child process only if job
+      # control is enabled (MONITOR option)
+      if [[ -o MONITOR ]]; then
+        # Send the signal to the process group to kill any processes that may
+        # have been forked by the async function handler
+        kill -TERM -$pid 2>/dev/null
+      else
+        # Kill just the child process since it wasn't placed in a new process
+        # group. If the async function handler forked any child processes they may
+        # be orphaned and left behind.
+        kill -TERM $pid 2>/dev/null
+      fi
+    fi
+
+    # Define global variables to store the file descriptor, PID and output
+    _OMZ_ASYNC_FDS[$handler]=-1
+    _OMZ_ASYNC_PIDS[$handler]=-1
+
+    # Fork a process to fetch the git status and open a pipe to read from it
+    exec {fd}< <(
+      # Tell parent process our PID
+      builtin echo ${sysparams[pid]}
+      # Set exit code for the handler if used
+      () { return $ret }
+      # Run the async function handler
+      $handler
+    )
+
+    # Save FD for handler
+    _OMZ_ASYNC_FDS[$handler]=$fd
+
+    # There's a weird bug here where ^C stops working unless we force a fork
+    # See https://github.com/zsh-users/zsh-autosuggestions/issues/364
+    # and https://github.com/zsh-users/zsh-autosuggestions/pull/612
+    is-at-least 5.8 || command true
+
+    # Save the PID from the handler child process
+    read -u $fd "_OMZ_ASYNC_PIDS[$handler]"
+
+    # When the fd is readable, call the response handler
+    zle -F "$fd" _omz_async_callback
+  done
+}
+
+# Called when new data is ready to be read from the pipe
+function _omz_async_callback() {
+  emulate -L zsh
+
+  local fd=$1   # First arg will be fd ready for reading
+  local err=$2  # Second arg will be passed in case of error
+
+  if [[ -z "$err" || "$err" == "hup" ]]; then
+    # Get handler name from fd
+    local handler="${(k)_OMZ_ASYNC_FDS[(r)$fd]}"
+
+    # Store old output which is supposed to be already printed
+    local old_output="${_OMZ_ASYNC_OUTPUT[$handler]}"
+
+    # Read output from fd
+    IFS= read -r -u $fd -d '' "_OMZ_ASYNC_OUTPUT[$handler]"
+
+    # Repaint prompt if output has changed
+    if [[ "$old_output" != "${_OMZ_ASYNC_OUTPUT[$handler]}" ]]; then
+      zle reset-prompt
+      zle -R
+    fi
+
+    # Close the fd
+    exec {fd}<&-
+  fi
+
+  # Always remove the handler
+  zle -F "$fd"
+
+  # Unset global FD variable to prevent closing user created FDs in the precmd hook
+  _OMZ_ASYNC_FDS[$handler]=-1
+  _OMZ_ASYNC_PIDS[$handler]=-1
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd _omz_async_request
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@ -11,7 +11,7 @@ function omz {

  # Subcommand functions start with _ so that they don't
  # appear as completion entries when looking for `omz`
-  (( $+functions[_omz::$command] )) || {
+  (( ${+functions[_omz::$command]} )) || {
    _omz::help
    return 1
  }
@ -448,7 +448,7 @@ function _omz::plugin::load {
    if [[ ! -f "$base/_$plugin" && ! -f "$base/$plugin.plugin.zsh" ]]; then
      _omz::log warn "'$plugin' is not a valid plugin"
      continue
-    # It it is a valid plugin, add its directory to $fpath unless it is already there
+    # It is a valid plugin, add its directory to $fpath unless it is already there
    elif (( ! ${fpath[(Ie)$base]} )); then
      fpath=("$base" $fpath)
    fi
@ -776,10 +776,11 @@ function _omz::update {
  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)

  # Run update script
+  zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
  if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode || return $?
  else
-    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -v $verbose_mode || return $?
  fi

  # Update last updated file
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@ -62,7 +62,7 @@ function detect-clipboard() {
    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
  elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
    function clipcopy() { cat "${1:-/dev/stdin}" | wl-copy &>/dev/null &|; }
-    function clippaste() { wl-paste; }
+    function clippaste() { wl-paste --no-newline; }
  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xsel]} )); then
    function clipcopy() { cat "${1:-/dev/stdin}" | xsel --clipboard --input; }
    function clippaste() { xsel --clipboard --output; }
@ -100,8 +100,8 @@ function detect-clipboard() {
  fi
 }

-# Detect at startup. A non-zero exit here indicates that the dummy clipboards were set,
-# which is not really an error. If the user calls them, they will attempt to redetect
-# (for example, perhaps the user has now installed xclip) and then either print an error
-# or proceed successfully.
-detect-clipboard || true
+function clipcopy clippaste {
+  unfunction clipcopy clippaste
+  detect-clipboard || true # let one retry
+  "$0" "$@"
+}
--- a/lib/compfix.zsh
+++ b/lib/compfix.zsh
@ -13,7 +13,7 @@ function handle_completion_insecurities() {
  #     /usr/share/zsh/5.0.6
  #
  # Since the ignorable first line is printed to stderr and thus not captured,
-  # stderr is squelched to prevent this output from leaking to the user. 
+  # stderr is squelched to prevent this output from leaking to the user.
  local -aU insecure_dirs
  insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} )

--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@ -49,7 +49,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
        adm amanda apache at avahi avahi-autoipd beaglidx bin cacti canna \
        clamav daemon dbus distcache dnsmasq dovecot fax ftp games gdm \
        gkrellmd gopher hacluster haldaemon halt hsqldb ident junkbust kdm \
-        ldap lp mail mailman mailnull man messagebus  mldonkey mysql nagios \
+        ldap lp mail mailman mailnull man messagebus mldonkey mysql nagios \
        named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
        operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
        rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@ -30,7 +30,7 @@
 #
 # This is written in a defensive style so it still works (and can detect) cases when
 # basic functionality like echo and which have been redefined. In particular, almost
-# everything is invoked with "builtin" or "command", to work in the face of user 
+# everything is invoked with "builtin" or "command", to work in the face of user
 # redefinitions.
 #
 # OPTIONS
@ -59,7 +59,7 @@ function omz_diagnostic_dump() {
  emulate -L zsh

  builtin echo "Generating diagnostic dump; please be patient..."
-  
+
  local thisfcn=omz_diagnostic_dump
  local -A opts
  local opt_verbose opt_noverbose opt_outfile
@ -90,7 +90,7 @@ function omz_diagnostic_dump() {
  builtin echo
  builtin echo Diagnostic dump file created at: "$outfile"
  builtin echo
-  builtin echo To share this with OMZ developers, post it as a gist on GitHub 
+  builtin echo To share this with OMZ developers, post it as a gist on GitHub
  builtin echo at "https://gist.github.com" and share the link to the gist.
  builtin echo
  builtin echo "WARNING: This dump file contains all your zsh and omz configuration files,"
@ -105,8 +105,8 @@ function _omz_diag_dump_one_big_text() {
  builtin echo oh-my-zsh diagnostic dump
  builtin echo
  builtin echo $outfile
-  builtin echo 
-  
+  builtin echo
+
  # Basic system and zsh information
  command date
  command uname -a
@ -151,7 +151,7 @@ function _omz_diag_dump_one_big_text() {

  # Core command definitions
  _omz_diag_dump_check_core_commands || return 1
-  builtin echo  
+  builtin echo

  # ZSH Process state
  builtin echo Process state:
@ -167,7 +167,7 @@ function _omz_diag_dump_one_big_text() {
  #TODO: Should this include `env` instead of or in addition to `export`?
  builtin echo Exported:
  builtin echo $(builtin export | command sed 's/=.*//')
-  builtin echo 
+  builtin echo
  builtin echo Locale:
  command locale
  builtin echo
@ -181,7 +181,7 @@ function _omz_diag_dump_one_big_text() {
  builtin echo
  builtin echo 'compaudit output:'
  compaudit
-  builtin echo 
+  builtin echo
  builtin echo '$fpath directories:'
  command ls -lad $fpath
  builtin echo
@ -224,7 +224,7 @@ function _omz_diag_dump_one_big_text() {
  local cfgfile cfgfiles
  # Some files for bash that zsh does not use are intentionally included
  # to help with diagnosing behavior differences between bash and zsh
-  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
+  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout
    $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
    ~/.zsh.pre-oh-my-zsh
    /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
@ -258,8 +258,8 @@ function _omz_diag_dump_check_core_commands() {
  # (For back-compatibility, if any of these are newish, they should be removed,
  # or at least made conditional on the version of the current running zsh.)
  # "history" is also excluded because OMZ is known to redefine that
-  reserved_words=( do done esac then elif else fi for case if while function 
-    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}' 
+  reserved_words=( do done esac then elif else fi for case if while function
+    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}'
    )
  builtins=( alias autoload bg bindkey break builtin bye cd chdir command
    comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
@ -331,7 +331,7 @@ function _omz_diag_dump_os_specific_version() {
  case "$OSTYPE" in
    darwin*)
      osname=$(command sw_vers -productName)
-      osver=$(command sw_vers -productVersion)      
+      osver=$(command sw_vers -productVersion)
      builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
      ;;
    cygwin)
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@ -4,12 +4,6 @@ setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus

-# add (uncommented):
-# zstyle ':omz:directories' aliases no
-# to your `zshrc` before loading `oh-my-zsh.sh`
-# to disable the following aliases and functions
-
-zstyle -T ':omz:directories' aliases || return 0

 alias -g ...='../..'
 alias -g ....='../../..'
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@ -5,7 +5,7 @@ function zsh_stats() {
 }

 function uninstall_oh_my_zsh() {
-  env ZSH="$ZSH" sh "$ZSH/tools/uninstall.sh"
+  command env ZSH="$ZSH" sh "$ZSH/tools/uninstall.sh"
 }

 function upgrade_oh_my_zsh() {
@ -182,6 +182,8 @@ function omz_urlencode() {
  fi

  # Use LC_CTYPE=C to process text byte-by-byte
+  # Note that this doesn't work in Termux, as it only has UTF-8 locale.
+  # Characters will be processed as UTF-8, which is fine for URLs.
  local i byte ord LC_ALL=C
  export LC_ALL
  local reserved=';/?:@&=+$,'
@ -206,6 +208,9 @@ function omz_urlencode() {
    else
      if [[ "$byte" == " " && -n $spaces_as_plus ]]; then
        url_str+="+"
+      elif [[ "$PREFIX" = *com.termux* ]]; then
+        # Termux does not have non-UTF8 locales, so just send the UTF-8 character directly
+        url_str+="$byte"
      else
        ord=$(( [##16] #byte ))
        url_str+="%$ord"
--- a/lib/git.zsh
+++ b/lib/git.zsh
@ -1,3 +1,5 @@
+autoload -Uz is-at-least
+
 # The git prompt's git commands are read-only and should not interfere with
 # other processes. This environment variable is equivalent to running with `git
 # --no-optional-locks`, but falls back gracefully for older versions of git.
@ -9,14 +11,18 @@ function __git_prompt_git() {
  GIT_OPTIONAL_LOCKS=0 command git "$@"
 }

-function git_prompt_info() {
+function _omz_git_prompt_info() {
  # If we are on a folder not tracked by git, get out.
  # Otherwise, check for hide-info at global and local repository level
  if ! __git_prompt_git rev-parse --git-dir &> /dev/null \
-     || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
+    || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
    return 0
  fi

+  # Get either:
+  # - the current branch name
+  # - the tag name if we are on a tag
+  # - the short SHA of the current commit
  local ref
  ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
  || ref=$(__git_prompt_git describe --tags --exact-match HEAD 2> /dev/null) \
@ -33,6 +39,56 @@ function git_prompt_info() {
  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }

+# Use async version if setting is enabled, or undefined but zsh version is at least 5.0.6
+# https://github.com/ohmyzsh/ohmyzsh/issues/12331#issuecomment-2059460268
+if zstyle -t ':omz:alpha:lib:git' async-prompt \
+  || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then
+  function git_prompt_info() {
+    setopt localoptions noksharrays
+    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" ]]; then
+      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]"
+    fi
+  }
+
+  function git_prompt_status() {
+    setopt localoptions noksharrays
+    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" ]]; then
+      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]"
+    fi
+  }
+
+  # Conditionally register the async handler, only if it's needed in $PROMPT
+  # or any of the other prompt variables
+  function _defer_async_git_register() {
+    # Check if git_prompt_info is used in a prompt variable
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    *(\$\(git_prompt_info\)|\`git_prompt_info\`)*)
+      _omz_register_handler _omz_git_prompt_info
+      ;;
+    esac
+
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    *(\$\(git_prompt_status\)|\`git_prompt_status\`)*)
+      _omz_register_handler _omz_git_prompt_status
+      ;;
+    esac
+
+    add-zsh-hook -d precmd _defer_async_git_register
+    unset -f _defer_async_git_register
+  }
+
+  # Register the async handler first. This needs to be done before
+  # the async request prompt is run
+  precmd_functions=(_defer_async_git_register $precmd_functions)
+else
+  function git_prompt_info() {
+    _omz_git_prompt_info
+  }
+  function git_prompt_status() {
+    _omz_git_prompt_status
+  }
+fi
+
 # Checks if working tree is dirty
 function parse_git_dirty() {
  local STATUS
@ -161,7 +217,7 @@ function git_prompt_long_sha() {
  SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }

-function git_prompt_status() {
+function _omz_git_prompt_status() {
  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return

  # Maps a git status prefix to an internal constant
--- a/lib/history.zsh
+++ b/lib/history.zsh
@ -1,19 +1,20 @@
 ## History wrapper
 function omz_history {
-  local clear list
-  zparseopts -E c=clear l=list
+  # parse arguments and remove from $@
+  local clear list stamp
+  zparseopts -E -D c=clear l=list f=stamp E=stamp i=stamp

-  if [[ -n "$clear" ]]; then
+  if [[ $# -eq 0 ]]; then
+    # if no arguments provided, show full history starting from 1
+    builtin fc $stamp -l 1
+  elif [[ -n "$clear" ]]; then
    # if -c provided, clobber the history file
    echo -n >| "$HISTFILE"
    fc -p "$HISTFILE"
    echo >&2 History file deleted.
-  elif [[ -n "$list" ]]; then
-    # if -l provided, run as if calling `fc' directly
-    builtin fc "$@"
  else
-    # unless a number is provided, show all history events (starting from 1)
-    [[ ${@[-1]-} = *[0-9]* ]] && builtin fc -l "$@" || builtin fc -l "$@" 1
+    # otherwise, run `fc -l` with a custom format
+    builtin fc $stamp -l "$@"
  fi
 }

--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@ -32,19 +32,26 @@ if [[ -n "${terminfo[knp]}" ]]; then
 fi

 # Start typing + [Up-Arrow] - fuzzy find history forward
-if [[ -n "${terminfo[kcuu1]}" ]]; then
-  autoload -U up-line-or-beginning-search
-  zle -N up-line-or-beginning-search
+autoload -U up-line-or-beginning-search
+zle -N up-line-or-beginning-search

+bindkey -M emacs "^[[A" up-line-or-beginning-search
+bindkey -M viins "^[[A" up-line-or-beginning-search
+bindkey -M vicmd "^[[A" up-line-or-beginning-search
+if [[ -n "${terminfo[kcuu1]}" ]]; then
  bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
  bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
  bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
 fi
-# Start typing + [Down-Arrow] - fuzzy find history backward
-if [[ -n "${terminfo[kcud1]}" ]]; then
-  autoload -U down-line-or-beginning-search
-  zle -N down-line-or-beginning-search

+# Start typing + [Down-Arrow] - fuzzy find history backward
+autoload -U down-line-or-beginning-search
+zle -N down-line-or-beginning-search
+
+bindkey -M emacs "^[[B" down-line-or-beginning-search
+bindkey -M viins "^[[B" down-line-or-beginning-search
+bindkey -M vicmd "^[[B" down-line-or-beginning-search
+if [[ -n "${terminfo[kcud1]}" ]]; then
  bindkey -M emacs "${terminfo[kcud1]}" down-line-or-beginning-search
  bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
  bindkey -M vicmd "${terminfo[kcud1]}" down-line-or-beginning-search
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@ -19,8 +19,13 @@ setopt multios              # enable redirect to multiple streams: echo >file1 >
 setopt long_list_jobs       # show long list format job notifications
 setopt interactivecomments  # recognize comments

-env_default 'PAGER' 'less'
-env_default 'LESS' '-R'
+# define pager dependant on what is available (less or more)
+if (( ${+commands[less]} )); then
+  env_default 'PAGER' 'less'
+  env_default 'LESS' '-R'
+elif (( ${+commands[more]} )); then
+  env_default 'PAGER' 'more'
+fi

 ## super user alias
 alias _='sudo '
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@ -40,5 +40,5 @@ ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
 # use this to enable users to see their ruby version, no matter which
 # version management system they use
 function ruby_prompt_info() {
-  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
+  echo "$(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)"
 }
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@ -7,6 +7,7 @@ typeset -AHg FX FG BG
 FX=(
  reset     "%{[00m%}"
  bold      "%{[01m%}" no-bold      "%{[22m%}"
+  dim       "%{[02m%}" no-dim       "%{[22m%}"
  italic    "%{[03m%}" no-italic    "%{[23m%}"
  underline "%{[04m%}" no-underline "%{[24m%}"
  blink     "%{[05m%}" no-blink     "%{[25m%}"
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@ -17,7 +17,7 @@ function title {
  : ${2=$1}

  case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot*|contour*)
      print -Pn "\e]2;${2:q}\a" # set window name
      print -Pn "\e]1;${1:q}\a" # set tab name
      ;;
@ -109,28 +109,55 @@ if [[ -z "$INSIDE_EMACS" || "$INSIDE_EMACS" = vterm ]]; then
  add-zsh-hook preexec omz_termsupport_preexec
 fi

-# Keep Apple Terminal.app's current working directory updated
-# Based on this answer: https://superuser.com/a/315029
-# With extra fixes to handle multibyte chars and non-UTF-8 locales
+# Keep terminal emulator's current working directory correct,
+# even if the current working directory path contains symbolic links
+#
+# References:
+# - Apple's Terminal.app: https://superuser.com/a/315029
+# - iTerm2: https://iterm2.com/documentation-escape-codes.html (iTerm2 Extension / CurrentDir+RemoteHost)
+# - Konsole: https://bugs.kde.org/show_bug.cgi?id=327720#c1
+# - libvte (gnome-terminal, mate-terminal, …): https://bugzilla.gnome.org/show_bug.cgi?id=675987#c14
+#   Apparently it had a bug before ~2012 were it would display the unknown OSC 7 code
+#
+# As of May 2021 mlterm, PuTTY, rxvt, screen, termux & xterm simply ignore the unknown OSC.

-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
-  # Emits the control sequence to notify Terminal.app of the cwd
-  # Identifies the directory using a file: URI scheme, including
-  # the host name to disambiguate local vs. remote paths.
-  function update_terminalapp_cwd() {
-    emulate -L zsh
-
-    # Percent-encode the host and path names.
-    local URL_HOST URL_PATH
-    URL_HOST="$(omz_urlencode -P $HOST)" || return 1
-    URL_PATH="$(omz_urlencode -P $PWD)" || return 1
-
-    # Undocumented Terminal.app-specific control sequence
-    printf '\e]7;%s\a' "file://$URL_HOST$URL_PATH"
-  }
-
-  # Use a precmd hook instead of a chpwd hook to avoid contaminating output
-  add-zsh-hook precmd update_terminalapp_cwd
-  # Run once to get initial cwd set
-  update_terminalapp_cwd
+# Don't define the function if we're inside Emacs or in an SSH session (#11696)
+if [[ -n "$INSIDE_EMACS" || -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
+  return
 fi
+
+# Don't define the function if we're in an unsupported terminal
+case "$TERM" in
+  # all of these either process OSC 7 correctly or ignore entirely
+  xterm*|putty*|rxvt*|konsole*|mlterm*|alacritty|screen*|tmux*) ;;
+  contour*|foot*) ;;
+  *)
+    # Terminal.app and iTerm2 process OSC 7 correctly
+    case "$TERM_PROGRAM" in
+      Apple_Terminal|iTerm.app) ;;
+      *) return ;;
+    esac ;;
+esac
+
+# Emits the control sequence to notify many terminal emulators
+# of the cwd
+#
+# Identifies the directory using a file: URI scheme, including
+# the host name to disambiguate local vs. remote paths.
+function omz_termsupport_cwd {
+  # Percent-encode the host and path names.
+  local URL_HOST URL_PATH
+  URL_HOST="$(omz_urlencode -P $HOST)" || return 1
+  URL_PATH="$(omz_urlencode -P $PWD)" || return 1
+
+  # Konsole errors if the HOST is provided
+  [[ -z "$KONSOLE_PROFILE_NAME" && -z "$KONSOLE_DBUS_SESSION"  ]] || URL_HOST=""
+
+  # common control sequence (OSC 7) to set current host and path
+  printf "\e]7;file://%s%s\e\\" "${URL_HOST}" "${URL_PATH}"
+}
+
+# Use a precmd hook instead of a chpwd hook to avoid contaminating output
+# i.e. when a script or function changes directory without `cd -q`, chpwd
+# will be called the output may be swallowed by the script or function.
+add-zsh-hook precmd omz_termsupport_cwd
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@ -20,10 +20,25 @@ if command diff --color /dev/null{,} &>/dev/null; then
  }
 fi

-
 # Don't set ls coloring if disabled
 [[ "$DISABLE_LS_COLORS" != true ]] || return 0

+# Default coloring for BSD-based ls
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+
+# Default coloring for GNU-based ls
+if [[ -z "$LS_COLORS" ]]; then
+  # Define LS_COLORS via dircolors if available. Otherwise, set a default
+  # equivalent to LSCOLORS (generated via https://geoff.greer.fm/lscolors)
+  if (( $+commands[dircolors] )); then
+    [[ -f "$HOME/.dircolors" ]] \
+      && source <(dircolors -b "$HOME/.dircolors") \
+      || source <(dircolors -b)
+  else
+    export LS_COLORS="di=1;36:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
+  fi
+fi
+
 function test-ls-args {
  local cmd="$1"          # ls, gls, colorls, ...
  local args="${@[2,-1]}" # arguments except the first one
@ -50,7 +65,7 @@ case "$OSTYPE" in
    test-ls-args ls -G && alias ls='ls -G'
    # Only use GNU ls if installed and there are user defaults for $LS_COLORS,
    # as the default coloring scheme is not very pretty
-    [[ -n "$LS_COLORS" || -f "$HOME/.dircolors" ]] \
+    zstyle -t ':omz:lib:theme-and-appearance' gnu-ls \
      && test-ls-args gls --color \
      && alias ls='gls --color=tty'
    ;;
@ -64,20 +79,3 @@ case "$OSTYPE" in
 esac

 unfunction test-ls-args
-
-
-# Default coloring for BSD-based ls
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
-
-# Default coloring for GNU-based ls
-if [[ -z "$LS_COLORS" ]]; then
-  # Define LS_COLORS via dircolors if available. Otherwise, set a default
-  # equivalent to LSCOLORS (generated via https://geoff.greer.fm/lscolors)
-  if (( $+commands[dircolors] )); then
-    [[ -f "$HOME/.dircolors" ]] \
-      && source <(dircolors -b "$HOME/.dircolors") \
-      || source <(dircolors -b)
-  else
-    export LS_COLORS="di=1;36:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
-  fi
-fi
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@ -1,14 +1,14 @@
+# ANSI formatting function (\033[<code>m)
+# 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
+omz_f() {
+  [ $# -gt 0 ] || return
+  IFS=";" printf "\033[%sm" $*
+}
+# If stdout is not a terminal ignore all formatting
+[ -t 1 ] || omz_f() { :; }
+
 # Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
 [ -n "$ZSH_VERSION" ] || {
-  # ANSI formatting function (\033[<code>m)
-  # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
-  omz_f() {
-    [ $# -gt 0 ] || return
-    IFS=";" printf "\033[%sm" $*
-  }
-  # If stdout is not a terminal ignore all formatting
-  [ -t 1 ] || omz_f() { :; }
-
  omz_ptree() {
    # Get process tree of the current process
    pid=$$; pids="$pid"
@ -38,6 +38,15 @@
  return 1
 }

+# Check if in emulation mode, if so early return
+# https://github.com/ohmyzsh/ohmyzsh/issues/11686
+[[ "$(emulate)" = zsh ]] || {
+  printf "$(omz_f 1 31)Error:$(omz_f 22) Oh My Zsh can't be loaded in \`$(emulate)\` emulation mode.$(omz_f 0)\n" >&2
+  return 1
+}
+
+unset -f omz_f
+
 # If ZSH is not defined, use the current script's directory.
 [[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"

@ -143,25 +152,60 @@ unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 # zcompile the completion dump file if the .zwc is older or missing.
 if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
  zrecompile -q -p "$ZSH_COMPDUMP"
-  command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock" 
+  command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
 fi

-# Load all of the config files in ~/oh-my-zsh that end in .zsh
+_omz_source() {
+  local context filepath="$1"
+
+  # Construct zstyle context based on path
+  case "$filepath" in
+  lib/*) context="lib:${filepath:t:r}" ;;         # :t = lib_name.zsh, :r = lib_name
+  plugins/*) context="plugins:${filepath:h:t}" ;; # :h = plugins/plugin_name, :t = plugin_name
+  esac
+
+  local disable_aliases=0
+  zstyle -T ":omz:${context}" aliases || disable_aliases=1
+
+  # Back up alias names prior to sourcing
+  local -A aliases_pre galiases_pre
+  if (( disable_aliases )); then
+    aliases_pre=("${(@kv)aliases}")
+    galiases_pre=("${(@kv)galiases}")
+  fi
+
+  # Source file from $ZSH_CUSTOM if it exists, otherwise from $ZSH
+  if [[ -f "$ZSH_CUSTOM/$filepath" ]]; then
+    source "$ZSH_CUSTOM/$filepath"
+  elif [[ -f "$ZSH/$filepath" ]]; then
+    source "$ZSH/$filepath"
+  fi
+
+  # Unset all aliases that don't appear in the backed up list of aliases
+  if (( disable_aliases )); then
+    if (( #aliases_pre )); then
+      aliases=("${(@kv)aliases_pre}")
+    else
+      (( #aliases )) && unalias "${(@k)aliases}"
+    fi
+    if (( #galiases_pre )); then
+      galiases=("${(@kv)galiases_pre}")
+    else
+      (( #galiases )) && unalias "${(@k)galiases}"
+    fi
+  fi
+}
+
+# Load all of the lib files in ~/oh-my-zsh/lib that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
-for config_file ("$ZSH"/lib/*.zsh); do
-  custom_config_file="$ZSH_CUSTOM/lib/${config_file:t}"
-  [[ -f "$custom_config_file" ]] && config_file="$custom_config_file"
-  source "$config_file"
+for lib_file ("$ZSH"/lib/*.zsh); do
+  _omz_source "lib/${lib_file:t}"
 done
-unset custom_config_file
+unset lib_file

 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [[ -f "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh" ]]; then
-    source "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh"
-  elif [[ -f "$ZSH/plugins/$plugin/$plugin.plugin.zsh" ]]; then
-    source "$ZSH/plugins/$plugin/$plugin.plugin.zsh"
-  fi
+  _omz_source "plugins/$plugin/$plugin.plugin.zsh"
 done
 unset plugin

--- a/plugins/alias-finder/.zunit.yml
+++ b/plugins/alias-finder/.zunit.yml
@ -0,0 +1,9 @@
+tap: false
+directories:
+  tests: tests
+  output: tests/_output
+  support: tests/_support
+time_limit: 0
+fail_fast: false
+allow_risky: false
+verbose: true
--- a/plugins/alias-finder/README.md
+++ b/plugins/alias-finder/README.md
@ -2,45 +2,32 @@

 This plugin searches the defined aliases and outputs any that match the command inputted. This makes learning new aliases easier.

+## Usage
+
 To use it, add `alias-finder` to the `plugins` array of your zshrc file:
 ```
 plugins=(... alias-finder)
 ```

-## Usage
-To see if there is an alias defined for the command, pass it as an argument to `alias-finder`. This can also run automatically before each command you input - add `ZSH_ALIAS_FINDER_AUTOMATIC=true` to your zshrc if you want this.
+To enable it for every single command, set zstyle in your `~/.zshrc`.

-## Options
+```zsh
+# ~/.zshrc
+
+zstyle ':omz:plugins:alias-finder' autoload yes # disabled by default
+zstyle ':omz:plugins:alias-finder' longer yes # disabled by default
+zstyle ':omz:plugins:alias-finder' exact yes # disabled by default
+zstyle ':omz:plugins:alias-finder' cheaper yes # disabled by default
+```
+
+As you can see, options are also available with zstyle.
+
+### Options
+
+> In order to clarify, let's say `alias a=abc` has source 'abc' and destination 'a'.
+
+- Use `--longer` or `-l` to include aliases where the source is longer than the input (in other words, the source could contain the whole input).
+- Use `--exact` or `-e` to avoid aliases where the source is shorter than the input (in other words, the source must be the same with the input).
+- Use `--cheaper` or `-c` to avoid aliases where the destination is longer than the input (in other words, the destination must be the shorter than the input).

- Use `--longer` or `-l` to allow the aliases to be longer than the input (match aliases if they contain the input).
- Use `--exact` or `-e` to avoid matching aliases that are shorter than the input.

-## Examples
-```
-$ alias-finder "git pull"
-gl='git pull'
-g=git
-```
-```
-$ alias-finder "web_search google oh my zsh"
-google='web_search google'
-```
-```
-$ alias-finder "git commit -v"
-gc="git commit -v"
-g=git
-```
-```
-$ alias-finder -e "git commit -v"
-gc='git commit -v'
-```
-```
-$ alias-finder -l "git commit -v"
-gc='git commit -v'
-'gc!'='git commit -v --amend'
-gca='git commit -v -a'
-'gca!'='git commit -v -a --amend'
-'gcan!'='git commit -v -a --no-edit --amend'
-'gcans!'='git commit -v -a -s --no-edit --amend'
-'gcn!'='git commit -v --no-edit --amend'
-```
--- a/plugins/alias-finder/alias-finder.plugin.zsh
+++ b/plugins/alias-finder/alias-finder.plugin.zsh
@ -1,44 +1,59 @@
 alias-finder() {
-  local cmd="" exact="" longer="" wordStart="" wordEnd="" multiWordEnd=""
-  for i in $@; do
-    case $i in
+  local cmd=" " exact="" longer="" cheaper="" wordEnd="'{0,1}$" finder="" filter=""
+
+  # build command and options
+  for c in "$@"; do
+    case $c in
+      # TODO: Remove backward compatibility (other than zstyle form)
+      # set options if exist
      -e|--exact) exact=true;;
      -l|--longer) longer=true;;
-      *)
-        if [[ -z $cmd ]]; then
-          cmd=$i
-        else
-          cmd="$cmd $i"
-        fi
-        ;;
+      -c|--cheaper) cheaper=true;;
+      # concatenate cmd
+      *) cmd="$cmd$c " ;;
    esac
  done
-  cmd=$(sed 's/[].\|$(){}?+*^[]/\\&/g' <<< $cmd) # adds escaping for grep
-  if (( $(wc -l <<< $cmd) == 1 )); then
-    while [[ $cmd != "" ]]; do
-      if [[ $longer = true ]]; then
-        wordStart="'{0,1}"
-      else
-        wordEnd="$"
-        multiWordEnd="'$"
-      fi
-      if [[ $cmd == *" "* ]]; then
-        local finder="'$cmd$multiWordEnd"
-      else
-        local finder=$wordStart$cmd$wordEnd
-      fi
-      alias | grep -E "=$finder"
-      if [[ $exact = true || $longer = true ]]; then
-        break
-      else
-        cmd=$(sed -E 's/ {0,1}[^ ]*$//' <<< $cmd) # removes last word
-      fi
-    done
+
+  zstyle -t ':omz:plugins:alias-finder' longer && longer=true
+  zstyle -t ':omz:plugins:alias-finder' exact && exact=true
+  zstyle -t ':omz:plugins:alias-finder' cheaper && cheaper=true
+
+  # format cmd for grep
+  ## - replace newlines with spaces
+  ## - trim both ends
+  ## - replace multiple spaces with one space
+  ## - add escaping character to special characters
+  cmd=$(echo -n "$cmd" | tr '\n' ' ' | xargs | tr -s '[:space:]' | sed 's/[].\|$(){}?+*^[]/\\&/g')
+
+  if [[ $longer == true ]]; then
+    wordEnd="" # remove wordEnd to find longer aliases
  fi
+
+  # find with alias and grep, removing last word each time until no more words
+  while [[ $cmd != "" ]]; do
+    finder="'{0,1}$cmd$wordEnd"
+
+    # make filter to find only shorter results than current cmd
+    if [[ $cheaper == true ]]; then
+      cmdLen=$(echo -n "$cmd" | wc -c)
+      filter="^'{0,1}.{0,$((cmdLen - 1))}="
+    fi
+
+    alias | grep -E "$filter" | grep -E "=$finder"
+
+    if [[ $exact == true ]]; then
+      break # because exact case is only one
+    elif [[ $longer = true ]]; then
+      break # because above grep command already found every longer aliases during first cycle
+    fi
+
+    cmd=$(sed -E 's/ {0,}[^ ]*$//' <<< "$cmd") # remove last word
+  done
 }

 preexec_alias-finder() {
-  if [[ $ZSH_ALIAS_FINDER_AUTOMATIC = true ]]; then
+  # TODO: Remove backward compatibility (other than zstyle form)
+  zstyle -t ':omz:plugins:alias-finder' autoload && alias-finder $1 || if [[ $ZSH_ALIAS_FINDER_AUTOMATIC = true ]]; then
    alias-finder $1
  fi
 }
--- a/plugins/alias-finder/tests/_output/.gitkeep
+++ b/plugins/alias-finder/tests/_output/.gitkeep
--- a/plugins/alias-finder/tests/_support/.gitkeep
+++ b/plugins/alias-finder/tests/_support/.gitkeep
--- a/plugins/alias-finder/tests/_support/bootstrap
+++ b/plugins/alias-finder/tests/_support/bootstrap
@ -0,0 +1,2 @@
+#!/usr/bin/env zsh
+# Write your bootstrap code here
--- a/plugins/alias-finder/tests/test_run.sh
+++ b/plugins/alias-finder/tests/test_run.sh
@ -0,0 +1,107 @@
+#!/usr/bin/env zunit
+
+@setup {
+  load ../alias-finder.plugin.zsh
+
+  set_git_aliases() {
+    unalias -a # all
+    alias g="git"
+    alias gc="git commit"
+    alias gcv="git commit -v"
+    alias gcvs="git commit -v -S"
+  }
+}
+
+@test 'find aliases that contain input' {
+  set_git_aliases
+
+  run alias-finder "git"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find aliases that contain input with whitespaces at ends' {
+  set_git_aliases
+
+  run alias-finder "   git     "
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find aliases that contain multiple words' {
+  set_git_aliases
+
+  run alias-finder "git commit -v"
+
+  assert "${#lines[@]}" equals 3
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "g=git"
+}
+
+@test 'find alias that is the same with input when --exact option is set' {
+  set_git_aliases
+
+  run alias-finder -e "git"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find alias that is the same with multiple words input when --exact option is set' {
+  set_git_aliases
+
+  run alias-finder -e "git commit -v"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+}
+
+@test 'find alias that is the same with or longer than input when --longer option is set' {
+  set_git_aliases
+
+  run alias-finder -l "git"
+
+  assert "${#lines[@]}" equals 4
+  assert "${lines[1]}" same_as "g=git"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "gcv='git commit -v'"
+  assert "${lines[4]}" same_as "gcvs='git commit -v -S'"
+}
+
+@test 'find alias that is the same with or longer than multiple words input when --longer option is set' {
+  set_git_aliases
+
+  run alias-finder -l "git commit -v"
+
+  assert "${#lines[@]}" equals 2
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gcvs='git commit -v -S'"
+}
+
+@test 'find aliases including expensive (longer) than input' {
+  set_git_aliases
+  alias expensiveCommands="git commit"
+
+  run alias-finder "git commit -v"
+
+  assert "${#lines[@]}" equals 4
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "expensiveCommands='git commit'"
+  assert "${lines[3]}" same_as "gc='git commit'"
+  assert "${lines[4]}" same_as "g=git"
+}
+
+@test 'find aliases excluding expensive (longer) than input when --cheap option is set' {
+  set_git_aliases
+  alias expensiveCommands="git commit"
+
+  run alias-finder -c "git commit -v"
+
+  assert "${#lines[@]}" equals 3
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "g=git"
+}
--- a/plugins/aliases/README.md
+++ b/plugins/aliases/README.md
@ -15,14 +15,14 @@ Requirements: Python needs to be installed.

 ## Usage

- `acs`: show all aliases by group
+- `als`: show all aliases by group

- `acs -h/--help`: print help mesage
+- `als -h/--help`: print help message

- `acs <keyword(s)>`: filter and highlight aliases by `<keyword>`
+- `als <keyword(s)>`: filter and highlight aliases by `<keyword>`

- `acs -g <group>/--group <group>`: show only aliases for group `<group>`. Multiple uses of the flag show all groups
+- `als -g <group>/--group <group>`: show only aliases for group `<group>`. Multiple uses of the flag show all groups

- `acs --groups`: show only group names
+- `als --groups`: show only group names

-  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)
+  ![screenshot](https://github.com/ohmyzsh/ohmyzsh/assets/66907184/5bfa00ea-5fc3-4e97-8b22-2f74f6b948c7)
--- a/plugins/aliases/aliases.plugin.zsh
+++ b/plugins/aliases/aliases.plugin.zsh
@ -4,7 +4,7 @@
 0="${${(M)0:#/*}:-$PWD/$0}"

 eval '
-  function acs(){
+  function als(){
    (( $+commands[python3] )) || {
      echo "[error] No python executable detected"
      return
--- a/plugins/aliases/cheatsheet.py
+++ b/plugins/aliases/cheatsheet.py
@ -57,7 +57,7 @@ def pretty_print(cheatsheet, wfilter, group_list=None, groups_only=False):
            pretty_print_group(key, [ alias for alias in aliases if alias[0].find(wfilter)>-1 or alias[1].find(wfilter)>-1], wfilter)

 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="Pretty print aliases.", prog="acs")
+    parser = argparse.ArgumentParser(description="Pretty print aliases.", prog="als")
    parser.add_argument('filter', nargs="*", metavar="<keyword>", help="search aliases matching keywords")
    parser.add_argument('-g', '--group', dest="group_list", action='append', help="only print aliases in given groups")
    parser.add_argument('--groups', dest='groups_only', action='store_true', help="only print alias groups")
--- a/plugins/ansible/README.md
+++ b/plugins/ansible/README.md
@ -21,7 +21,6 @@ plugins=(... ansible)
 | `acon`                                     | command `ansible-console`                                           |
 | `ainv`                                     | command `ansible-inventory`                                         |
 | `aplaybook`                                | command `ansible-playbook`                                          |
-| `ainv`                                     | command `ansible-inventory`                                         |
 | `adoc`                                     | command `ansible-doc`                                               |
 | `agal`                                     | command `ansible-galaxy`                                            |
 | `apull`                                    | command `ansible-pull`                                              |
@ -29,6 +28,6 @@ plugins=(... ansible)

 ## Maintainer

-### [Deepankumar](https://github.com/deepan10) 
+### [Deepankumar](https://github.com/deepan10)

 [https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin)
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@ -181,3 +181,4 @@ whether the package manager is installed, checked in the following order:
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
 - Jeff M. Hubbard - jeffmhubbard@gmail.com
 - K. Harishankar(harishnkr) - hari2menon1234@gmail.com
+- WH-2099 - wh2099@outlook.com
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@ -23,30 +23,27 @@ alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
 alias pacupd="sudo pacman -Sy"
-alias upgrade='sudo pacman -Syu'

 function paclist() {
-  # Based on https://bbs.archlinux.org/viewtopic.php?id=93683
-  pacman -Qqe | \
-    xargs -I '{}' \
-      expac "${bold_color}% 20n ${fg_no_bold[white]}%d${reset_color}" '{}'
+  pacman -Qqe | xargs -I{} -P0 --no-run-if-empty pacman -Qs --color=auto "^{}\$"
 }

 function pacdisowned() {
-  local tmp db fs
-  tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
-  db=$tmp/db
-  fs=$tmp/fs
+  local tmp_dir db fs
+  tmp_dir=$(mktemp --directory)
+  db=$tmp_dir/db
+  fs=$tmp_dir/fs

-  mkdir "$tmp"
-  trap 'rm -rf "$tmp"' EXIT
+  trap "rm -rf $tmp_dir" EXIT

  pacman -Qlq | sort -u > "$db"

-  find /bin /etc /lib /sbin /usr ! -name lost+found \
+  find /etc /usr ! -name lost+found \
    \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"

  comm -23 "$fs" "$db"
+
+  rm -rf $tmp_dir
 }

 alias pacmanallkeys='sudo pacman-key --refresh-keys'
@ -109,7 +106,6 @@ if (( $+commands[aura] )); then
  alias auupd="sudo aura -Sy"
  alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
  alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
-  alias upgrade='sudo aura -Syu'

  # extra bonus specially for aura
  alias auown="aura -Qqo"
@ -136,7 +132,6 @@ if (( $+commands[pacaur] )); then
  alias painsd='pacaur -S --asdeps'
  alias pamir='pacaur -Syy'
  alias paupd="pacaur -Sy"
-  alias upgrade='pacaur -Syu'
 fi

 if (( $+commands[trizen] )); then
@ -158,7 +153,6 @@ if (( $+commands[trizen] )); then
  alias trinsd='trizen -S --asdeps'
  alias trmir='trizen -Syy'
  alias trupd="trizen -Sy"
-  alias upgrade='trizen -Syu'
 fi

 if (( $+commands[yay] )); then
@ -180,5 +174,30 @@ if (( $+commands[yay] )); then
  alias yainsd='yay -S --asdeps'
  alias yamir='yay -Syy'
  alias yaupd="yay -Sy"
-  alias upgrade='yay -Syu'
 fi
+
+# Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
+function upgrade() {
+  echo ":: Checking Arch Linux PGP Keyring..."
+  local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
+  local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
+  if [ $installedver != $currentver ]; then
+    echo " Arch Linux PGP Keyring is out of date."
+    echo " Updating before full system upgrade."
+    sudo pacman -Sy --needed --noconfirm archlinux-keyring
+  else
+    echo " Arch Linux PGP Keyring is up to date."
+    echo " Proceeding with full system upgrade."
+  fi
+  if (( $+commands[yay] )); then
+    yay -Syu
+  elif (( $+commands[trizen] )); then
+    trizen -Syu
+  elif (( $+commands[pacaur] )); then
+    pacaur -Syu
+  elif (( $+commands[aura] )); then
+    sudo aura -Syu
+  else
+    sudo pacman -Syu
+  fi
+}
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@ -2,26 +2,29 @@
 ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
 ASDF_COMPLETIONS="$ASDF_DIR/completions"

-# If not found, check for archlinux/AUR package (/opt/asdf-vm/)
-if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && [[ -f "/opt/asdf-vm/asdf.sh" ]]; then
-  ASDF_DIR="/opt/asdf-vm"
-  ASDF_COMPLETIONS="$ASDF_DIR"
-fi
-
-# If not found, check for Homebrew package
-if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
-  brew_prefix="$(brew --prefix asdf)"
-  ASDF_DIR="${brew_prefix}/libexec"
-  ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d"
-  unset brew_prefix
+if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/_asdf" ]]; then
+  # If not found, check for archlinux/AUR package (/opt/asdf-vm/)
+  if [[ -f "/opt/asdf-vm/asdf.sh" ]]; then
+    ASDF_DIR="/opt/asdf-vm"
+    ASDF_COMPLETIONS="$ASDF_DIR"
+  # If not found, check for Homebrew package
+  elif (( $+commands[brew] )); then
+    _ASDF_PREFIX="$(brew --prefix asdf)"
+    ASDF_DIR="${_ASDF_PREFIX}/libexec"
+    ASDF_COMPLETIONS="${_ASDF_PREFIX}/share/zsh/site-functions"
+    unset _ASDF_PREFIX
+  else
+    return
+  fi
 fi

 # Load command
 if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
-  . "$ASDF_DIR/asdf.sh"
-
+  source "$ASDF_DIR/asdf.sh"
  # Load completions
-  if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
-    . "$ASDF_COMPLETIONS/asdf.bash"
+  if [[ -f "$ASDF_COMPLETIONS/_asdf" ]]; then
+    fpath+=("$ASDF_COMPLETIONS")
+    autoload -Uz _asdf
+    compdef _asdf asdf # compdef is already loaded before loading plugins
  fi
 fi
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@ -17,9 +17,13 @@ if ! type autoenv_init >/dev/null; then
      /usr/local/bin
      /usr/share/autoenv-git
      ~/Library/Python/bin
+      .venv/bin
+      venv/bin
+      env/bin
+      .env/bin
    )
    for d ( $install_locations ); do
-      if [[ -e $d/activate.sh ]]; then
+      if [[ -e $d/activate || -e $d/activate.sh ]]; then
        autoenv_dir=$d
        break
      fi
@ -29,13 +33,13 @@ if ! type autoenv_init >/dev/null; then
  # Look for Homebrew path as a last resort
  if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then
    d=$(brew --prefix)/opt/autoenv
-    if [[ -e $d/activate.sh ]]; then
+    if [[ -e $d/activate || -e $d/activate.sh ]]; then
      autoenv_dir=$d
    fi
  fi

  # Complain if autoenv is not installed
-  if [[ -z $autoenv_dir ]]; then 
+  if [[ -z $autoenv_dir ]]; then
    cat <<END >&2
 -------- AUTOENV ---------
 Could not locate autoenv installation.
@ -46,7 +50,11 @@ END
    return 1
  fi
  # Load autoenv
-  source $autoenv_dir/activate.sh
+  if [[ -e $autoenv_dir/activate ]]; then
+    source $autoenv_dir/activate
+  else
+    source $autoenv_dir/activate.sh
+  fi
 fi
 }
 [[ $? != 0 ]] && return $?
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@ -1,18 +1,20 @@
 declare -a autojump_paths
 autojump_paths=(
-  $HOME/.autojump/etc/profile.d/autojump.zsh             # manual installation
-  $HOME/.autojump/share/autojump/autojump.zsh            # manual installation
-  $HOME/.nix-profile/etc/profile.d/autojump.sh           # NixOS installation
-  /run/current-system/sw/share/autojump/autojump.zsh     # NixOS installation
-  /usr/share/autojump/autojump.zsh                       # Debian and Ubuntu package
-  /etc/profile.d/autojump.zsh                            # manual installation
-  /etc/profile.d/autojump.sh                             # Gentoo installation
-  /usr/local/share/autojump/autojump.zsh                 # FreeBSD installation
-  /usr/pkg/share/autojump/autojump.zsh                   # NetBSD installation
-  /opt/local/etc/profile.d/autojump.sh                   # macOS with MacPorts
-  /usr/local/etc/profile.d/autojump.sh                   # macOS with Homebrew (default)
-  /opt/homebrew/etc/profile.d/autojump.sh                # macOS with Homebrew (default on M1 macs)
-  /etc/profiles/per-user/$USER/etc/profile.d/autojump.sh # macOS Nix, Home Manager and flakes
+  $HOME/.autojump/etc/profile.d/autojump.zsh               # manual installation
+  $HOME/.autojump/share/autojump/autojump.zsh              # manual installation
+  $HOME/.nix-profile/etc/profile.d/autojump.sh             # NixOS installation
+  /run/current-system/sw/share/autojump/autojump.zsh       # NixOS installation
+  /etc/profiles/per-user/$USER/share/autojump/autojump.zsh # Home Manager, NixOS with user-scoped packages
+  /usr/share/autojump/autojump.zsh                         # Debian and Ubuntu package
+  /etc/profile.d/autojump.zsh                              # manual installation
+  /etc/profile.d/autojump.sh                               # Gentoo installation
+  /usr/local/share/autojump/autojump.zsh                   # FreeBSD installation
+  /usr/pkg/share/autojump/autojump.zsh                     # NetBSD installation
+  /opt/local/etc/profile.d/autojump.sh                     # macOS with MacPorts
+  /usr/local/etc/profile.d/autojump.sh                     # macOS with Homebrew (default)
+  /opt/homebrew/etc/profile.d/autojump.sh                  # macOS with Homebrew (default on M1 macs)
+  /opt/pkg/share/autojump/autojump.zsh                     # macOS with pkgsrc
+  /etc/profiles/per-user/$USER/etc/profile.d/autojump.sh   # macOS Nix, Home Manager and flakes
 )

 for file in $autojump_paths; do
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@ -1,7 +1,8 @@
 # aws

-This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
+This plugin provides completion support for [awscli v2](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/index.html)
 and a few utilities to manage AWS profiles/regions and display them in the prompt.
+[awscli v1](https://docs.aws.amazon.com/cli/latest/userguide/cliv2-migration.html) is no longer supported.

 To use it, add `aws` to the plugins array in your zshrc file.

@ -12,9 +13,11 @@ plugins=(... aws)
 ## Plugin commands

 * `asp [<profile>]`: sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
-  It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
+  It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI. It sets `$AWS_PROFILE_REGION` for display in `aws_prompt_info`.
  Run `asp` without arguments to clear the profile.
-* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
+* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection.
+* `asp [<profile>] login [<sso_session>]`: In addition to `asp [<profile>] login`, if SSO session has been configured in your aws profile, it will run the `aws sso login --sso-session <sso_session>` command following profile selection.
+* `asp [<profile>] logout`: If AWS SSO has been configured in your aws profile, it will run the `aws sso logout` command following profile selection.

 * `asr [<region>]`: sets `$AWS_REGION` and `$AWS_DEFAULT_REGION` (legacy) to `<region>`.
  Run `asr` without arguments to clear the profile.
@ -44,6 +47,11 @@ plugins=(... aws)
  Some themes might overwrite the value of RPROMPT instead of appending to it, so they'll need to be fixed to
  see the AWS profile/region prompt.

+* Set `AWS_PROFILE_STATE_ENABLED=true` in your zshrc file if you want the aws profile to persist between shell sessions.
+  This option might slow down your shell startup time.
+  By default the state file path is `/tmp/.aws_current_profile`. This means that the state won't survive a reboot or otherwise GC.
+  You can control the state file path using the `AWS_STATE_FILE` environment variable.
+
 ## Theme

 The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
@ -57,6 +65,8 @@ the current `$AWS_PROFILE` and `$AWS_REGION`. It uses four variables to control

 * ZSH_THEME_AWS_REGION_SUFFIX: sets the suffix of the AWS_REGION. Defaults to `>`.

+* ZSH_THEME_AWS_DIVIDER: sets the divider between ZSH_THEME_AWS_PROFILE_SUFFIX and ZSH_THEME_AWS_REGION_PREFIX. Defaults to ` ` (single space).
+
 ## Configuration

 [Configuration and credential file settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) by AWS
@ -65,7 +75,7 @@ the current `$AWS_PROFILE` and `$AWS_REGION`. It uses four variables to control

 Source profile credentials in `~/.aws/credentials`:

-```
+```ini
 [source-profile-name]
 aws_access_key_id = ...
 aws_secret_access_key = ...
@ -73,7 +83,7 @@ aws_secret_access_key = ...

 Role configuration in `~/.aws/config`:

-```
+```ini
 [profile source-profile-name]
 mfa_serial = arn:aws:iam::111111111111:mfa/myuser
 region = us-east-1
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@ -6,10 +6,26 @@ function agr() {
  echo $AWS_REGION
 }

+# Update state file if enabled
+function _aws_update_state() {
+  if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
+    test -d $(dirname ${AWS_STATE_FILE}) || exit 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}) || exit 1
+    echo -n > "${AWS_STATE_FILE}"
+  fi
+}
+
 # AWS profile selection
 function asp() {
  if [[ -z "$1" ]]; then
-    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE AWS_PROFILE_REGION
+    _aws_clear_state
    echo AWS profile cleared.
    return
  fi
@ -26,8 +42,18 @@ function asp() {
  export AWS_PROFILE=$1
  export AWS_EB_PROFILE=$1

+  export AWS_PROFILE_REGION=$(aws configure get region)
+
+  _aws_update_state
+
  if [[ "$2" == "login" ]]; then
-    aws sso login
+    if [[ -n "$3" ]]; then
+      aws sso login --sso-session $3
+    else
+      aws sso login
+    fi
+  elif [[ "$2" == "logout" ]]; then
+    aws sso logout
  fi
 }

@ -35,6 +61,7 @@ function asp() {
 function asr() {
  if [[ -z "$1" ]]; then
    unset AWS_DEFAULT_REGION AWS_REGION
+    _aws_update_state
    echo AWS region cleared.
    return
  fi
@ -48,6 +75,7 @@ function asr() {

  export AWS_REGION=$1
  export AWS_DEFAULT_REGION=$1
+  _aws_update_state
 }

 # AWS profile switch
@ -158,19 +186,53 @@ function aws_change_access_key() {
    return 1
  fi

-  echo "Insert the credentials when asked."
-  asp "$1" || return 1
-  AWS_PAGER="" aws iam create-access-key
-  AWS_PAGER="" aws configure --profile "$1"
+  local profile="$1"
+  # Get current access key
+  local original_aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"

-  echo "You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`"
+  asp "$profile" || return 1
+  echo "Generating a new access key pair for you now."
+  if aws --no-cli-pager iam create-access-key; then
+    echo "Insert the newly generated credentials when asked."
+    aws --no-cli-pager configure --profile $profile
+  else
+    echo "Current access keys:"
+    aws --no-cli-pager iam list-access-keys
+    echo "Profile \"${profile}\" is currently using the $original_aws_access_key_id key. You can delete an old access key by running \`aws --profile $profile iam delete-access-key --access-key-id AccessKeyId\`"
+    return 1
+  fi
+
+  read -q "yn?Would you like to disable your previous access key (${original_aws_access_key_id}) now? "
+  case $yn in
+    [Yy]*)
+      echo -n "\nDisabling access key ${original_aws_access_key_id}..."
+      if aws --no-cli-pager iam update-access-key --access-key-id ${original_aws_access_key_id} --status Inactive; then
+        echo "done."
+      else
+        echo "\nFailed to disable ${original_aws_access_key_id} key."
+      fi
+      ;;
+    *)
+      echo ""
+      ;;
+  esac
+  echo "You can now safely delete the old access key by running \`aws --profile $profile iam delete-access-key --access-key-id ${original_aws_access_key_id}\`"
  echo "Your current keys are:"
-  AWS_PAGER="" aws iam list-access-keys
+  aws --no-cli-pager iam list-access-keys
 }

 function aws_regions() {
+  local region
+  if [[ $AWS_DEFAULT_REGION ]];then
+      region="$AWS_DEFAULT_REGION"
+  elif [[ $AWS_REGION ]];then
+      region="$AWS_REGION"
+  else
+      region="us-west-1"
+  fi
+
  if [[ $AWS_DEFAULT_PROFILE || $AWS_PROFILE ]];then
-    aws ec2 describe-regions |grep RegionName | awk -F ':' '{gsub(/"/, "", $2);gsub(/,/, "", $2);gsub(/ /, "", $2);  print $2}'
+    aws ec2 describe-regions --region $region |grep RegionName | awk -F ':' '{gsub(/"/, "", $2);gsub(/,/, "", $2);gsub(/ /, "", $2);  print $2}'
  else
    echo "You must specify a AWS profile."
  fi
@ -194,14 +256,40 @@ compctl -K _aws_profiles asp acp aws_change_access_key

 # AWS prompt
 function aws_prompt_info() {
-  if [[ -z $AWS_REGION && -z $AWS_PROFILE ]];then return; fi
-  echo "${ZSH_THEME_AWS_PROFILE_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_PROFILE_SUFFIX:=>} ${ZSH_THEME_AWS_REGION_PREFIX:=<region:}${AWS_REGION}${ZSH_THEME_AWS_REGION_SUFFIX:=>}"
+  local _aws_to_show
+  local region="${AWS_REGION:-${AWS_DEFAULT_REGION:-$AWS_PROFILE_REGION}}"
+
+  if [[ -n "$AWS_PROFILE" ]];then
+    _aws_to_show+="${ZSH_THEME_AWS_PROFILE_PREFIX="<aws:"}${AWS_PROFILE}${ZSH_THEME_AWS_PROFILE_SUFFIX=">"}"
+  fi
+
+  if [[ -n "$region" ]]; then
+    [[ -n "$_aws_to_show" ]] && _aws_to_show+="${ZSH_THEME_AWS_DIVIDER=" "}"
+    _aws_to_show+="${ZSH_THEME_AWS_REGION_PREFIX="<region:"}${region}${ZSH_THEME_AWS_REGION_SUFFIX=">"}"
+  fi
+
+  echo "$_aws_to_show"
 }

 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then
  RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi

+if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
+  AWS_STATE_FILE="${AWS_STATE_FILE:-/tmp/.aws_current_profile}"
+  test -s "${AWS_STATE_FILE}" || return
+
+  aws_state=($(cat $AWS_STATE_FILE))
+
+  export AWS_DEFAULT_PROFILE="${aws_state[1]}"
+  export AWS_PROFILE="$AWS_DEFAULT_PROFILE"
+  export AWS_EB_PROFILE="$AWS_DEFAULT_PROFILE"
+
+  test -z "${aws_state[2]}" && AWS_REGION=$(aws configure get region)
+
+  export AWS_REGION=${AWS_REGION:-$aws_state[2]}
+  export AWS_DEFAULT_REGION="$AWS_REGION"
+fi

 # Load awscli completions

--- a/plugins/azure/azure.plugin.zsh
+++ b/plugins/azure/azure.plugin.zsh
@ -1,4 +1,4 @@
-# AZ Get Subscritions
+# AZ Get Subscriptions
 function azgs() {
  az account show --output tsv --query 'name' 2>/dev/null
 }
@ -18,10 +18,10 @@ compctl -K _az_subscriptions azss

 # Azure prompt
 function azure_prompt_info() {
-  [[ ! -f "${AZURE_CONFIG_DIR:-$HOME/.azure/azureProfile.json}" ]] && return
+  [[ ! -f "${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json" ]] && return
  # azgs is too expensive, if we have jq, we enable the prompt
  (( $+commands[jq] )) || return 1
-  azgs=$(jq -r '.subscriptions[] | select(.isDefault==true) .name' ${AZURE_CONFIG_DIR:-$HOME/.azure/azureProfile.json})
+  azgs=$(jq -r '.subscriptions[] | select(.isDefault==true) .name' "${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json")
  echo "${ZSH_THEME_AZURE_PREFIX:=<az:}${azgs}${ZSH_THEME_AZURE_SUFFIX:=>}"
 }

@ -31,11 +31,9 @@ function _az-homebrew-installed() {
  # check if Homebrew is installed
  (( $+commands[brew] )) || return 1

-  # speculatively check default brew prefix
-  if [[ -d /usr/local ]]; then
-    _brew_prefix=/usr/local
-  elif [[ -d /opt/homebrew ]]; then
-    _brew_prefix=/opt/homebrew
+  # if so, we assume it's default way to install brew
+  if [[ ${commands[brew]:t2} == bin/brew ]]; then
+    _brew_prefix="${commands[brew]:h:h}" # remove trailing /bin/brew
  else
    # ok, it is not in the default prefix
    # this call to brew is expensive (about 400 ms), so at least let's make it only once
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@ -13,6 +13,10 @@
 # Author: Avneet Singh (kalsi-avneet)     #
 # Modified to add support for Android     #
 ###########################################
+# Author: Not Pua (im-notpua)             #
+# Modified to add support for OpenBSD     #
+###########################################
+

 if [[ "$OSTYPE" = darwin* ]]; then
  function battery_is_charging() {
@ -139,6 +143,46 @@ elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )
      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
    fi
  }
+elif [[ "$OSTYPE" = openbsd* ]]; then
+  function battery_is_charging() {
+    [[ $(apm -b) -eq 3 ]]
+  }
+  function battery_pct() {
+    apm -l
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() {
+    local remaining_time
+    remaining_time=$(apm -m)
+    if [[ $remaining_time -ge 0 ]]; then
+      ((hour = $remaining_time / 60 ))
+      ((minute = $remaining_time % 60 ))
+      printf %02d:%02d $hour $minute
+    fi
+  }
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
+
 elif [[ "$OSTYPE" = linux*  ]]; then
  function battery_is_charging() {
    if (( $+commands[acpitool] )); then
--- a/plugins/bazel/README.md
+++ b/plugins/bazel/README.md
@ -1,7 +1,6 @@
 # Bazel plugin

-This plugin adds completion for [bazel](https://bazel.build), an open-source build and
-test tool that scalably supports multi-language and multi-platform projects.
+This plugin adds completion and aliases for [bazel](https://bazel.build), an open-source build and test tool that scalably supports multi-language and multi-platform projects.

 To use it, add `bazel` to the plugins array in your zshrc file:

@ -12,3 +11,12 @@ plugins=(... bazel)
 The plugin has a copy of [the completion script from the git repository][1].

 [1]: https://github.com/bazelbuild/bazel/blob/master/scripts/zsh_completion/_bazel
+
+## Aliases
+
+| Alias   | Command                                | Description                                            |
+| ------- | -------------------------------------- | ------------------------------------------------------ |
+| bzb      | `bazel build`                          | The `bazel build` command                              |
+| bzt      | `bazel test`                           | The `bazel test` command                               |
+| bzr      | `bazel run`                            | The `bazel run` command                                |
+| bzq      | `bazel query`                          | The `bazel query` command                              |
--- a/plugins/bazel/_bazel
+++ b/plugins/bazel/_bazel
@ -1,4 +1,4 @@
-#compdef bazel
+#compdef bazel bazelisk

 # Copyright 2015 The Bazel Authors. All rights reserved.
 #
--- a/plugins/bazel/bazel.plugin.zsh
+++ b/plugins/bazel/bazel.plugin.zsh
@ -0,0 +1,5 @@
+# Aliases for bazel
+alias bzb='bazel build'
+alias bzt='bazel test'
+alias bzr='bazel run'
+alias bzq='bazel query'
--- a/plugins/bgnotify/README.md
+++ b/plugins/bgnotify/README.md
@ -1,19 +1,19 @@
 # bgnotify zsh plugin

-cross-platform background notifications for long running commands! Supports OSX and Ubuntu linux.
+cross-platform background notifications for long running commands! Supports OSX and Linux.

 Standalone homepage: [t413/zsh-background-notify](https://github.com/t413/zsh-background-notify)

----------------------------------
+---

-## How to use!
+## How to use

 Just add bgnotify to your plugins list in your `.zshrc`

 - On OS X you'll need [terminal-notifier](https://github.com/alloy/terminal-notifier)
  * `brew install terminal-notifier` (or `gem install terminal-notifier`)
- On ubuntu you're already all set!
- On windows you can use [notifu](https://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
+- On Linux, make sure you have `notify-send` or `kdialog` installed. If you're using Ubuntu you should already be all set!
+- On Windows you can use [notifu](https://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package


 ## Screenshots
@ -35,20 +35,29 @@ Just add bgnotify to your plugins list in your `.zshrc`

 One can configure a few things:

+- `bgnotify_bell` enabled or disables the terminal bell (default true)
 - `bgnotify_threshold` sets the notification threshold time (default 6 seconds)
- `function bgnotify_formatted` lets you change the notification
+- `function bgnotify_formatted` lets you change the notification. You can for instance customize the message and pass in an icon.

 Use these by adding a function definition before the your call to source. Example:

-~~~ sh
+```sh
+bgnotify_bell=false   ## disable terminal bell
 bgnotify_threshold=4  ## set your own notification threshold

 function bgnotify_formatted {
  ## $1=exit_status, $2=command, $3=elapsed_time
-  [ $1 -eq 0 ] && title="Holy Smokes Batman!" || title="Holy Graf Zeppelin!"
-  bgnotify "$title -- after $3 s" "$2";
+
+  # Humanly readable elapsed time
+  local elapsed="$(( $3 % 60 ))s"
+  (( $3 < 60 ))   || elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
+  (( $3 < 3600 )) || elapsed="$((  $3 / 3600 ))h $elapsed"
+
+  [ $1 -eq 0 ] && title="Holy Smokes Batman" || title="Holy Graf Zeppelin"
+  [ $1 -eq 0 ] && icon="$HOME/icons/success.png" || icon="$HOME/icons/fail.png"
+  bgnotify "$title - took ${elapsed}" "$2" "$icon"
 }

 plugins=(git bgnotify)  ## add to plugins list
 source $ZSH/oh-my-zsh.sh  ## existing source call
-~~~
+```
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@ -21,13 +21,12 @@ function bgnotify_end {
    local elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))

    # check time elapsed
-    [[ $bgnotify_timestamp -gt 0 ]] || return
-    [[ $elapsed -ge $bgnotify_threshold ]] || return
+    [[ $bgnotify_timestamp -gt 0 ]] || return 0
+    [[ $elapsed -ge $bgnotify_threshold ]] || return 0

    # check if Terminal app is not active
-    [[ $(bgnotify_appid) != "$bgnotify_termid" ]] || return
+    [[ $(bgnotify_appid) != "$bgnotify_termid" ]] || return 0

-    printf '\a' # beep sound
    bgnotify_formatted "$exit_status" "$bgnotify_lastcmd" "$elapsed"
  } always {
    bgnotify_timestamp=0
@ -52,53 +51,89 @@ function bgnotify_formatted {
  (( $3 < 60 )) || elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
  (( $3 < 3600 )) || elapsed="$(( $3 / 3600 ))h $elapsed"

-  if [[ $1 -eq 0 ]]; then
-    bgnotify "#win (took $elapsed)" "$2"
+  [[ $bgnotify_bell = true ]] && printf '\a' # beep sound
+  if [[ $exit_status -eq 0 ]]; then
+    bgnotify "#win (took $elapsed)" "$cmd"
  else
-    bgnotify "#fail (took $elapsed)" "$2"
+    bgnotify "#fail (took $elapsed)" "$cmd"
  fi
 }

-# for macOS, output is "app ID, window ID" (com.googlecode.iterm2, 116)
 function bgnotify_appid {
  if (( ${+commands[osascript]} )); then
-    osascript -e 'tell application (path to frontmost application as text) to get the {id, id of front window}' 2>/dev/null
-  elif (( ${+commands[xprop]} )); then
+    osascript -e "tell application id \"$(bgnotify_programid)\"  to get the {id, frontmost, id of front window, visible of front window}" 2>/dev/null
+  elif [[ -n $WAYLAND_DISPLAY ]] && (( ${+commands[swaymsg]} )); then # wayland+sway
+    local app_id=$(bgnotify_find_sway_appid)
+    [[ -n "$app_id" ]] && echo "$app_id" || echo $EPOCHSECONDS
+  elif [[ -z $WAYLAND_DISPLAY ]] && [[ -n $DISPLAY ]] && (( ${+commands[xprop]} )); then
    xprop -root _NET_ACTIVE_WINDOW 2>/dev/null | cut -d' ' -f5
  else
    echo $EPOCHSECONDS
  fi
 }

-function bgnotify {
-  # $1: title, $2: message
-  if (( ${+commands[terminal-notifier]} )); then # macOS
-    local term_id="${bgnotify_termid%%,*}" # remove window id
-    if [[ -z "$term_id" ]]; then
-      case "$TERM_PROGRAM" in
-      iTerm.app) term_id='com.googlecode.iterm2' ;;
-      Apple_Terminal) term_id='com.apple.terminal' ;;
-      esac
-    fi

-    if [[ -z "$term_id" ]]; then
-      terminal-notifier -message "$2" -title "$1" &>/dev/null
-    else
-      terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" &>/dev/null
-    fi
+function bgnotify_find_sway_appid {
+  # output is "app_id,container_id", for example "Alacritty,1694"
+  # see example swaymsg output: https://github.com/ohmyzsh/ohmyzsh/files/13463939/output.json
+  if (( ${+commands[jq]} )); then
+    swaymsg -t get_tree | jq '.. | select(.type?) | select(.focused==true) | {app_id, id} | join(",")'
+  else
+    swaymsg -t get_tree | awk '
+      BEGIN { Id = ""; Appid = ""; FocusNesting = -1; Nesting = 0 }
+      {
+        # Enter a block
+        if ($0 ~ /.*{$/) Nesting++
+
+        # Exit a block. If Nesting is now less than FocusNesting, we have the data we are looking for
+        if ($0 ~ /^[[:blank:]]*}.*/) { Nesting--; if (FocusNesting > 0 && Nesting < FocusNesting) exit 0 }
+
+        # Save the Id, it is potentially what we are looking for
+        if ($0 ~ /^[[:blank:]]*"id": [0-9]*,?$/)    { sub(/^[[:blank:]]*"id": /, "");      sub(/,$/,  ""); Id = $0 }
+
+        # Save the Appid, it is potentially what we are looking for
+        if ($0 ~ /^[[:blank:]]*"app_id": ".*",?$/)  { sub(/^[[:blank:]]*"app_id": "/, ""); sub(/",$/, ""); Appid = $0 }
+
+        # Window is focused, this nesting block contains the Id and Appid we want!
+        if ($0 ~ /^[[:blank:]]*"focused": true,?$/) { FocusNesting = Nesting }
+      }
+      END {
+        if (Appid != "" && Id != "" && FocusNesting != -1) print Appid "," Id
+        else print ""
+      }'
+  fi
+}
+
+function bgnotify_programid {
+  case "$TERM_PROGRAM" in
+    iTerm.app) echo 'com.googlecode.iterm2' ;;
+    Apple_Terminal) echo 'com.apple.terminal' ;;
+  esac
+}
+
+function bgnotify {
+  local title="$1"
+  local message="$2"
+  local icon="$3"
+  if (( ${+commands[terminal-notifier]} )); then # macOS
+    local term_id=$(bgnotify_programid)
+    terminal-notifier -message "$message" -title "$title" ${=icon:+-appIcon "$icon"} ${=term_id:+-activate "$term_id" -sender "$term_id"} &>/dev/null
  elif (( ${+commands[growlnotify]} )); then # macOS growl
-    growlnotify -m "$1" "$2"
-  elif (( ${+commands[notify-send]} )); then # GNOME
-    notify-send "$1" "$2"
+    growlnotify -m "$title" "$message"
+  elif (( ${+commands[notify-send]} )); then
+    notify-send "$title" "$message" ${=icon:+--icon "$icon"}
  elif (( ${+commands[kdialog]} )); then # KDE
-    kdialog --title "$1" --passivepopup  "$2" 5
+    kdialog --title "$title" --passivepopup  "$message" 5
  elif (( ${+commands[notifu]} )); then # cygwin
-    notifu /m "$2" /p "$1"
+    notifu /m "$message" /p "$title" ${=icon:+/i "$icon"}
  fi
 }

 ## Defaults

+# enable terminal bell on notify by default
+bgnotify_bell=${bgnotify_bell:-true}
+
 # notify if command took longer than 5s by default
 bgnotify_threshold=${bgnotify_threshold:-5}

--- a/plugins/branch/README.md
+++ b/plugins/branch/README.md
@ -39,7 +39,7 @@ index 2fd5f2cd..9d89a464 100644
 PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
 -PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
 +PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_prompt_info)'
- 
+
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ```
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@ -10,10 +10,12 @@ plugins=(... brew)

 ## Shellenv

-If `brew` is not found in the PATH, this plugin will attempt to find it in common
-locations, and execute `brew shellenv` to set the environment appropriately.
-This plugin will also export `HOMEBREW_PREFIX="$(brew --prefix)"` if not previously
-defined for convenience.
+If `brew` is not found in the PATH, this plugin will attempt to find it in common locations, and execute
+`brew shellenv` to set the environment appropriately. This plugin will also export
+`HOMEBREW_PREFIX="$(brew --prefix)"` if not previously defined for convenience.
+
+In case you installed `brew` in a non-common location, you can still set `BREW_LOCATION` variable pointing to
+the `brew` binary before sourcing `oh-my-zsh.sh` and it'll set up the environment.

 ## Aliases

@ -33,7 +35,9 @@ defined for convenience.

 ## Completion

-With the release of Homebrew 1.0, they decided to bundle the zsh completion as part of the
-brew installation, so we no longer ship it with the brew plugin; now it only has brew
-aliases. If you find that brew completion no longer works, make sure you have your Homebrew
-installation fully up to date.
+This plugin configures paths with Homebrew's completion functions automatically, so you don't need to do it
+manually. See: https://docs.brew.sh/Shell-Completion#configuring-completions-in-zsh.
+
+With the release of Homebrew 1.0, they decided to bundle the zsh completion as part of the brew installation,
+so we no longer ship it with the brew plugin; now it only has brew aliases. If you find that brew completion
+no longer works, make sure you have your Homebrew installation fully up to date.
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@ -1,5 +1,10 @@
 if (( ! $+commands[brew] )); then
-  if [[ -x /opt/homebrew/bin/brew ]]; then
+  if [[ -n "$BREW_LOCATION" ]]; then
+    if [[ ! -x "$BREW_LOCATION" ]]; then
+      echo "[oh-my-zsh] $BREW_LOCATION is not executable"
+      return
+    fi
+  elif [[ -x /opt/homebrew/bin/brew ]]; then
    BREW_LOCATION="/opt/homebrew/bin/brew"
  elif [[ -x /usr/local/bin/brew ]]; then
    BREW_LOCATION="/usr/local/bin/brew"
@ -25,9 +30,12 @@ if [[ -z "$HOMEBREW_PREFIX" ]]; then
  export HOMEBREW_PREFIX="$(brew --prefix)"
 fi

+if [[ -d "$HOMEBREW_PREFIX/share/zsh/site-functions" ]]; then
+  fpath+=("$HOMEBREW_PREFIX/share/zsh/site-functions")
+fi
+
 alias bcubc='brew upgrade --cask && brew cleanup'
 alias bcubo='brew update && brew outdated --cask'
-alias bcubc='brew upgrade --cask && brew cleanup'
 alias brewp='brew pin'
 alias brewsp='brew list --pinned'
 alias bubc='brew upgrade && brew cleanup'
--- a/plugins/bun/README.md
+++ b/plugins/bun/README.md
@ -0,0 +1,20 @@
+# Bun Plugin
+
+This plugin sets up completion for [Bun](https://bun.sh).
+
+To use it, add `bun` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... bun)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+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 cache is stored at:
+
+- `$ZSH_CACHE_DIR/completions/_bun_` completions script
--- a/plugins/bun/bun.plugin.zsh
+++ b/plugins/bun/bun.plugin.zsh
@ -0,0 +1,14 @@
+# If Bun is not found, don't do the rest of the script
+if (( ! $+commands[bun] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `bun`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_bun" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _bun
+  _comps[bun]=_bun
+fi
+
+bun completions >| "$ZSH_CACHE_DIR/completions/_bun" &|
--- a/plugins/catimg/README.md
+++ b/plugins/catimg/README.md
@ -1,6 +1,6 @@
 # catimg

-Plugin for displaying images on the terminal using the the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)
+Plugin for displaying images on the terminal using the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)

 To use it, add `catimg` to the plugins array in your zshrc file:

--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@ -2,7 +2,7 @@

 _source-from-omz-settings() {
  local _chruby_path _chruby_auto
-  
+
  zstyle -s :omz:plugins:chruby path _chruby_path || return 1
  zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1

@ -23,7 +23,7 @@ _source-from-homebrew() {
  if [[ -h /usr/local/opt/chruby ]];then
    _brew_prefix="/usr/local/opt/chruby"
  else
-    # ok , it is not default prefix 
+    # ok , it is not default prefix
    # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
    _brew_prefix=$(brew --prefix chruby)
  fi
--- a/plugins/cloudfoundry/README.md
+++ b/plugins/cloudfoundry/README.md
@ -50,7 +50,7 @@ Alternatively, seek out the [online documentation][3]. And don't forget, there a

 ## Contributors

-Contributed to `oh_my_zsh` by [benwilcock][2].  
+Contributed to `oh_my_zsh` by [benwilcock][2].

 [1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html
 [2]: https://github.com/benwilcock
--- a/plugins/coffee/README.md
+++ b/plugins/coffee/README.md
@ -24,7 +24,7 @@ Also provides the following aliases:
 * **cfc:** Copies the compiled JS to your clipboard. Very useful when you want
           to run the code in a JS console.

-* **cfp:** Compiles from your currently copied clipboard. Useful when you want 
+* **cfp:** Compiles from your currently copied clipboard. Useful when you want
           to compile large/multi-line snippets

 * **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@ -36,6 +36,7 @@ function colored() {
  # Prefer `less` whenever available, since we specifically configured
  # environment for it.
  environment+=( PAGER="${commands[less]:-$PAGER}" )
+  environment+=( GROFF_NO_SGR=1 )

  # See ./nroff script.
  if [[ "$OSTYPE" = solaris* ]]; then
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@ -3,9 +3,10 @@
 for file (
  # Arch Linux. Must have pkgfile installed: https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found
  /usr/share/doc/pkgfile/command-not-found.zsh
-  # macOS (M1 and classic Homebrew): https://github.com/Homebrew/homebrew-command-not-found
+  # Homebrew: https://github.com/Homebrew/homebrew-command-not-found
  /opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
  /usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+  /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
 ); do
  if [[ -r "$file" ]]; then
    source "$file"
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@ -7,7 +7,7 @@

 if (( ${+commands[compleat]} )); then
  local prefix="${commands[compleat]:h:h}"
-  local setup="${prefix}/share/compleat-1.0/compleat_setup" 
+  local setup="${prefix}/share/compleat-1.0/compleat_setup"

  if [[ -f "$setup" ]]; then
    if ! bashcompinit >/dev/null 2>&1; then
@ -15,6 +15,6 @@ if (( ${+commands[compleat]} )); then
      bashcompinit -i
    fi

-    source "$setup" 
+    source "$setup"
  fi
 fi
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@ -1,4 +1,4 @@
-# copy the active line from the command line buffer 
+# copy the active line from the command line buffer
 # onto the system clipboard

 copybuffer () {
--- a/plugins/dash/README.md
+++ b/plugins/dash/README.md
@ -19,7 +19,7 @@ dash

 - Query for something in dash app: `dash query`
 ```
-dash golang 
+dash golang
 ```

 - You can optionally provide a keyword: `dash [keyword:]query`
--- a/plugins/dbt/README.md
+++ b/plugins/dbt/README.md
@ -0,0 +1,29 @@
+# dbt plugin
+
+## Introduction
+
+The `dbt plugin` adds several aliases for useful [dbt](https://docs.getdbt.com/) commands and
+[aliases](#aliases).
+
+To use it, add `dbt` to the plugins array of your zshrc file:
+
+```
+plugins=(... dbt)
+```
+
+## Aliases
+
+| Alias  | Command                                          | Description                                          |
+| ------ | ------------------------------------------------ | ---------------------------------------------------- |
+| dbtlm  | `dbt ls -s state:modified`                       | List modified models only                            |
+| dbtrm  | `dbt run -s state:modified`                      | Run modified models only                             |
+| dbttm  | `dbt test -m state:modified`                     | Test modified models only                            |
+| dbtrtm | `dbtrm && dbttm`                                 | Run and test modified models only                    |
+| dbtrs  | `dbt clean; dbt deps; dbt seed`                  | Re-seed data                                         |
+| dbtfrt | `dbtrs; dbt run --full-refresh; dbt test`        | Perform a full fresh run with tests                  |
+| dbtcds | `dbt docs generate; dbt docs serve`              | Generate docs without compiling                      |
+| dbtds  | `dbt docs generate --no-compile; dbt docs serve` | Generate and serve docs skipping doc. re-compilation |
+
+## Maintainer
+
+### [msempere](https://github.com/msempere)
--- a/plugins/dbt/dbt.plugin.zsh
+++ b/plugins/dbt/dbt.plugin.zsh
@ -0,0 +1,23 @@
+# list modified models only
+alias dbtlm="dbt ls -s state:modified"
+
+# run modified models only
+alias dbtrm="dbt run -s state:modified"
+
+# test modified models only
+alias dbttm="dbt test -m state:modified"
+
+# run and test modified models only
+alias dbtrtm="dbtrm && dbttm"
+
+# re-seed data
+alias dbtrs="dbt clean; dbt deps; dbt seed"
+
+# perform a full fresh run with tests
+alias dbtfrt="dbtrs; dbt run --full-refresh; dbt test"
+
+# generate and serve docs
+alias dbtcds="dbt docs generate; dbt docs serve"
+
+# generate and serve docs skipping doc. re-compilation
+alias dbtds="dbt docs generate --no-compile; dbt docs serve"
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@ -13,7 +13,12 @@ plugins=(... debian)
 - `$apt_pref`: use aptitude or apt if installed, fallback is apt-get.
 - `$apt_upgr`: use upgrade or safe-upgrade (for aptitude).

-Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior.
+Set **both** `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior, e.g.:
+
+```sh
+apt_pref='apt'
+apt_upgr='full-upgrade'
+```

 ## Common Aliases

@ -21,7 +26,7 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | ------ | ---------------------------------------------------------------------- | ---------------------------------------------------------- |
 | `age`  | `apt-get`                                                              | Command line tool for handling packages                    |
 | `api`  | `aptitude`                                                             | Same functionality as `apt-get`, provides extra options    |
-| `acse` | `apt-cache search`                                                     | Command line tool for searching apt software package cache |
+| `acs`  | `apt-cache search`                                                     | Command line tool for searching apt software package cache |
 | `aps`  | `aptitude search`                                                      | Searches installed packages using aptitude                 |
 | `as`   | `aptitude -F '* %p -> %d \n(%v/%V)' --no-gui --disable-columns search` | Print searched packages using a custom format              |
 | `afs`  | `apt-file search --regexp`                                             | Search file in packages                                    |
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@ -26,7 +26,7 @@ alias age='apt-get'
 alias api='aptitude'

 # Some self-explanatory aliases
-alias acse="apt-cache search"
+alias acs="apt-cache search"
 alias aps='aptitude search'
 alias as="aptitude -F '* %p -> %d \n(%v/%V)' --no-gui --disable-columns search"

--- a/plugins/deno/README.md
+++ b/plugins/deno/README.md
@ -4,16 +4,17 @@ This plugin sets up completion and aliases for [Deno](https://deno.land).

 ## Aliases

-| Alias | Full command     |
-| ----- | ---------------- |
-| db    | deno bundle      |
-| dc    | deno compile     |
-| dca   | deno cache       |
-| dfmt  | deno fmt         |
-| dh    | deno help        |
-| dli   | deno lint        |
-| drn   | deno run         |
-| drA   | deno run -A      |
-| drw   | deno run --watch |
-| dts   | deno test        |
-| dup   | deno upgrade     |
+| Alias | Full command        |
+| ----- | ------------------- |
+| db    | deno bundle         |
+| dc    | deno compile        |
+| dca   | deno cache          |
+| dfmt  | deno fmt            |
+| dh    | deno help           |
+| dli   | deno lint           |
+| drn   | deno run            |
+| drA   | deno run -A         |
+| drw   | deno run --watch    |
+| dru   | deno run --unstable |
+| dts   | deno test           |
+| dup   | deno upgrade        |
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@ -8,6 +8,7 @@ alias dli='deno lint'
 alias drn='deno run'
 alias drA='deno run -A'
 alias drw='deno run --watch'
+alias dru='deno run --unstable'
 alias dts='deno test'
 alias dup='deno upgrade'

--- a/plugins/direnv/direnv.plugin.zsh
+++ b/plugins/direnv/direnv.plugin.zsh
@ -7,10 +7,10 @@ _direnv_hook() {
  trap - SIGINT;
 }
 typeset -ag precmd_functions;
-if [[ -z ${precmd_functions[(r)_direnv_hook]} ]]; then
+if [[ -z "${precmd_functions[(r)_direnv_hook]+1}" ]]; then
  precmd_functions=( _direnv_hook ${precmd_functions[@]} )
 fi
 typeset -ag chpwd_functions;
-if [[ -z ${chpwd_functions[(r)_direnv_hook]} ]]; then
+if [[ -z "${chpwd_functions[(r)_direnv_hook]+1}" ]]; then
  chpwd_functions=( _direnv_hook ${chpwd_functions[@]} )
 fi
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@ -19,15 +19,17 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
+  setopt localoptions no_ksh_arrays
  if [[ $#dirhistory_past -gt 0 ]]; then
+    typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
    dirhistory_past[$#dirhistory_past]=()
  fi
 }

 function pop_future() {
-  typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
+  setopt localoptions no_ksh_arrays
  if [[ $#dirhistory_future -gt 0 ]]; then
+    typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
    dirhistory_future[$#dirhistory_future]=()
  fi
 }
@ -35,6 +37,7 @@ function pop_future() {
 # Push a new element onto the end of dirhistory_past. If the size of the array
 # is >= DIRHISTORY_SIZE, the array is shifted
 function push_past() {
+  setopt localoptions no_ksh_arrays
  if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
    shift dirhistory_past
  fi
@ -44,6 +47,7 @@ function push_past() {
 }

 function push_future() {
+  setopt localoptions no_ksh_arrays
  if [[ $#dirhistory_future -ge $DIRHISTORY_SIZE ]]; then
    shift dirhistory_future
  fi
--- a/plugins/dnf/README.md
+++ b/plugins/dnf/README.md
@ -10,6 +10,9 @@ To use it, add `dnf` to the plugins array in your zshrc file:
 plugins=(... dnf)
 ```

+Classic `dnf` is getting superseded by `dnf5`; this plugin detects the presence
+of `dnf5` and uses it as drop-in alternative to the slower `dnf`.
+
 ## Aliases

 | Alias | Command                 | Description              |
--- a/plugins/dnf/dnf.plugin.zsh
+++ b/plugins/dnf/dnf.plugin.zsh
@ -1,15 +1,19 @@
 ## Aliases
+local dnfprog="dnf"

-alias dnfl="dnf list"                       # List packages
-alias dnfli="dnf list installed"            # List installed packages
-alias dnfgl="dnf grouplist"                 # List package groups
-alias dnfmc="dnf makecache"                 # Generate metadata cache
-alias dnfp="dnf info"                       # Show package information
-alias dnfs="dnf search"                     # Search package
+# Prefer dnf5 if installed
+command -v dnf5 > /dev/null && dnfprog=dnf5

-alias dnfu="sudo dnf upgrade"               # Upgrade package
-alias dnfi="sudo dnf install"               # Install package
-alias dnfgi="sudo dnf groupinstall"         # Install package group
-alias dnfr="sudo dnf remove"                # Remove package
-alias dnfgr="sudo dnf groupremove"          # Remove package group
-alias dnfc="sudo dnf clean all"             # Clean cache
+alias dnfl="${dnfprog} list"                       # List packages
+alias dnfli="${dnfprog} list installed"            # List installed packages
+alias dnfgl="${dnfprog} grouplist"                 # List package groups
+alias dnfmc="${dnfprog} makecache"                 # Generate metadata cache
+alias dnfp="${dnfprog} info"                       # Show package information
+alias dnfs="${dnfprog} search"                     # Search package
+
+alias dnfu="sudo ${dnfprog} upgrade"               # Upgrade package
+alias dnfi="sudo ${dnfprog} install"               # Install package
+alias dnfgi="sudo ${dnfprog} groupinstall"         # Install package group
+alias dnfr="sudo ${dnfprog} remove"                # Remove package
+alias dnfgr="sudo ${dnfprog} groupremove"          # Remove package group
+alias dnfc="sudo ${dnfprog} clean all"             # Clean cache
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@ -11,23 +11,24 @@ plugins=(... docker-compose)

 ## Aliases

-| Alias     | Command                        | Description                                                                      |
-|-----------|--------------------------------|----------------------------------------------------------------------------------|
-| dco       | `docker-compose`               | Docker-compose main command                                                      |
-| dcb       | `docker-compose build`         | Build containers                                                                 |
-| dce       | `docker-compose exec`          | Execute command inside a container                                               |
-| dcps      | `docker-compose ps`            | List containers                                                                  |
-| dcrestart | `docker-compose restart`       | Restart container                                                                |
-| dcrm      | `docker-compose rm`            | Remove container                                                                 |
-| dcr       | `docker-compose run`           | Run a command in container                                                       |
-| dcstop    | `docker-compose stop`          | Stop a container                                                                 |
-| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service                 |
-| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers                      |
-| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                                             |
-| dcupdb    | `docker-compose up -d --build` | Same as `dcup`, but build images before starting containers and starts as daemon |
-| dcdn      | `docker-compose down`          | Stop and remove containers                                                       |
-| dcl       | `docker-compose logs`          | Show logs of container                                                           |
-| dclf      | `docker-compose logs -f`       | Show logs and follow output                                                      |
-| dcpull    | `docker-compose pull`          | Pull image of a service                                                          |
-| dcstart   | `docker-compose start`         | Start a container                                                                |
-| dck       | `docker-compose kill`          | Kills containers                                                                 |
+| Alias     | Command                          | Description                                                                      |
+|-----------|----------------------------------|----------------------------------------------------------------------------------|
+| dco       | `docker-compose`                 | Docker-compose main command                                                      |
+| dcb       | `docker-compose build`           | Build containers                                                                 |
+| dce       | `docker-compose exec`            | Execute command inside a container                                               |
+| dcps      | `docker-compose ps`              | List containers                                                                  |
+| dcrestart | `docker-compose restart`         | Restart container                                                                |
+| dcrm      | `docker-compose rm`              | Remove container                                                                 |
+| dcr       | `docker-compose run`             | Run a command in container                                                       |
+| dcstop    | `docker-compose stop`            | Stop a container                                                                 |
+| dcup      | `docker-compose up`              | Build, (re)create, start, and attach to containers for a service                 |
+| dcupb     | `docker-compose up --build`      | Same as `dcup`, but build images before starting containers                      |
+| dcupd     | `docker-compose up -d`           | Same as `dcup`, but starts as daemon                                             |
+| dcupdb    | `docker-compose up -d --build`   | Same as `dcup`, but build images before starting containers and starts as daemon |
+| dcdn      | `docker-compose down`            | Stop and remove containers                                                       |
+| dcl       | `docker-compose logs`            | Show logs of container                                                           |
+| dclf      | `docker-compose logs -f`         | Show logs and follow output                                                      |
+| dclF      | `docker-compose logs -f --tail0` | Just follow recent logs                                                          |
+| dcpull    | `docker-compose pull`            | Pull image of a service                                                          |
+| dcstart   | `docker-compose start`           | Start a container                                                                |
+| dck       | `docker-compose kill`            | Kills containers                                                                 |
--- a/plugins/docker-compose/_docker-compose
+++ b/plugins/docker-compose/_docker-compose
@ -128,7 +128,7 @@ __docker-compose_subcommand() {
                '--resolve-image-digests[Pin image tags to digests.]' \
                '--services[Print the service names, one per line.]' \
                '--volumes[Print the volume names, one per line.]' \
-                '--hash[Print the service config hash, one per line. Set "service1,service2" for a list of specified services.]' \ && ret=0
+                '--hash[Print the service config hash, one per line. Set "service1,service2" for a list of specified services.]' && ret=0
            ;;
        (create)
            _arguments \
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@ -16,6 +16,7 @@ alias dcupdb="$dccmd up -d --build"
 alias dcdn="$dccmd down"
 alias dcl="$dccmd logs"
 alias dclf="$dccmd logs -f"
+alias dclF="$dccmd logs -f --tail 0"
 alias dcpull="$dccmd pull"
 alias dcstart="$dccmd start"
 alias dck="$dccmd kill"
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@ -30,6 +30,15 @@ file**, but be aware of the side effects:
 > zstyle ':completion:*:*:docker-*:*' option-stacking yes
 > ```

+### Use old-style completion
+
+If the current completion does not work well for you, you can enable legacy completion instead with the
+following setting. See https://github.com/ohmyzsh/ohmyzsh/issues/11789 for more information.
+
+```zsh
+zstyle ':omz:plugins:docker' legacy-completion yes
+```
+
 ## Aliases

 | Alias   | Command                       | Description                                                                              |
@ -58,7 +67,7 @@ file**, but be aware of the side effects:
 | drm     | `docker container rm`         | Remove the specified container(s)                                                        |
 | drm!    | `docker container rm -f`      | Force the removal of a running container (uses SIGKILL)                                  |
 | dst     | `docker container start`      | Start one or more stopped containers                                                     |
-| drs     | `docker container restart`    | Restart one or more containers
+| drs     | `docker container restart`    | Restart one or more containers                                                           |
 | dsta    | `docker stop $(docker ps -q)` | Stop all running containers                                                              |
 | dstp    | `docker container stop`       | Stop one or more running containers                                                      |
 | dtop    | `docker top`                  | Display the running processes of a container                                             |
--- a/plugins/docker/completions/_docker
+++ b/plugins/docker/completions/_docker
@ -602,6 +602,7 @@ __docker_container_subcommand() {
    opts_create_run=(
        "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
        "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
+        "($help)*--annotation=[Add an annotation to the container (passed through to the OCI runtime)]:annotations: "
        "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: "
        "($help)*--cap-add=[Add Linux capabilities]:capability: "
        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
@ -662,7 +663,7 @@ __docker_container_subcommand() {
        "($help)*--ulimit=[ulimit options]:ulimit: "
        "($help)--userns=[Container user namespace]:user namespace:(host)"
        "($help)--tmpfs[mount tmpfs]"
-        "($help)*-v[Bind mount a volume]:volume: "
+        "($help)*-v[Bind mount a volume]:volume:_directories -W / -P '/' -S '\:' -r '/ '"
        "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)"
        "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
        "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
@ -2527,6 +2528,8 @@ __docker_volume_subcommand() {
        (prune)
            _arguments $(__docker_arguments) \
                $opts_help \
+                "($help -a --all)"{-a,--all}"[Remove all unused local volumes, not just anonymous ones]" \
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
            ;;
        (rm)
@ -2765,8 +2768,8 @@ __docker_subcommand() {
                "($help)--live-restore[Enable live restore of docker when containers are still running]" \
                "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" \
                "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_complete_log_options" \
-                "($help)--max-concurrent-downloads[Set the max concurrent downloads for each pull]" \
-                "($help)--max-concurrent-uploads[Set the max concurrent uploads for each push]" \
+                "($help)--max-concurrent-downloads[Set the max concurrent downloads]" \
+                "($help)--max-concurrent-uploads[Set the max concurrent uploads]" \
                "($help)--max-download-attempts[Set the max download attempts for each pull]" \
                "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \
                "($help)--oom-score-adjust=[Set the oom_score_adj for the daemon]:oom-score:(-500)" \
@ -2774,7 +2777,7 @@ __docker_subcommand() {
                "($help)--raw-logs[Full timestamps without ANSI coloring]" \
                "($help)*--registry-mirror=[Preferred registry mirror]:registry mirror: " \
                "($help)--seccomp-profile=[Path to seccomp profile]:path:_files -g \"*.json\"" \
-                "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs btrfs devicemapper overlay overlay2 vfs zfs)" \
+                "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(btrfs devicemapper overlay2 vfs zfs)" \
                "($help)--selinux-enabled[Enable selinux support]" \
                "($help)--shutdown-timeout=[Set the shutdown timeout value in seconds]:time: " \
                "($help)*--storage-opt=[Storage driver options]:storage driver options: " \
--- a/plugins/docker/docker.plugin.zsh
+++ b/plugins/docker/docker.plugin.zsh
@ -31,3 +31,32 @@ alias dvls='docker volume ls'
 alias dvprune='docker volume prune'
 alias dxc='docker container exec'
 alias dxcit='docker container exec -it'
+
+if (( ! $+commands[docker] )); then
+  return
+fi
+
+# Standarized $0 handling
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `docker`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_docker" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _docker
+  _comps[docker]=_docker
+fi
+
+{
+  # `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 "${0:h}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
+      else
+        command docker completion zsh | tee "$ZSH_CACHE_DIR/completions/_docker" > /dev/null
+  fi
+} &|
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@ -1,25 +1,17 @@
 # This scripts is copied from (MIT License):
-# https://github.com/dotnet/toolset/blob/master/scripts/register-completions.zsh
+# https://raw.githubusercontent.com/dotnet/sdk/main/scripts/register-completions.zsh

-_dotnet_zsh_complete() 
-{
-  local completions=("$(dotnet complete "$words")")
-
-  # If the completion list is empty, just continue with filename selection
-  if [ -z "$completions" ]
-  then
-    _arguments '*::arguments: _normal'
-    return
-  fi
-
-  # This is not a variable assignment, don't remove spaces!
-  _values = "${(ps:\n:)completions}"
+#compdef dotnet
+_dotnet_completion() {
+  local -a completions=("${(@f)$(dotnet complete "${words}")}")
+  compadd -a completions
+  _files
 }

-compdef _dotnet_zsh_complete dotnet
+compdef _dotnet_completion dotnet

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

 alias dn='dotnet new'
 alias dr='dotnet run'
--- a/plugins/emacs/README.md
+++ b/plugins/emacs/README.md
@ -27,4 +27,4 @@ The plugin uses a custom launcher (which we'll call here `$EMACS_LAUNCHER`) that
 | eeval  | `$EMACS_LAUNCHER --eval`                           | Same as `M-x eval` but from outside Emacs                      |
 | eframe | `emacsclient --alternate-editor="" --create-frame` | Create new X frame                                             |
 | efile  | -                                                  | Print the path to the file open in the current buffer          |
-| ecd    | -                                                  | Print the directory of the file open in the the current buffer |
+| ecd    | -                                                  | Print the directory of the file open in the current buffer |
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@ -60,7 +60,7 @@ function efile {
 }

 # Write to standard output the directory of the file
-# opened in the the current buffer
+# opened in the current buffer
 function ecd {
  local file
  file="$(efile)" || return $?
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@ -24,7 +24,7 @@ unset _omz_emoji_plugin_dir

 # This is a combining character that can be placed after any other character to surround
 # it in a "keycap" symbol.
-# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
+# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc.
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
 # which can be displayed on their own.

@ -63,9 +63,9 @@ function random_emoji() {
  [[ $list_size -eq 0 ]] && return 1
  local random_index=$(( ( RANDOM % $list_size ) + 1 ))
  local name=${names[$random_index]}
-  if [[ "$group" == "flags" ]]; then 
+  if [[ "$group" == "flags" ]]; then
    echo ${emoji_flags[$name]}
-  else 
+  else
    echo ${emoji[$name]}
  fi
 }
@ -86,22 +86,22 @@ function display_emoji() {
  # terminals treat these emoji chars as single-width.
  local counter=1
  for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
      printf '%s  ' "$emoji_flags[$i]"
-    else 
-      printf '%s  ' "$emoji[$i]" 
+    else
+      printf '%s  ' "$emoji[$i]"
    fi
    # New line every 20 emoji, to avoid weirdnesses
    if (($counter % 20 == 0)); then
-      printf "\n" 
+      printf "\n"
    fi
    let counter=$counter+1
  done
  print
  for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
      echo "${emoji_flags[$i]}  = $i"
-    else 
+    else
      echo "${emoji[$i]}  = $i"
    fi
  done
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@ -4,7 +4,7 @@
 #        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
 #       VERSION: 1.0.0
 #       DEPENDS: emoji plugin
-#       
+#
 # There are different sets of emoji characters available, to choose a different
 # set export emotty_set to the name of the set you would like to use, e.g.:
 # % export emotty_set=nature
--- a/plugins/encode64/README.md
+++ b/plugins/encode64/README.md
@ -40,7 +40,7 @@ plugins=(... encode64)

 ### Encoding a file

-Encode a file's contents to base64 and save output to text file.  
+Encode a file's contents to base64 and save output to text file.
 **NOTE:** Takes provided file and saves encoded content as new file with `.txt` extension

 - From parameter
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@ -25,6 +25,7 @@ plugins=(... extract)
 | `cpio`            | Cpio archive                         |
 | `deb`             | Debian package                       |
 | `ear`             | Enterprise Application aRchive       |
+| `exe`             | Windows executable file              |
 | `gz`              | Gzip file                            |
 | `ipa`             | iOS app package                      |
 | `ipsw`            | iOS firmware file                    |
@ -52,9 +53,11 @@ plugins=(... extract)
 | `txz`             | Tarball with lzma2 compression       |
 | `tzst`            | Tarball with zstd compression        |
 | `war`             | Web Application archive (Java-based) |
+| `whl`             | Python wheel file                    |
 | `xpi`             | Mozilla XPI module file              |
 | `xz`              | LZMA2 archive                        |
 | `zip`             | Zip archive                          |
+| `zlib`            | zlib archive                         |
 | `zst`             | Zstandard file (zstd)                |
 | `zpaq`            | Zpaq file                            |

--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@ -27,63 +27,111 @@ EOF
    fi

    local success=0
-    local extract_dir="${1:t:r}"
    local file="$1" full_path="${1:A}"
+    local extract_dir="${1:t:r}"
+
+    # Remove the .tar extension if the file name is .tar.*
+    if [[ $extract_dir =~ '\.tar$' ]]; then
+      extract_dir="${extract_dir:r}"
+    fi
+
+    # If there's a file or directory with the same name as the archive
+    # add a random string to the end of the extract directory
+    if [[ -e "$extract_dir" ]]; then
+      local rnd="${(L)"${$(( [##36]$RANDOM*$RANDOM ))}":1:5}"
+      extract_dir="${extract_dir}-${rnd}"
+    fi
+
+    # Create an extraction directory based on the file name
+    command mkdir -p "$extract_dir"
+    builtin cd -q "$extract_dir"
+    echo "extract: extracting to $extract_dir" >&2
+
    case "${file:l}" in
      (*.tar.gz|*.tgz)
-        (( $+commands[pigz] )) && { tar -I pigz -xvf "$file" } || tar zxvf "$file" ;;
+        (( $+commands[pigz] )) && { tar -I pigz -xvf "$full_path" } || tar zxvf "$full_path" ;;
      (*.tar.bz2|*.tbz|*.tbz2)
-        (( $+commands[pbzip2] )) && { tar -I pbzip2 -xvf "$file" } || tar xvjf "$file" ;;
+        (( $+commands[pbzip2] )) && { tar -I pbzip2 -xvf "$full_path" } || tar xvjf "$full_path" ;;
      (*.tar.xz|*.txz)
-        (( $+commands[pixz] )) && { tar -I pixz -xvf "$file" } || {
+        (( $+commands[pixz] )) && { tar -I pixz -xvf "$full_path" } || {
        tar --xz --help &> /dev/null \
-        && tar --xz -xvf "$file" \
-        || xzcat "$file" | tar xvf - } ;;
+        && tar --xz -xvf "$full_path" \
+        || xzcat "$full_path" | tar xvf - } ;;
      (*.tar.zma|*.tlz)
        tar --lzma --help &> /dev/null \
-        && tar --lzma -xvf "$file" \
-        || lzcat "$file" | tar xvf - ;;
+        && tar --lzma -xvf "$full_path" \
+        || lzcat "$full_path" | tar xvf - ;;
      (*.tar.zst|*.tzst)
        tar --zstd --help &> /dev/null \
-        && tar --zstd -xvf "$file" \
-        || zstdcat "$file" | tar xvf - ;;
-      (*.tar) tar xvf "$file" ;;
-      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
-      (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
-      (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
-      (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
-      (*.bz2) bunzip2 "$file" ;;
-      (*.xz) unxz "$file" ;;
-      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
-      (*.lz4) lz4 -d "$file" ;;
-      (*.lzma) unlzma "$file" ;;
-      (*.z) uncompress "$file" ;;
-      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
-      (*.rar) unrar x -ad "$file" ;;
+        && tar --zstd -xvf "$full_path" \
+        || zstdcat "$full_path" | tar xvf - ;;
+      (*.tar) tar xvf "$full_path" ;;
+      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$full_path" ;;
+      (*.tar.lz4) lz4 -c -d "$full_path" | tar xvf - ;;
+      (*.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) unxz "$full_path" ;;
+      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$full_path" ;;
+      (*.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) unzip "$full_path" ;;
+      (*.rar) unrar x -ad "$full_path" ;;
      (*.rpm)
-        command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
-        && rpm2cpio "$full_path" | cpio --quiet -id ;;
-      (*.7z) 7za x "$file" ;;
+        rpm2cpio "$full_path" | cpio --quiet -id ;;
+      (*.7z) 7za x "$full_path" ;;
      (*.deb)
-        command mkdir -p "$extract_dir/control" "$extract_dir/data"
-        builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
+        command mkdir -p "control" "data"
+        ar vx "$full_path" > /dev/null
        builtin cd -q control; extract ../control.tar.*
        builtin cd -q ../data; extract ../data.tar.*
        builtin cd -q ..; command rm *.tar.* debian-binary ;;
-      (*.zst) unzstd "$file" ;;
-      (*.cab) cabextract -d "$extract_dir" "$file" ;;
-      (*.cpio|*.obscpio) cpio -idmvF "$file" ;;
-      (*.zpaq) zpaq x "$file" ;;
+      (*.zst) unzstd "$full_path" ;;
+      (*.cab|*.exe) cabextract "$full_path" ;;
+      (*.cpio|*.obscpio) cpio -idmvF "$full_path" ;;
+      (*.zpaq) zpaq x "$full_path" ;;
+      (*.zlib) zlib-flate -uncompress < "$full_path" > "${file:r}" ;;
      (*)
        echo "extract: '$file' cannot be extracted" >&2
        success=1 ;;
    esac

    (( success = success > 0 ? success : $? ))
-    (( success == 0 && remove_archive == 0 )) && rm "$full_path"
+    (( success == 0 && remove_archive == 0 )) && command rm "$full_path"
    shift

-    # Go back to original working directory in case we ran cd previously
+    # Go back to original working directory
    builtin cd -q "$pwd"
+
+    # If content of extract dir is a single directory, move its contents up
+    # Glob flags:
+    # - D: include files starting with .
+    # - N: no error if directory is empty
+    # - Y2: at most give 2 files
+    local -a content
+    content=("${extract_dir}"/*(DNY2))
+    if [[ ${#content} -eq 1 && -e "${content[1]}" ]]; then
+      # The extracted file/folder (${content[1]}) may have the same name as $extract_dir
+      # If so, we need to rename it to avoid conflicts in a 3-step process
+      #
+      # 1. Move and rename the extracted file/folder to a temporary random name
+      # 2. Delete the empty folder
+      # 3. Rename the extracted file/folder to the original name
+      if [[ "${content[1]:t}" == "$extract_dir" ]]; then
+        # =(:) gives /tmp/zsh<random>, with :t it gives zsh<random>
+        local tmp_name==(:); tmp_name="${tmp_name:t}"
+        command mv "${content[1]}" "$tmp_name" \
+        && command rmdir "$extract_dir" \
+        && command mv "$tmp_name" "$extract_dir"
+      # Otherwise, if the extracted folder name already exists in the current
+      # directory (because of a previous file / folder), keep the extract_dir
+      elif [[ ! -e "${content[1]:t}" ]]; then
+        command mv "${content[1]}" . \
+        && command rmdir "$extract_dir"
+      fi
+    elif [[ ${#content} -eq 0 ]]; then
+      command rmdir "$extract_dir"
+    fi
  done
 }
--- a/plugins/eza/README.md
+++ b/plugins/eza/README.md
@ -0,0 +1,101 @@
+# eza plugin
+
+This provides aliases that invoke the [`eza`](https://github.com/eza-community/eza) utility rather than `ls`
+
+To use it add `eza` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... eza)
+```
+
+## Configuration
+
+All configurations are done using the `zstyle` command in the `:omz:plugins:eza` namespace.
+
+**NOTE:** The configuring needs to be done prior to OMZ loading the plugins. When the plugin is loaded,
+changing the `zstyle` won't have any effect.
+
+### `dirs-first`
+
+```zsh
+zstyle ':omz:plugins:eza' 'dirs-first' yes|no
+```
+
+If `yes`, directories will be grouped first.
+
+Default: `no`
+
+### `git-status`
+
+```zsh
+zstyle ':omz:plugins:eza' 'git-status' yes|no
+```
+
+If `yes`, always add `--git` flag to indicate git status (if tracked / in a git repo).
+
+Default: `no`
+
+### `header`
+
+```zsh
+zstyle ':omz:plugins:eza' 'header' yes|no
+```
+
+If `yes`, always add `-h` flag to add a header row for each column.
+
+Default: `no`
+
+### `show-group`
+
+```zsh
+zstyle ':omz:plugins:eza' 'show-group' yes|no
+```
+
+If `yes` (default), always add `-g` flag to show the group ownership.
+
+Default: `yes`
+
+### `size-prefix`
+
+```zsh
+zstyle ':omz:plugins:eza' 'size-prefix' (binary|none|si)
+```
+
+Choose the prefix to be used in displaying file size:
+
+- `binary` -- use [binary prefixes](https://en.wikipedia.org/wiki/Binary_prefix) such as "Ki", "Mi", "Gi" and
+  so on
+- `none` -- don't use any prefix, show size in bytes
+- `si` (default) -- use [Metric/S.I. prefixes](https://en.wikipedia.org/wiki/Metric_prefix)
+
+Default: `si`
+
+### `time-style`
+
+```zsh
+zstyle ':omz:plugins:eza' 'time-style' $TIME_STYLE
+```
+
+Sets the `--time-style` option of `eza`. (See `man eza` for the options)
+
+Default: Not set, which means the default behavior of `eza` will take place.
+
+## Aliases
+
+**Notes:**
+
+- Aliases may be modified by Configuration
+- The term "files" without "only" qualifier means both files & directories
+
+| Alias  | Command           | Description                                                                |
+| ------ | ----------------- | -------------------------------------------------------------------------- |
+| `la`   | `eza -la`         | List all files (except . and ..) as a long list                            |
+| `ldot` | `eza -ld .*`      | List dotfiles only (directories shown as entries instead of recursed into) |
+| `lD`   | `eza -lD`         | List only directories (excluding dotdirs) as a long list                   |
+| `lDD`  | `eza -laD`        | List only directories (including dotdirs) as a long list                   |
+| `ll`   | `eza -l`          | List files as a long list                                                  |
+| `ls`   | `eza`             | Plain eza call                                                             |
+| `lsd`  | `eza -d`          | List specified files with directories as entries, in a grid                |
+| `lsdl` | `eza -dl`         | List specified files with directories as entries, in a long list           |
+| `lS`   | `eza -l -ssize`   | List files as a long list, sorted by size                                  |
+| `lT`   | `eza -l -snewest` | List files as a long list, sorted by date (newest last)                    |
--- a/plugins/eza/eza.plugin.zsh
+++ b/plugins/eza/eza.plugin.zsh
@ -0,0 +1,62 @@
+if ! (( $+commands[eza] )); then
+  print "zsh eza plugin: eza not found. Please install eza before using this plugin." >&2
+  return 1
+fi
+
+typeset -a _EZA_HEAD
+typeset -a _EZA_TAIL
+
+function _configure_eza() {
+  local _val
+  # Get the head flags
+  if zstyle -T ':omz:plugins:eza' 'show-group'; then
+    _EZA_HEAD+=("g")
+  fi
+  if zstyle -t ':omz:plugins:eza' 'header'; then
+    _EZA_HEAD+=("h")
+  fi
+  zstyle -s ':omz:plugins:eza' 'size-prefix' _val
+  case "${_val:l}" in
+    binary)
+      _EZA_HEAD+=("b")
+      ;;
+    none)
+      _EZA_HEAD+=("B")
+      ;;
+  esac
+  # Get the tail long-options
+  if zstyle -t ':omz:plugins:eza' 'dirs-first'; then
+    _EZA_TAIL+=("--group-directories-first")
+  fi
+  if zstyle -t ':omz:plugins:eza' 'git-status'; then
+    _EZA_TAIL+=("--git")
+  fi
+  zstyle -s ':omz:plugins:eza' 'time-style' _val
+  if [[ $_val ]]; then
+    _EZA_TAIL+=("--time-style='$_val'")
+  fi
+}
+
+_configure_eza
+
+function _alias_eza() {
+  local _head="${(j::)_EZA_HEAD}$2"
+  local _tail="${(j: :)_EZA_TAIL}"
+  alias "$1"="eza${_head:+ -}${_head}${_tail:+ }${_tail}${3:+ }$3"
+}
+
+_alias_eza la   la
+_alias_eza ldot ld ".*"
+_alias_eza lD   lD
+_alias_eza lDD  lDa
+_alias_eza ll   l
+_alias_eza ls
+_alias_eza lsd  d
+_alias_eza lsdl dl
+_alias_eza lS   "l -ssize"
+_alias_eza lT   "l -snewest"
+
+unfunction _alias_eza
+unfunction _configure_eza
+unset _EZA_HEAD
+unset _EZA_TAIL
--- a/plugins/fancy-ctrl-z/README.md
+++ b/plugins/fancy-ctrl-z/README.md
@ -1,14 +1,14 @@
 # Use Ctrl-Z to switch back to Vim

-I frequently need to execute random commands in my shell. To achieve it I pause 
+I frequently need to execute random commands in my shell. To achieve it I pause
 Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
-The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back 
-to Vim. I could not find a solution, so I developed one on my own that 
+The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
+to Vim. I could not find a solution, so I developed one on my own that
 works wonderfully with ZSH.

 Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/

-Credits: 
+Credits:
 - original idea by @sheerun
 - added to OMZ by @mbologna

--- a/Show more
+++ b/Show more