Merge branch 'ohmyzsh:master' into features/rke-plugin

.editorconfig

@@ -4,7 +4,5 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-
-[*.sh]
-indent_size = 4
-indent_style = tab
+indent_size = 2
+indent_style = space

.github/CODEOWNERS

@@ -1,3 +1,12 @@
 # Plugin owners
-plugins/gitfast/ @felipec
-plugins/sdk/ @rgoldberg
+plugins/archlinux/                  @ratijas
+plugins/aws/                        @maksyms
+plugins/genpass/                    @atoponce
+plugins/git-lfs/                    @hellovietduc
+plugins/gitfast/                    @felipec
+plugins/react-native                @esthor
+plugins/sdk/                        @rgoldberg
+plugins/shell-proxy/                @septs
+plugins/universalarchive/           @Konfekt
+plugins/wp-cli/                     @joshmedeski
+plugins/zoxide/                     @ajeetdsouza

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: [robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter, carlosala]
 open_collective: ohmyzsh

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Oh My Zsh
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Describe the bug**
-A clear description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior, for example:
-1. Enable this plugin '...'
-2. Run command '...' or try the autocomplete command '...'
-3. See error
-
-**Expected behavior**
-A brief description of what should happen.
-
-**Screenshots and/or Recordings**
-If applicable, add screenshots to help explain your problem.
-You can also record an asciinema session: https://asciinema.org/
-
-**Self Check**
-
-- Have you tried reaching out on the [Discord server](https://discord.gg/ohmyzsh)? 
-  This can help cut down on filling up issues. We always have a few people
-  online that are in a variety of timezones that are willing to help you!
-
-- Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=) might help you get quicker support
-
-**Desktop (please complete the following information):**
-
- - OS / Distro: [e.g. Arch Linux, macOS]
- - If on Windows what version of WSL: [e.g. WSL1, WSL2]
- - Latest ohmyzsh update?: [e.g. Yes/No]
- - ZSH Version: [e.g. 5.6]
- - Terminal emulator: [e.g. iTerm2]
-
-**Additional context**
-Add any other context about the problem here. This can be themes, plugins, custom configs.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,68 @@
+name: Report a bug
+description: Report a bug that isn't caused by Oh My Zsh. If unsure, use this form
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: "5.6"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...

.github/ISSUE_TEMPLATE/bug_report_omz.yml

@@ -0,0 +1,77 @@
+name: Report a bug in Oh My Zsh
+description: Create a report to help us improve Oh My Zsh
+labels: ['Bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - **Make sure this bug only happens with Oh My Zsh enabled**.
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: "5.6"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Oh My Zsh version
+      description: Run `omz version` to check.
+      placeholder: master (bf303965)
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: true
 contact_links:
+  - name: Support
+    url: https://github.com/ohmyzsh/ohmyzsh/discussions
+    about: Ask the community for support
   - name: Get help on Discord
     url: https://discord.gg/ohmyzsh
     about: Have a quick question? Join the Discord server and ask on the appropriate channel.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,29 +0,0 @@
----
-name: Feature request
-about: Suggest a feature for Oh My Zsh
-labels: 'feature'
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Is your feature request related to a particular plugin or theme? If so, specify it.**
-The name of the plugin, theme or alias that you would like us to improve. [...]
-
-**Is your feature request related to a problem? Please describe.**
-A description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A description of what you want to happen. [...]
-
-**Describe alternatives you've considered**
-A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
-
-**Additional context**
-Add any other context, screenshots or discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
-
-**Related Issues**
-Is there any open or closed issues that is related to this feature request? If so please link them below! [...]

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,37 @@
+name: Feature request
+description: Suggest a feature for Oh My Zsh
+labels: ["Feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Look for similar features in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
+  - type: input
+    attributes:
+      label: If the feature request is for a plugin or theme, specify it here.
+      description: The name of the plugin or theme that you would like us to improve.
+      placeholder: e.g. Git plugin, Agnoster theme
+  - type: textarea
+    attributes:
+      label: If the feature solves a problem you have, specify it here.
+      description: A description of what the problem is. 
+      placeholder: Ex. I'm always frustrated when...
+  - type: textarea
+    attributes:
+      label: Describe the proposed feature.
+      description: A description of what you want to happen. Be as specific as possible.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context, screenshots or Discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+  - type: textarea
+    attributes:
+      label: Related Issues
+      description: Is there any open or closed issues that is related to this feature request? If so please link them below!

.github/ISSUE_TEMPLATE/support.md

@@ -1,10 +0,0 @@
----
-name: Support
-about: Request support for any problem you're having with Oh My Zsh
-labels: 'support'
-
----
-
-1. Look for similar issues already posted (including closed ones)
-2. Include as much relevant information as possible
-3. Try to make sure the issue is due to Oh My Zsh

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,7 @@
 ## Standards checklist:
 
+<!-- Fill with an x the ones that apply. Example: [x] -->
+
 - [ ] The PR title is descriptive.
 - [ ] The PR doesn't replicate another PR which is already open.
 - [ ] I have read the contribution guide and followed all the instructions.
@@ -7,6 +9,7 @@
 - [ ] The code is mine or it's from somewhere with an MIT-compatible license.
 - [ ] The code is efficient, to the best of my ability, and does not waste computer resources.
 - [ ] The code is stable and I have tested it myself, to the best of my abilities.
+- [ ] If the code introduces new aliases, I provide a valid use case for all plugin users down below.
 
 ## Changes:
 

.github/workflows/main.yml

@@ -10,10 +10,18 @@ on:
     branches: 
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   tests:
     name: Run tests
     runs-on: ${{ matrix.os }}
+    if: github.repository == 'ohmyzsh/ohmyzsh'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]

.github/workflows/project.yml

@@ -0,0 +1,136 @@
+name: Project tracking
+on:
+  issues:
+    types: [opened, reopened]
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: {}
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    env:
+      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+    steps:
+      - name: Read project data
+        env:
+          ORGANIZATION: ohmyzsh
+          PROJECT_NUMBER: "1"
+        run: |
+          # Get Project data
+          gh api graphql -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                    }
+                  }
+                }
+              }
+            }
+          ' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          # Parse project data
+          cat >> $GITHUB_ENV <<EOF
+          PROJECT_ID=$(jq '.data.organization.projectNext.id' project_data.json)
+          PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
+          THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
+          EOF
+
+      - name: Add to project
+        env:
+          ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
+        run: |
+          item_id="$(gh api graphql -f query='
+            mutation($project: ID!, $content: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $content}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f content=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+
+          echo "ITEM_ID=$item_id" >> $GITHUB_ENV
+
+      - name: Classify Pull Request
+        if: github.event_name == 'pull_request_target'
+        run: |
+          touch plugins.list themes.list
+
+          gh pr view ${{ github.event.pull_request.number }} \
+            --repo ${{ github.repository }} \
+            --json files --jq '.files.[].path' | awk -F/ '
+            /^plugins\// {
+              plugins[$2] = 1
+            }
+            /^themes\// {
+              gsub(/\.zsh-theme$/, "", $2)
+              themes[$2] = 1
+            }
+            END {
+              for (plugin in plugins) {
+                print plugin >> "plugins.list"
+              }
+              for (theme in themes) {
+                print theme >> "themes.list"
+              }
+            }
+          '
+          # If only one plugin is modified, add it to the plugin field
+          if [[ $(wc -l < plugins.list) = 1 ]]; then
+            echo "PLUGIN=$(cat plugins.list)" >> $GITHUB_ENV
+          fi
+          # If only one theme is modified, add it to the theme field
+          if [[ $(wc -l < themes.list) = 1 ]]; then
+            echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
+          fi
+
+      - name: Fill Pull Request fields in project
+        if: github.event_name == 'pull_request_target'
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $plugin_field: ID!
+              $plugin_value: String!
+              $theme_field: ID!
+              $theme_value: String!
+            ) {
+              set_plugin: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $plugin_field
+                value: $plugin_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+              set_theme: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $theme_field
+                value: $theme_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f item=$ITEM_ID \
+            -f plugin_field=$PLUGIN_FIELD_ID -f plugin_value=$PLUGIN \
+            -f theme_field=$THEME_FIELD_ID -f theme_value=$THEME \
+            --silent
+

.gitignore

@@ -6,3 +6,6 @@ cache/
 log/
 *.swp
 .DS_Store
+
+# editor configs
+.vscode

.gitpod.Dockerfile

@@ -0,0 +1,5 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update && \
+    sudo apt-get install -y zsh && \
+    sudo rm -rf /var/lib/apt/lists/*

.gitpod.yml

@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: |
+      export EDITOR="command gp open -w" VISUAL="command gp open -w"
+      cp -f /workspace/ohmyzsh/templates/zshrc.zsh-template ~/.zshrc
+      ln -sf /workspace/ohmyzsh ~/.oh-my-zsh
+    command: exec zsh

CONTRIBUTING.md

@@ -11,16 +11,22 @@ issues and pull requests. Please read them closely.
 Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
 you would make is not already covered.
 
-* [Issues](#reporting-issues)
-  * [You have a problem](#you-have-a-problem)
-  * [You have a suggestion](#you-have-a-suggestion)
-* [Pull Requests](#submitting-pull-requests)
-  * [Getting started](#getting-started)
-  * [You have a solution](#you-have-a-solution)
-  * [You have an addition](#you-have-an-addition)
-* [Information sources (_aka_ search)](#use-the-search-luke)
+<!-- TOC updateonsave:true depthfrom:2 -->
 
-**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer)
+- [Reporting Issues](#reporting-issues)
+  - [You have a problem](#you-have-a-problem)
+  - [You have a suggestion](#you-have-a-suggestion)
+- [Submitting Pull Requests](#submitting-pull-requests)
+  - [Getting started](#getting-started)
+  - [You have a solution](#you-have-a-solution)
+  - [You have an addition](#you-have-an-addition)
+- [Use the Search, Luke](#use-the-search-luke)
+- [Commit Guidelines](#commit-guidelines)
+  - [Format](#format)
+  - [Style](#style)
+- [Volunteer](#volunteer)
+
+<!-- /TOC -->
 
 ## Reporting Issues
 
@@ -41,7 +47,7 @@ It should include the data gathered as indicated above, along with:
 2. What the correct behavior should be
 3. What the actual behavior is
 
-Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle
+Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle
 (starting with `@`) in your message.
 
 We will do our very best to help you.
@@ -53,7 +59,7 @@ your suggestion.
 
 If you find one, comment on it so we can know there are more people supporting it.
 
-If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin
+If not, you can go ahead and create an issue. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
 
 ## Submitting Pull Requests
@@ -93,10 +99,31 @@ covering or related to what you want to add.
 
 If you find one, try it out and work with the author on a common solution.
 
-If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin
+If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
 
-For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR.
+For any extensive change, such as a new plugin, you will have to find testers to +1 your PR.
+
+### New plugin aliases
+
+We acknowledge that aliases are a core part of Oh My Zsh. There are plugins that have +100 aliases!
+
+This has become an issue for two opposing reasons:
+
+- Some users want to have their personal aliases in Oh My Zsh.
+- Some users don't want any aliases at all and feel that there are too many.
+
+Because of this, from now on we're requiring that new aliases follow these conditions:
+
+1. They will be used by many people, not just a few.
+2. The aliases will be used many times and for common tasks.
+3. Prefer one generic alias over many specific ones.
+4. When justifying the need for an alias, talk about workflows where you'll use it,
+   preferably in combination with other aliases.
+5. If there exists a command with the same name, look for a different alias name.
+
+This list is not exhaustive! Please remember that your alias will be in the machines of many people,
+so it should be justified why they should have it.
 
 ----
 
@@ -117,7 +144,100 @@ and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-reque
 
 ----
 
-### You have spare time to volunteer
+## Commit Guidelines
+
+Oh My Zsh uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+specification. The automatic changelog tool uses these to automatically generate
+a changelog based on the commit messages. Here's a guide to writing a commit message
+to allow this:
+
+### Format
+
+```
+type(scope)!: subject
+```
+
+- `type`: the type of the commit is one of the following:
+
+  - `feat`: new features.
+  - `fix`: bug fixes.
+  - `docs`: documentation changes.
+  - `refactor`: refactor of a particular code section without introducing
+    new features or bug fixes.
+  - `style`: code style improvements.
+  - `perf`: performance improvements.
+  - `test`: changes to the test suite.
+  - `ci`: changes to the CI system.
+  - `build`: changes to the build system (we don't yet have one so this shouldn't apply).
+  - `chore`: for other changes that don't match previous types. This doesn't appear
+    in the changelog.
+
+- `scope`: section of the codebase that the commit makes changes to. If it makes changes to
+  many sections, or if no section in particular is modified, leave blank without the parentheses.
+  Examples:
+
+  - Commit that changes the `git` plugin:
+  ```
+  feat(git): add alias for `git commit`
+  ```
+
+  - Commit that changes many plugins:
+  ```
+  style: fix inline declaration of arrays
+  ```
+
+  For changes to plugins or themes, the scope should be the plugin or theme name:
+
+  - ✅ `fix(agnoster): commit subject`
+  - ❌ `fix(theme/agnoster): commit subject`
+
+- `!`: this goes after the `scope` (or the `type` if scope is empty), to indicate that the commit
+  introduces breaking changes.
+
+  Optionally, you can specify a message that the changelog tool will display to the user to indicate
+  what's changed and what they can do to deal with it. You can use multiple lines to type this message;
+  the changelog parser will keep reading until the end of the commit message or until it finds an empty
+  line.
+
+  Example (made up):
+
+  ```
+  style(agnoster)!: change dirty git repo glyph
+
+  BREAKING CHANGE: the glyph to indicate when a git repository is dirty has
+  changed from a Powerline character to a standard UTF-8 emoji. You can
+  change it back by setting `ZSH_THEME_DIRTY_GLYPH`.
+
+  Fixes #420
+
+  Co-authored-by: Username <email>
+  ```
+
+- `subject`: a brief description of the changes. This will be displayed in the changelog. If you need
+  to specify other details you can use the commit body but it won't be visible.
+
+  Formatting tricks: the commit subject may contain:
+
+  - Links to related issues or PRs by writing `#issue`. This will be highlighted by the changelog tool:
+    ```
+    feat(archlinux): add support for aura AUR helper (#9467)
+    ```
+
+  - Formatted inline code by using backticks: the text between backticks will also be highlighted by
+    the changelog tool:
+    ```
+    feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)
+    ```
+
+### Style
+
+Try to keep the first commit line short. This is harder to do using this commit style but try to be
+concise and if you need more space, you can use the commit body. Try to make sure that the commit
+subject is clear and precise enough that users will know what changed by just looking at the changelog.
+
+----
+
+## Volunteer
 
 Very nice!! :)
 

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2020 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
+Copyright (c) 2009-2022 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></p>
+<p align="center"><img src="https://ohmyzsh.s3.amazonaws.com/omz-ansi-github.png" alt="Oh My Zsh"></p>
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 
@@ -15,6 +15,43 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![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)
 [![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)
+  - [Prerequisites](#prerequisites)
+  - [Basic Installation](#basic-installation)
+    - [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)
+  - [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)
+    - [Manual Installation](#manual-installation)
+  - [Installation Problems](#installation-problems)
+  - [Custom Plugins and Themes](#custom-plugins-and-themes)
+- [Getting Updates](#getting-updates)
+  - [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)
+- [Contributors](#contributors)
+- [Follow Us](#follow-us)
+- [Merchandise](#merchandise)
+- [License](#license)
+- [About Planet Argon](#about-planet-argon)
+
+</details>
 
 ## Getting Started
 
@@ -30,18 +67,20 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
 
 | Method    | Command                                                                                           |
-|:----------|:--------------------------------------------------------------------------------------------------|
+| :-------- | :------------------------------------------------------------------------------------------------ |
 | **curl**  | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 | **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)"` |
 
+_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
 
 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,
 then running it:
 
-```shell
+```sh
 wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```
@@ -56,18 +95,18 @@ Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can
 
 Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
 
-```shell
+```sh
 vi ~/.zshrc
 ```
 
 For example, this might begin to look like this:
 
-```shell
+```sh
 plugins=(
   git
   bundler
   dotenv
-  osx
+  macos
   rake
   rbenv
   ruby
@@ -78,7 +117,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...).
 
 #### Using Plugins
 
-Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
+Each built-in plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
@@ -90,18 +129,18 @@ _Robby's theme is the default one. It's not the fanciest one. It's not the simpl
 
 Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
-```shell
+```sh
 ZSH_THEME="robbyrussell"
 ```
 
 To use a different theme, simply change the value to match the name of your desired theme. For example:
 
-```shell
+```sh
 ZSH_THEME="agnoster" # (this is one of the fancy ones)
 # see https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#agnoster
 ```
 
-_Note: many themes require installing the [Powerline Fonts](https://github.com/powerline/fonts) in order to render properly._
+_Note: many themes require installing a [Powerline Font](https://github.com/powerline/fonts) or a [Nerd Font](https://github.com/ryanoasis/nerd-fonts) in order to render properly. Without them, these themes will render [weird prompt symbols](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#i-have-a-weird-character-in-my-prompt)_
 
 Open up a new terminal window and your prompt should look something like this:
 
@@ -111,13 +150,13 @@ In case you did not find a suitable theme for your needs, please have a look at
 
 If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
 
-```shell
+```sh
 ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 ```
 
 And if you want to pick random theme from a list of your favorite themes:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_CANDIDATES=(
   "robbyrussell"
   "agnoster"
@@ -126,7 +165,7 @@ ZSH_THEME_RANDOM_CANDIDATES=(
 
 If you only know which themes you don't like, you can add them similarly to an ignored list:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod)
 ```
 
@@ -151,17 +190,17 @@ If you'd like to change the install directory with the `ZSH` environment variabl
 `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
 like this:
 
-```shell
+```sh
 ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 ```
 
 #### Unattended install
 
-If you're running the Oh My Zsh install script as part of an automated install, you can pass the
-flag `--unattended` to the `install.sh` script. This will have the effect of not trying to change
-the default shell, and also won't run `zsh` when the installation has finished.
+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
+the default shell, and it also won't run `zsh` when the installation has finished.
 
-```shell
+```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```
 
@@ -184,41 +223,41 @@ The install script also accepts these variables to allow installation of a diffe
 
 For example:
 
-```shell
+```sh
 REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 ```
 
 #### Manual Installation
 
-##### 1. Clone the repository
+##### 1. Clone the repository <!-- omit in toc -->
 
-```shell
+```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
-##### 2. *Optionally*, backup your existing `~/.zshrc` file
+##### 2. _Optionally_, backup your existing `~/.zshrc` file <!-- omit in toc -->
 
-```shell
+```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
-##### 3. Create a new zsh configuration file
+##### 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.
 
-```shell
+```sh
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
-##### 4. Change your default shell
+##### 4. Change your default shell <!-- omit in toc -->
 
-```shell
+```sh
 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
+##### 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.
 
@@ -226,10 +265,8 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 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`.
+- 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
 
@@ -241,23 +278,40 @@ If you would like to override the functionality of a plugin distributed with Oh
 
 ## Getting Updates
 
-By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
+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**:
 
-```shell
-DISABLE_UPDATE_PROMPT=true
-```
+1. Automatic update without confirmation prompt:
 
-To disable automatic upgrades, set the following in your `~/.zshrc`:
+   ```sh
+   zstyle ':omz:update' mode auto
+   ```
 
-```shell
-DISABLE_AUTO_UPDATE=true
+2. Just offer a reminder every few days, if there are updates available:
+
+   ```sh
+   zstyle ':omz:update' mode reminder
+   ```
+
+3. To disable automatic updates entirely:
+
+   ```sh
+   zstyle ':omz:update' mode disabled
+   ```
+
+NOTE: you can control how often Oh My Zsh checks for updates with the following setting:
+
+```sh
+# This will check for updates every 7 days
+zstyle ':omz:update' frequency 7
+# This will check for updates every time you open the terminal (not recommended)
+zstyle ':omz:update' frequency 0
 ```
 
 ### Manual Updates
 
-If you'd like to upgrade 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:
+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:
 
-```shell
+```sh
 omz update
 ```
 
@@ -275,7 +329,7 @@ Before you participate in our delightful community, please read the [code of con
 
 I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
-We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
+We also need people to test out pull requests. So take a look through [the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
 
 See [Contributing](CONTRIBUTING.md) for more details.
 
@@ -294,7 +348,7 @@ Thank you so much!
 We're on social media:
 
 - [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
-- [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
+- [Facebook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
 - [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
 - [Discord](https://discord.gg/ohmyzsh) to chat with us!
 

SECURITY.md

@@ -0,0 +1,24 @@
+# Security Policy
+
+## Supported Versions
+
+At the moment Oh My Zsh only considers the very latest commit to be supported.
+We combine that with our fast response to incidents and the automated updates
+to minimize the time between vulnerability publication and patch release.
+
+| Version        | Supported          |
+|:-------------- |:------------------ |
+| master         | :white_check_mark: |
+| other commits  | :x:                |
+
+In the near future we will introduce versioning, so expect this section to change.
+
+## Reporting a Vulnerability
+
+**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).
+
+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.

lib/cli.zsh

@@ -1,211 +1,820 @@
 #!/usr/bin/env zsh
 
 function omz {
-    [[ $# -gt 0 ]] || {
-        _omz::help
-        return 1
-    }
+  [[ $# -gt 0 ]] || {
+    _omz::help
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    # Subcommand functions start with _ so that they don't
-    # appear as completion entries when looking for `omz`
-    (( $+functions[_omz::$command] )) || {
-        _omz::help
-        return 1
-    }
+  # Subcommand functions start with _ so that they don't
+  # appear as completion entries when looking for `omz`
+  (( $+functions[_omz::$command] )) || {
+    _omz::help
+    return 1
+  }
 
-    _omz::$command "$@"
+  _omz::$command "$@"
 }
 
 function _omz {
-    local -a cmds subcmds
-    cmds=(
-        'help:Usage information'
-        'update:Update Oh My Zsh'
-        'pr:Commands for Oh My Zsh Pull Requests'
-    )
+  local -a cmds subcmds
+  cmds=(
+    'changelog:Print the changelog'
+    'help:Usage information'
+    'plugin:Manage plugins'
+    'pr:Manage Oh My Zsh Pull Requests'
+    'reload:Reload the current zsh session'
+    'theme:Manage themes'
+    'update:Update Oh My Zsh'
+    'version:Show the version'
+  )
 
-    if (( CURRENT == 2 )); then
-        _describe 'command' cmds
-    elif (( CURRENT == 3 )); then
-        case "$words[2]" in
-            pr) subcmds=( 'test:Test a Pull Request' 'clean:Delete all Pull Request branches' )
-                _describe 'command' subcmds ;;
-        esac
-    fi
+  if (( CURRENT == 2 )); then
+    _describe 'command' cmds
+  elif (( CURRENT == 3 )); then
+    case "$words[2]" in
+      changelog) local -a refs
+        refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        _describe 'command' refs ;;
+      plugin) subcmds=(
+        'disable:Disable plugin(s)'
+        'enable:Enable plugin(s)'
+        'info:Get plugin information'
+        'list:List plugins'
+        'load:Load plugin(s)'
+      )
+        _describe 'command' subcmds ;;
+      pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
+        _describe 'command' subcmds ;;
+      theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
+        _describe 'command' subcmds ;;
+    esac
+  elif (( CURRENT == 4 )); then
+    case "${words[2]}::${words[3]}" in
+      plugin::(disable|enable|load))
+        local -aU valid_plugins
 
-    return 0
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
+
+        _describe 'plugin' valid_plugins ;;
+      plugin::info)
+        local -aU plugins
+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+        _describe 'plugin' plugins ;;
+      theme::(set|use))
+        local -aU themes
+        themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        _describe 'theme' themes ;;
+    esac
+  elif (( CURRENT > 4 )); then
+    case "${words[2]}::${words[3]}" in
+      plugin::(enable|disable|load))
+        local -aU valid_plugins
+
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
+
+        # Remove plugins already passed as arguments
+        # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
+        # has a space after them. This is to avoid removing plugins partially passed, which makes
+        # the completion not add a space after the completed plugin.
+        local -a args
+        args=(${words[4,$(( CURRENT - 1))]})
+        valid_plugins=(${valid_plugins:|args})
+
+        _describe 'plugin' valid_plugins ;;
+    esac
+  fi
+
+  return 0
 }
 
-compdef _omz omz
+# If run from a script, do not set the completion function
+if (( ${+functions[compdef]} )); then
+  compdef _omz omz
+fi
 
+## Utility functions
+
+function _omz::confirm {
+  # If question supplied, ask it before reading the answer
+  # NOTE: uses the logname of the caller function
+  if [[ -n "$1" ]]; then
+    _omz::log prompt "$1" "${${functrace[1]#_}%:*}"
+  fi
+
+  # Read one character
+  read -r -k 1
+
+  # If no newline entered, add a newline
+  if [[ "$REPLY" != $'\n' ]]; then
+    echo
+  fi
+}
+
+function _omz::log {
+  # if promptsubst is set, a message with `` or $()
+  # will be run even if quoted due to `print -P`
+  setopt localoptions nopromptsubst
+
+  # $1 = info|warn|error|debug
+  # $2 = text
+  # $3 = (optional) name of the logger
+
+  local logtype=$1
+  local logname=${3:-${${functrace[1]#_}%:*}}
+
+  # Don't print anything if debug is not active
+  if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
+    return
+  fi
+
+  # Choose coloring based on log type
+  case "$logtype" in
+    prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
+    debug) print -P "%F{white}$logname%f: $2" ;;
+    info) print -P "%F{green}$logname%f: $2" ;;
+    warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
+    error) print -P "%S%F{red}$logname%f%s: $2" ;;
+  esac >&2
+}
+
+## User-facing commands
 
 function _omz::help {
-    cat <<EOF
+  cat >&2 <<EOF
 Usage: omz <command> [options]
 
 Available commands:
 
-    help                Print this help message
-    update              Update Oh My Zsh
-    pr <command>        Commands for Oh My Zsh Pull Requests
+  help                Print this help message
+  changelog           Print the changelog
+  plugin <command>    Manage plugins
+  pr     <command>    Manage Oh My Zsh Pull Requests
+  reload              Reload the current zsh session
+  theme  <command>    Manage themes
+  update              Update Oh My Zsh
+  version             Show the version
 
 EOF
 }
 
-function _omz::log {
-    # if promptsubst is set, a message with `` or $()
-    # will be run even if quoted due to `print -P`
-    setopt localoptions nopromptsubst
+function _omz::changelog {
+  local version=${1:-HEAD} format=${3:-"--text"}
 
-    # $1 = info|warn|error|debug
-    # $@ = text
+  if (
+    builtin cd -q "$ZSH"
+    ! command git show-ref --verify refs/heads/$version && \
+    ! command git show-ref --verify refs/tags/$version && \
+    ! command git rev-parse --verify "${version}^{commit}"
+  ) &>/dev/null; then
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} [version]
 
-    local logtype=$1
-    local logname=${${functrace[1]#_}%:*}
-    shift
+NOTE: <version> must be a valid branch, tag or commit.
+EOF
+    return 1
+  fi
 
-    # Don't print anything if debug is not active
-    if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
-        return
-    fi
-
-    # Choose coloring based on log type
-    case "$logtype" in
-        prompt) print -Pn "%S%F{blue}$logname%f%s: $@" ;;
-        debug) print -P "%F{white}$logname%f: $@" ;;
-        info) print -P "%F{green}$logname%f: $@" ;;
-        warn) print -P "%S%F{yellow}$logname%f%s: $@" ;;
-        error) print -P "%S%F{red}$logname%f%s: $@" ;;
-    esac >&2
+  "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
 }
 
-function _omz::pr {
-    (( $# > 0 && $+functions[_omz::pr::$1] )) || {
-        cat <<EOF
-Usage: omz pr <command> [options]
+function _omz::plugin {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
-    clean                       Delete all PR branches (ohmyzsh/pull-*)
-    test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
+  disable <plugin> Disable plugin(s)
+  enable <plugin>  Enable plugin(s)
+  info <plugin>    Get information of a plugin
+  list             List all available Oh My Zsh plugins
+  load <plugin>    Load plugin(s)
 
 EOF
-        return 1
-    }
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    _omz::pr::$command "$@"
+  $0::$command "$@"
+}
+
+function _omz::plugin::disable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is in $plugins
+  local -a dis_plugins
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
+      _omz::log warn "plugin '$plugin' is not enabled."
+      continue
+    fi
+    dis_plugins+=("$plugin")
+  done
+
+  # Exit if there are no enabled plugins to disable
+  if [[ ${#dis_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Remove plugins substitution awk script
+  local awk_subst_plugins="\
+  gsub(/[ \t]+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})[ \t]+/, \"\") # with spaces after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+"
+  # Disable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute disabled plugins and go to next line
+/^[ \t]*plugins=\([^#]+\).*\$/ {
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
+/^[ \t]*plugins=\(/ {
+  multi=1
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis, remove plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  $awk_subst_plugins
+  print \$0
+  next
+}
+
+multi == 1 && length(\$0) > 0 {
+  $awk_subst_plugins
+  if (length(\$0) > 0) print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zshrc"
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error disabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::plugin::enable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is not in $plugins
+  local -a add_plugins
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
+      _omz::log warn "plugin '$plugin' is already enabled."
+      continue
+    fi
+    add_plugins+=("$plugin")
+  done
+
+  # Exit if there are no plugins to enable
+  if [[ ${#add_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Enable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute ) with new plugins and go to the next line
+/^[ \t]*plugins=\([^#]+\).*\$/ {
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag
+/^[ \t]*plugins=\(/ {
+  multi=1
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis,
+# add new plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zshrc"
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error enabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::plugin::info {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin>"
+    return 1
+  fi
+
+  local readme
+  for readme in "$ZSH_CUSTOM/plugins/$1/README.md" "$ZSH/plugins/$1/README.md"; do
+    if [[ -f "$readme" ]]; then
+      (( ${+commands[less]} )) && less "$readme" || cat "$readme"
+      return 0
+    fi
+  done
+
+  if [[ -d "$ZSH_CUSTOM/plugins/$1" || -d "$ZSH/plugins/$1" ]]; then
+    _omz::log error "the '$1' plugin doesn't have a README file"
+  else
+    _omz::log error "'$1' plugin not found"
+  fi
+
+  return 1
+}
+
+function _omz::plugin::list {
+  local -a custom_plugins builtin_plugins
+  custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
+  builtin_plugins=("$ZSH"/plugins/*(-/N:t))
+
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
+    return
+  fi
+
+  if (( ${#custom_plugins} )); then
+    print -P "%U%BCustom plugins%b%u:"
+    print -lac ${(q-)custom_plugins}
+  fi
+
+  if (( ${#builtin_plugins} )); then
+    (( ${#custom_plugins} )) && echo # add a line of separation
+
+    print -P "%U%BBuilt-in plugins%b%u:"
+    print -lac ${(q-)builtin_plugins}
+  fi
+}
+
+function _omz::plugin::load {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
+    return 1
+  fi
+
+  local plugin base has_completion=0
+  for plugin in "$@"; do
+    if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
+      base="$ZSH_CUSTOM/plugins/$plugin"
+    elif [[ -d "$ZSH/plugins/$plugin" ]]; then
+      base="$ZSH/plugins/$plugin"
+    else
+      _omz::log warn "plugin '$plugin' not found"
+      continue
+    fi
+
+    # Check if its a valid plugin
+    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
+    elif (( ! ${fpath[(Ie)$base]} )); then
+      fpath=("$base" $fpath)
+    fi
+
+    # Check if it has completion to reload compinit
+    local -a comp_files
+    comp_files=($base/_*(N))
+    has_completion=$(( $#comp_files > 0 ))
+
+    # Load the plugin
+    if [[ -f "$base/$plugin.plugin.zsh" ]]; then
+      source "$base/$plugin.plugin.zsh"
+    fi
+  done
+
+  # If we have completion, we need to reload the completion
+  # We pass -D to avoid generating a new dump file, which would overwrite our
+  # current one for the next session (and we don't want that because we're not
+  # actually enabling the plugins for the next session).
+  # Note that we still have to pass -d "$_comp_dumpfile", so that compinit
+  # doesn't use the default zcompdump location (${ZDOTDIR:-$HOME}/.zcompdump).
+  if (( has_completion )); then
+    compinit -D -d "$_comp_dumpfile"
+  fi
+}
+
+function _omz::pr {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
+
+Available commands:
+
+  clean                       Delete all PR branches (ohmyzsh/pull-*)
+  test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
+
+EOF
+    return 1
+  }
+
+  local command="$1"
+  shift
+
+  $0::$command "$@"
 }
 
 function _omz::pr::clean {
-    (
-        set -e
-        builtin cd -q "$ZSH"
+  (
+    set -e
+    builtin cd -q "$ZSH"
 
-        _omz::log info "removing all Oh My Zsh Pull Request branches..."
-        command git branch --list 'ohmyzsh/pull-*' | while read branch; do
-            command git branch -D "$branch"
-        done
-    )
+    # Check if there are PR branches
+    local fmt branches
+    fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
+    branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
+
+    # Exit if there are no PR branches
+    if [[ -z "$branches" ]]; then
+      _omz::log info "there are no Pull Request branches to remove."
+      return
+    fi
+
+    # Print found PR branches
+    echo "$branches\n"
+    # Confirm before removing the branches
+    _omz::confirm "do you want remove these Pull Request branches? [Y/n] "
+    # Only proceed if the answer is a valid yes option
+    [[ "$REPLY" != [yY$'\n'] ]] && return
+
+    _omz::log info "removing all Oh My Zsh Pull Request branches..."
+    command git branch --list 'ohmyzsh/pull-*' | while read branch; do
+      command git branch -D "$branch"
+    done
+  )
 }
 
 function _omz::pr::test {
-    # Allow $1 to be a URL to the pull request
-    if [[ "$1" = https://* ]]; then
-        1="${1:t}"
-    fi
+  # Allow $1 to be a URL to the pull request
+  if [[ "$1" = https://* ]]; then
+    1="${1:t}"
+  fi
 
-    # Check the input
-    if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
-        echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
-        return 1
-    fi
+  # Check the input
+  if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <PR_NUMBER_or_URL>"
+    return 1
+  fi
 
-    # Save current git HEAD
-    local branch
-    branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
-        _omz::log error "error when getting the current git branch. Aborting..."
-        return 1
+  # Save current git HEAD
+  local branch
+  branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
+    _omz::log error "error when getting the current git branch. Aborting..."
+    return 1
+  }
+
+
+  # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
+  # If any of these operations fail, undo the changes made
+  (
+    set -e
+    builtin cd -q "$ZSH"
+
+    # Get the ohmyzsh git remote
+    command git remote -v | while read remote url _; do
+      case "$url" in
+      https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      esac
+    done
+
+    (( $found )) || {
+      _omz::log error "could not found the ohmyzsh git remote. Aborting..."
+      return 1
     }
 
+    # Fetch pull request head
+    _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
+    command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
+      _omz::log error "error when trying to fetch PR #$1."
+      return 1
+    }
 
-    # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
-    # If any of these operations fail, undo the changes made
-    (
-        set -e
-        builtin cd -q "$ZSH"
+    # Rebase pull request branch against the current master
+    _omz::log info "rebasing PR #$1..."
+    local ret gpgsign
+    {
+      # Back up commit.gpgsign setting: use --local to get the current repository
+      # setting, not the global one. If --local is not a known option, it will
+      # exit with a 129 status code.
+      gpgsign=$(command git config --local commit.gpgsign 2>/dev/null) || ret=$?
+      [[ $ret -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      command git config commit.gpgsign false
 
-        # Get the ohmyzsh git remote
-        command git remote -v | while read remote url _; do
-            case "$url" in
-            https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            esac
-        done
+      command git rebase master ohmyzsh/pull-$1 || {
+        command git rebase --abort &>/dev/null
+        _omz::log warn "could not rebase PR #$1 on top of master."
+        _omz::log warn "you might not see the latest stable changes."
+        _omz::log info "run \`zsh\` to test the changes."
+        return 1
+      }
+    } always {
+      case "$gpgsign" in
+      "") command git config --unset commit.gpgsign ;;
+      *) command git config commit.gpgsign "$gpgsign" ;;
+      esac
+    }
 
-        (( $found )) || {
-            _omz::log error "could not found the ohmyzsh git remote. Aborting..."
-            return 1
-        }
+    _omz::log info "fetch of PR #${1} successful."
+  )
 
-        # Fetch pull request head
-        _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
-        command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
-            _omz::log error "error when trying to fetch PR #$1."
-            return 1
-        }
+  # If there was an error, abort running zsh to test the PR
+  [[ $? -eq 0 ]] || return 1
 
-        # Rebase pull request branch against the current master
-        _omz::log info "rebasing PR #$1..."
-        command git rebase master ohmyzsh/pull-$1 || {
-            command git rebase --abort &>/dev/null
-            _omz::log warn "could not rebase PR #$1 on top of master."
-            _omz::log warn "you might not see the latest stable changes."
-            _omz::log info "run \`zsh\` to test the changes."
-            return 1
-        }
+  # Run zsh to test the changes
+  _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
+  command zsh -l
 
-        _omz::log info "fetch of PR #${1} successful."
-    )
+  # After testing, go back to the previous HEAD if the user wants
+  _omz::confirm "do you want to go back to the previous branch? [Y/n] "
+  # Only proceed if the answer is a valid yes option
+  [[ "$REPLY" != [yY$'\n'] ]] && return
 
-    # If there was an error, abort running zsh to test the PR
-    [[ $? -eq 0 ]] || return 1
+  (
+    set -e
+    builtin cd -q "$ZSH"
 
-    # Run zsh to test the changes
-    _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
-    command zsh -l
+    command git checkout "$branch" -- || {
+      _omz::log error "could not go back to the previous branch ('$branch')."
+      return 1
+    }
+  )
+}
 
-    # After testing, go back to the previous HEAD if the user wants
-    _omz::log prompt "do you want to go back to the previous branch? [Y/n] "
-    read -r -k 1
+function _omz::reload {
+  # Delete current completion cache
+  command rm -f $_comp_dumpfile $ZSH_COMPDUMP
 
-    # If no newline entered, add a newline
-    [[ "$REPLY" != $'\n' ]] && echo
-    # If NO selected, do nothing else
-    [[ "$REPLY" = [nN] ]] && return
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
 
-    (
-        set -e
-        builtin cd -q "$ZSH"
+function _omz::theme {
+  (( $# > 0 && $+functions[$0::$1] )) || {
+    cat >&2 <<EOF
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
-        command git checkout "$branch" -- || {
-            _omz::log error "could not go back to the previous branch ('$branch')."
-            return 1
-        }
-    )
+Available commands:
+
+  list            List all available Oh My Zsh themes
+  set <theme>     Set a theme in your .zshrc file
+  use <theme>     Load a theme
+
+EOF
+    return 1
+  }
+
+  local command="$1"
+  shift
+
+  $0::$command "$@"
+}
+
+function _omz::theme::list {
+  local -a custom_themes builtin_themes
+  custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+  builtin_themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r))
+
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_themes} ${(q-)builtin_themes}
+    return
+  fi
+
+  # Print theme in use
+  if [[ -n "$ZSH_THEME" ]]; then
+    print -Pn "%U%BCurrent theme%b%u: "
+    [[ $ZSH_THEME = random ]] && echo "$RANDOM_THEME (via random)" || echo "$ZSH_THEME"
+    echo
+  fi
+
+  # Print custom themes if there are any
+  if (( ${#custom_themes} )); then
+    print -P "%U%BCustom themes%b%u:"
+    print -lac ${(q-)custom_themes}
+    echo
+  fi
+
+  # Print built-in themes
+  print -P "%U%BBuilt-in themes%b%u:"
+  print -lac ${(q-)builtin_themes}
+}
+
+function _omz::theme::set {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
+    return 1
+  fi
+
+  # Check that theme exists
+  if [[ ! -f "$ZSH_CUSTOM/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    _omz::log error "%B$1%b theme not found"
+    return 1
+  fi
+
+  # Enable theme in .zshrc
+  local awk_script='
+!set && /^[ \t]*ZSH_THEME=[^#]+.*$/ {
+  set=1
+  sub(/^[ \t]*ZSH_THEME=[^#]+.*$/, "ZSH_THEME=\"'$1'\" # set by `omz`")
+  print $0
+  next
+}
+
+{ print $0 }
+
+END {
+  # If no ZSH_THEME= line was found, return an error
+  if (!set) exit 1
+}
+'
+
+  local zdot="${ZDOTDIR:-$HOME}"
+  local zshrc="${${:-"${zdot}/.zshrc"}:A}"
+  awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
+  || {
+    # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
+    cat <<EOF
+ZSH_THEME="$1" # set by \`omz\`
+
+EOF
+    cat "$zdot/.zshrc"
+  } > "$zdot/.zshrc.new" \
+  && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zshrc"
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error setting theme."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! command zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc.bck" "$zshrc"
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "'$1' theme set correctly."
+
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
+}
+
+function _omz::theme::use {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
+    return 1
+  fi
+
+  # Respect compatibility with old lookup order
+  if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/$1.zsh-theme"
+  elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/themes/$1.zsh-theme"
+  elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    source "$ZSH/themes/$1.zsh-theme"
+  else
+    _omz::log error "%B$1%b theme not found"
+    return 1
+  fi
+
+  # Update theme settings
+  ZSH_THEME="$1"
+  [[ $1 = random ]] || unset RANDOM_THEME
 }
 
 function _omz::update {
-    # Run update script
-    env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-    # Update last updated file
-    zmodload zsh/datetime
-    echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-    # Remove update lock if it exists
-    command rm -rf "$ZSH/log/update.lock"
+  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
+
+  # Run update script
+  if [[ "$1" != --unattended ]]; then
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+  else
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
+  fi
+
+  # Update last updated file
+  zmodload zsh/datetime
+  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  # Remove update lock if it exists
+  command rm -rf "$ZSH/log/update.lock"
+
+  # Restart the zsh session if there were changes
+  if [[ "$1" != --unattended && "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
+    # Old zsh versions don't have ZSH_ARGZERO
+    local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+    # Check whether to run a login shell
+    [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  fi
+}
+
+function _omz::version {
+  (
+    builtin cd -q "$ZSH"
+
+    # Get the version name:
+    # 1) try tag-like version
+    # 2) try branch name
+    # 3) try name-rev (tag~<rev> or branch~<rev>)
+    local version
+    version=$(command git describe --tags HEAD 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \
+    || version="<detached>"
+
+    # Get short hash for the current HEAD
+    local commit=$(command git rev-parse --short HEAD 2>/dev/null)
+
+    # Show version and commit hash
+    printf "%s (%s)\n" "$version" "$commit"
+  )
 }

lib/clipboard.zsh

@@ -10,8 +10,8 @@
 # - pbcopy, pbpaste (macOS)
 # - cygwin (Windows running Cygwin)
 # - wl-copy, wl-paste (if $WAYLAND_DISPLAY is set)
-# - xclip (if $DISPLAY is set)
 # - xsel (if $DISPLAY is set)
+# - xclip (if $DISPLAY is set)
 # - lemonade (for SSH) https://github.com/pocke/lemonade
 # - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
 # - win32yank (Windows)
@@ -52,37 +52,37 @@ function detect-clipboard() {
   emulate -L zsh
 
   if [[ "${OSTYPE}" == darwin* ]] && (( ${+commands[pbcopy]} )) && (( ${+commands[pbpaste]} )); then
-    function clipcopy() { pbcopy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | pbcopy; }
     function clippaste() { pbpaste; }
   elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
     function clipcopy() { cat "${1:-/dev/stdin}" > /dev/clipboard; }
     function clippaste() { cat /dev/clipboard; }
   elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
-    function clipcopy() { wl-copy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | wl-copy &>/dev/null &|; }
     function clippaste() { wl-paste; }
-  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xclip]} )); then
-    function clipcopy() { xclip -in -selection clipboard < "${1:-/dev/stdin}"; }
-    function clippaste() { xclip -out -selection clipboard; }
   elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xsel]} )); then
-    function clipcopy() { xsel --clipboard --input < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | xsel --clipboard --input; }
     function clippaste() { xsel --clipboard --output; }
+  elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xclip]} )); then
+    function clipcopy() { cat "${1:-/dev/stdin}" | xclip -selection clipboard -in &>/dev/null &|; }
+    function clippaste() { xclip -out -selection clipboard; }
   elif (( ${+commands[lemonade]} )); then
-    function clipcopy() { lemonade copy < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | lemonade copy; }
     function clippaste() { lemonade paste; }
   elif (( ${+commands[doitclient]} )); then
-    function clipcopy() { doitclient wclip < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | doitclient wclip; }
     function clippaste() { doitclient wclip -r; }
   elif (( ${+commands[win32yank]} )); then
-    function clipcopy() { win32yank -i < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | win32yank -i; }
     function clippaste() { win32yank -o; }
   elif [[ $OSTYPE == linux-android* ]] && (( $+commands[termux-clipboard-set] )); then
-    function clipcopy() { termux-clipboard-set "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | termux-clipboard-set; }
     function clippaste() { termux-clipboard-get; }
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer "${1:--}"; }
     function clippaste() { tmux save-buffer -; }
   elif [[ $(uname -r) = *icrosoft* ]]; then
-    function clipcopy() { clip.exe < "${1:-/dev/stdin}"; }
+    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
     function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   else
     function _retry_clipboard_detection_or_fail() {

lib/completion.zsh

@@ -1,7 +1,7 @@
 # fixme - the load process here seems a bit bizarre
 zmodload -i zsh/complist
 
-WORDCHARS='_-'
+WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -32,9 +32,9 @@ zstyle ':completion:*' list-colors ''
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 if [[ "$OSTYPE" = solaris* ]]; then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion
@@ -58,9 +58,12 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [[ $COMPLETION_WAITING_DOTS = true ]]; then
+if [[ ${COMPLETION_WAITING_DOTS:-false} != false ]]; then
   expand-or-complete-with-dots() {
-    print -Pn "%F{red}…%f"
+    # use $COMPLETION_WAITING_DOTS either as toggle or as the sequence to show
+    [[ $COMPLETION_WAITING_DOTS = true ]] && COMPLETION_WAITING_DOTS="%F{red}…%f"
+    # turn off line wrapping and print prompt-expanded "dot" sequence
+    printf '\e[?7l%s\e[?7h' "${(%)COMPLETION_WAITING_DOTS}"
     zle expand-or-complete
     zle redisplay
   }

lib/correction.zsh

@@ -9,6 +9,7 @@ if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   alias mv='nocorrect mv'
   alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
+  alias su='nocorrect su'
 
   setopt correct_all
 fi

lib/diagnostics.zsh

@@ -112,7 +112,7 @@ function _omz_diag_dump_one_big_text() {
   command uname -a
   builtin echo OSTYPE=$OSTYPE
   builtin echo ZSH_VERSION=$ZSH_VERSION
-  builtin echo User: $USER
+  builtin echo User: $USERNAME
   builtin echo umask: $(umask)
   builtin echo
   _omz_diag_dump_os_specific_version
@@ -335,7 +335,7 @@ function _omz_diag_dump_os_specific_version() {
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
-      command systeminfo | command head -4 | command tail -2
+      command systeminfo | command head -n 4 | command tail -n 2
       ;;
   esac
 

lib/directories.zsh

@@ -9,7 +9,7 @@ alias -g .....='../../../..'
 alias -g ......='../../../../..'
 
 alias -- -='cd -'
-alias 1='cd -'
+alias 1='cd -1'
 alias 2='cd -2'
 alias 3='cd -3'
 alias 4='cd -4'
@@ -26,7 +26,7 @@ function d () {
   if [[ -n $1 ]]; then
     dirs "$@"
   else
-    dirs -v | head -10
+    dirs -v | head -n 10
   fi
 }
 compdef _dirs d

lib/functions.zsh

@@ -1,7 +1,7 @@
 function zsh_stats() {
   fc -l 1 \
     | awk '{ CMD[$2]++; count++; } END { for (a in CMD) print CMD[a] " " CMD[a]*100/count "% " a }' \
-    | grep -v "./" | sort -nr | head -n20 | column -c3 -s " " -t | nl
+    | grep -v "./" | sort -nr | head -n 20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {
@@ -9,21 +9,8 @@ function uninstall_oh_my_zsh() {
 }
 
 function upgrade_oh_my_zsh() {
-  if (( $+functions[_omz::update] )); then
-    echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
-  fi
-
-  # Run update script
-  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-  # Update last updated file
-  zmodload zsh/datetime
-  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-  # Remove update lock if it exists
-  command rm -rf "$ZSH/log/update.lock"
-}
-
-function take() {
-  mkdir -p $@ && cd ${@:$#}
+  echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
+  omz update
 }
 
 function open_command() {
@@ -46,6 +33,38 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+# take functions
+
+# mkcd is equivalent to takedir
+function mkcd takedir() {
+  mkdir -p $@ && cd ${@:$#}
+}
+
+function takeurl() {
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  tar xf "$data"
+  thedir="$(tar tf "$data" | head -n 1)"
+  rm "$data"
+  cd "$thedir"
+}
+
+function takegit() {
+  git clone "$1"
+  cd "$(basename ${1%%.git})"
+}
+
+function take() {
+  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+    takeurl "$1"
+  elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
+    takegit "$1"
+  else
+    takedir "$@"
+  fi
+}
+
 #
 # Get the value of an alias.
 #
@@ -125,7 +144,7 @@ zmodload zsh/langinfo
 # Returns nonzero if encoding failed.
 #
 # Usage:
-#  omz_urlencode [-r] [-m] [-P] <string>
+#  omz_urlencode [-r] [-m] [-P] <string> [<string> ...]
 #
 #    -r causes reserved characters (;/?:@&=+$,) to be escaped
 #
@@ -134,9 +153,10 @@ zmodload zsh/langinfo
 #    -P causes spaces to be encoded as '%20' instead of '+'
 function omz_urlencode() {
   emulate -L zsh
+  local -a opts
   zparseopts -D -E -a opts r m P
 
-  local in_str=$1
+  local in_str="$@"
   local url_str=""
   local spaces_as_plus
   if [[ -z $opts[(r)-P] ]]; then spaces_as_plus=1; fi
@@ -217,12 +237,11 @@ function omz_urldecode {
   tmp=${tmp:gs/\\/\\\\/}
   # Handle %-escapes by turning them into `\xXX` printf escapes
   tmp=${tmp:gs/%/\\x/}
-  local decoded
-  eval "decoded=\$'$tmp'"
+  local decoded="$(printf -- "$tmp")"
 
   # Now we have a UTF-8 encoded string in the variable. We need to re-encode
   # it if caller is in a non-UTF-8 locale.
-  local safe_encodings
+  local -a safe_encodings
   safe_encodings=(UTF-8 utf8 US-ASCII)
   if [[ -z ${safe_encodings[(r)$caller_encoding]} ]]; then
     decoded=$(echo -E "$decoded" | iconv -f UTF-8 -t $caller_encoding)

lib/git.zsh

@@ -9,14 +9,27 @@ function __git_prompt_git() {
   GIT_OPTIONAL_LOCKS=0 command git "$@"
 }
 
-# Outputs current branch info in prompt format
 function git_prompt_info() {
-  local ref
-  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
-    ref=$(__git_prompt_git symbolic-ref HEAD 2> /dev/null) || \
-    ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) || return 0
-    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  # 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
+    return 0
   fi
+
+  local ref
+  ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
+  || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
+  || return 0
+
+  # Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info
+  local upstream
+  if (( ${+ZSH_THEME_GIT_SHOW_UPSTREAM} )); then
+    upstream=$(__git_prompt_git rev-parse --abbrev-ref --symbolic-full-name "@{upstream}" 2>/dev/null) \
+    && upstream=" -> ${upstream}"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # Checks if working tree is dirty
@@ -38,7 +51,7 @@ function parse_git_dirty() {
         FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
-    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
@@ -69,7 +82,7 @@ function git_remote_status() {
         fi
 
         if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
-            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX${remote:gs/%/%%}$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
         fi
 
         echo $git_remote_status
@@ -147,44 +160,103 @@ 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"
 }
 
-# Get the status of the working tree
 function git_prompt_status() {
-  emulate -L zsh
+  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
-  local INDEX STATUS
-  INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
-  STATUS=""
-  if [[ "${INDEX}" =~ $'(^|\n)\\?\\? ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+  # Maps a git status prefix to an internal constant
+  # This cannot use the prompt constants, as they may be empty
+  local -A prefix_constant_map
+  prefix_constant_map=(
+    '\?\? '     'UNTRACKED'
+    'A  '       'ADDED'
+    'M  '       'ADDED'
+    'MM '       'MODIFIED'
+    ' M '       'MODIFIED'
+    'AM '       'MODIFIED'
+    ' T '       'MODIFIED'
+    'R  '       'RENAMED'
+    ' D '       'DELETED'
+    'D  '       'DELETED'
+    'UU '       'UNMERGED'
+    'ahead'     'AHEAD'
+    'behind'    'BEHIND'
+    'diverged'  'DIVERGED'
+    'stashed'   'STASHED'
+  )
+
+  # Maps the internal constant to the prompt theme
+  local -A constant_prompt_map
+  constant_prompt_map=(
+    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
+    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
+    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
+    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
+    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
+    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
+    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
+    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
+  )
+
+  # The order that the prompt displays should be added to the prompt
+  local status_constants
+  status_constants=(
+    UNTRACKED ADDED MODIFIED RENAMED DELETED
+    STASHED UNMERGED AHEAD BEHIND DIVERGED
+  )
+
+  local status_text
+  status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
+
+  # Don't continue on a catastrophic failure
+  if [[ $? -eq 128 ]]; then
+    return 1
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)(A |M |MM) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+
+  # A lookup table of each git status encountered
+  local -A statuses_seen
+
+  if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
+    statuses_seen[STASHED]=1
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)([ AM]M| T) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+
+  local status_lines
+  status_lines=("${(@f)${status_text}}")
+
+  # If the tracking line exists, get and parse it
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
+    local branch_statuses
+    branch_statuses=("${(@s/,/)match}")
+    for branch_status in $branch_statuses; do
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
+        continue
+      fi
+      local last_parsed_status=$prefix_constant_map[$match[1]]
+      statuses_seen[$last_parsed_status]=$match[2]
+    done
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)R  ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)([A ]D|D ) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)UU ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*ahead' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*behind' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*diverged' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-  fi
-  echo $STATUS
+
+  # For each status prefix, do a regex comparison
+  for status_prefix in ${(k)prefix_constant_map}; do
+    local status_constant="${prefix_constant_map[$status_prefix]}"
+    local status_regex=$'(^|\n)'"$status_prefix"
+
+    if [[ "$status_text" =~ $status_regex ]]; then
+      statuses_seen[$status_constant]=1
+    fi
+  done
+
+  # Display the seen statuses in the order specified
+  local status_prompt
+  for status_constant in $status_constants; do
+    if (( ${+statuses_seen[$status_constant]} )); then
+      local next_display=$constant_prompt_map[$status_constant]
+      status_prompt="$next_display$status_prompt"
+    fi
+  done
+
+  echo $status_prompt
 }
 
 # Outputs the name of the current user

lib/grep.zsh

@@ -24,8 +24,8 @@ else
     if [[ -n "$GREP_OPTIONS" ]]; then
         # export grep, egrep and fgrep settings
         alias grep="grep $GREP_OPTIONS"
-        alias egrep="egrep $GREP_OPTIONS"
-        alias fgrep="fgrep $GREP_OPTIONS"
+        alias egrep="grep -E $GREP_OPTIONS"
+        alias fgrep="grep -F $GREP_OPTIONS"
 
         # write to cache file if cache directory is writable
         if [[ -w "$ZSH_CACHE_DIR" ]]; then

lib/history.zsh

@@ -6,7 +6,8 @@ function omz_history {
   if [[ -n "$clear" ]]; then
     # if -c provided, clobber the history file
     echo -n >| "$HISTFILE"
-    echo >&2 History file deleted. Reload the session to see its effects.
+    fc -p "$HISTFILE"
+    echo >&2 History file deleted.
   elif [[ -n "$list" ]]; then
     # if -l provided, run as if calling `fc' directly
     builtin fc "$@"

lib/misc.zsh

@@ -24,10 +24,10 @@ env_default 'LESS' '-R'
 ## super user alias
 alias _='sudo '
 
-## more intelligent acking for ubuntu users
+## more intelligent acking for ubuntu users and no alias for users without ack
 if (( $+commands[ack-grep] )); then
   alias afind='ack-grep -il'
-else
+elif (( $+commands[ack] )); then
   alias afind='ack -il'
 fi
 

lib/nvm.zsh

@@ -1,9 +1,6 @@
-# get the node.js version
+# get the nvm-controlled node.js version
 function nvm_prompt_info() {
-  [[ -f "$NVM_DIR/nvm.sh" ]] || return
-  local nvm_prompt
-  nvm_prompt=$(node -v 2>/dev/null)
-  [[ "${nvm_prompt}x" == "x" ]] && return
-  nvm_prompt=${nvm_prompt:1}
-  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+  which nvm &>/dev/null || return
+  local nvm_prompt=${$(nvm current)#v}
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt:gs/%/%%}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }

lib/prompt_info_functions.zsh

@@ -18,6 +18,7 @@ function chruby_prompt_info \
   vi_mode_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
+  tf_prompt_info \
 {
   return 1
 }
@@ -29,7 +30,7 @@ function rvm_prompt_info() {
   local rvm_prompt
   rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ -z "${rvm_prompt}" ]] && return 1
-  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt:gs/%/%%}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
 }
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"

lib/spectrum.zsh

@@ -20,16 +20,18 @@ done
 
 # Show all 256 colors with color number
 function spectrum_ls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $FG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${FG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $BG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${BG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }

lib/termsupport.zsh

@@ -7,17 +7,17 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
-  emulate -L zsh
-  setopt prompt_subst
+  setopt localoptions nopromptsubst
 
-  [[ "$EMACS" == *term* ]] && return
+  # Don't set the title if inside emacs, unless using vterm
+  [[ -n "${INSIDE_EMACS:-}" && "$INSIDE_EMACS" != vterm ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;
@@ -29,12 +29,9 @@ function title {
         print -Pn "\e]2;${2:q}\a" # set window name
         print -Pn "\e]1;${1:q}\a" # set tab name
       else
-        # Try to use terminfo to set the title
-        # If the feature is available set title
-        if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then
-          echoti tsl
-          print -Pn "$1"
-          echoti fsl
+        # Try to use terminfo to set the title if the feature is available
+        if (( ${+terminfo[fsl]} && ${+terminfo[tsl]} )); then
+          print -Pn "${terminfo[tsl]}$1${terminfo[fsl]}"
         fi
       fi
       ;;
@@ -42,7 +39,7 @@ function title {
 }
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
-ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
+ZSH_THEME_TERM_TITLE_IDLE="%n@%m:%~"
 # Avoid duplication of directory in terminals with independent dir display
 if [[ "$TERM_PROGRAM" == Apple_Terminal ]]; then
   ZSH_THEME_TERM_TITLE_IDLE="%n@%m"
@@ -50,13 +47,13 @@ fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  title "$ZSH_THEME_TERM_TAB_TITLE_IDLE" "$ZSH_THEME_TERM_TITLE_IDLE"
 }
 
 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
 
   emulate -L zsh
   setopt extended_glob
@@ -99,16 +96,18 @@ function omz_termsupport_preexec {
   fi
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
+  local CMD="${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}"
   local LINE="${2:gs/%/%%}"
 
-  title '$CMD' '%100>...>$LINE%<<'
+  title "$CMD" "%100>...>${LINE}%<<"
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+autoload -Uz add-zsh-hook
 
+if [[ -z "$INSIDE_EMACS" || "$INSIDE_EMACS" = vterm ]]; then
+  add-zsh-hook precmd omz_termsupport_precmd
+  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

lib/theme-and-appearance.zsh

@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
 fi
 
 # enable diff color if possible.
-if command diff --color . . &>/dev/null; then
+if command diff --color /dev/null /dev/null &>/dev/null; then
   alias diff='diff --color'
 fi
 

lib/vcs_info.zsh

@@ -0,0 +1,53 @@
+# Don't skip this file until a Zsh release does the necessary quoting.
+# This is because even though 5.8.1 undid recursive prompt_subst inside
+# prompt sequences, % characters in relevant fields will still be rendered
+# incorrectly in vcs_info, on all Zsh releases up to writing this.
+#
+# There is no release yet that does this right, since it requires changing
+# how what vcs_info hooks expect to receive. Even so, I'd rather be correct
+# and break custom vcs_info hooks than have a broken prompt.
+
+# Quote necessary $hook_com[<field>] items just before they are used
+# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats
+# function, where <field> is:
+#
+#   base:       the full path of the repository's root directory.
+#   base-name:  the name of the repository's root directory.
+#   branch:     the name of the currently checked out branch.
+#   misc:       a string that may contain anything the vcs_info backend wants.
+#   revision:   an identifier of the currently checked out revision.
+#   subdir:     the path of the current directory relative to the
+#               repository's root directory.
+#
+# This patch %-quotes these fields previous to their use in vcs_info hooks and
+# the zformat call and, eventually, when they get expanded in the prompt.
+# It's important to quote these here, and not later after hooks have modified the
+# fields, because then we could be quoting % characters from valid prompt sequences,
+# like %F{color}, %B, etc.
+#
+#  32   │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})"
+#  33   │ hook_com[subdir_orig]="${hook_com[subdir]}"
+#  34   │
+#  35 + │ for tmp in base base-name branch misc revision subdir; do
+#  36 + │     hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"
+#  37 + │ done
+#  38 + │
+#  39   │ VCS_INFO_hook 'post-backend'
+#
+# This is especially important so that no command substitution is performed
+# due to malicious input as a consequence of CVE-2021-45444, which affects
+# zsh versions from 5.0.3 to 5.8.
+#
+autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return
+
+# We use $tmp here because it's already a local variable in VCS_INFO_formats
+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
+# Unique string to avoid reapplying the patch if this code gets called twice
+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
+# Only patch the VCS_INFO_formats function if not already patched
+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
+  regexp-replace 'functions[VCS_INFO_formats]' \
+    "VCS_INFO_hook 'post-backend'" \
+    ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
+fi
+unset PATCH PATCH_ID

oh-my-zsh.sh

@@ -1,3 +1,43 @@
+# 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"
+    while [ ${pid-0} -ne 1 ] && ppid=$(ps -e -o pid,ppid | awk "\$1 == $pid { print \$2 }"); do
+      pids="$pids $pid"; pid=$ppid
+    done
+
+    # Show process tree
+    case "$(uname)" in
+    Linux) ps -o ppid,pid,command -f -p $pids 2>/dev/null ;;
+    Darwin|*) ps -o ppid,pid,command -p $pids 2>/dev/null ;;
+    esac
+
+    # If ps command failed, try Busybox ps
+    [ $? -eq 0 ] || ps -o ppid,pid,comm | awk "NR == 1 || index(\"$pids\", \$2) != 0"
+  }
+
+  {
+    shell=$(ps -o pid,comm | awk "\$1 == $$ { print \$2 }")
+    printf "$(omz_f 1 31)Error:$(omz_f 22) Oh My Zsh can't be loaded from: $(omz_f 1)${shell}$(omz_f 22). "
+    printf "You need to run $(omz_f 1)zsh$(omz_f 22) instead.$(omz_f 0)\n"
+    printf "$(omz_f 33)Here's the process tree:$(omz_f 22)\n\n"
+    omz_ptree
+    printf "$(omz_f 0)\n"
+  } >&2
+
+  return 1
+}
+
 # If ZSH is not defined, use the current script's directory.
 [[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
 
@@ -7,18 +47,27 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
+# Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
+if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
+  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh"
+fi
+
+# Create cache and completions dir and add to $fpath
+mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  source $ZSH/tools/check_for_upgrade.sh
+if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
+  source "$ZSH/tools/check_for_upgrade.sh"
 fi
 
 # Initializes Oh My Zsh
 
 # add a function path
-fpath=($ZSH/functions $ZSH/completions $fpath)
+fpath=("$ZSH/functions" "$ZSH/completions" $fpath)
 
 # Load all stock functions (from $fpath files) called below.
-autoload -U compaudit compinit
+autoload -U compaudit compinit zrecompile
 
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
@@ -26,7 +75,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -37,10 +85,10 @@ is_plugin() {
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 for plugin ($plugins); do
-  if is_plugin $ZSH_CUSTOM $plugin; then
-    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
-  elif is_plugin $ZSH $plugin; then
-    fpath=($ZSH/plugins/$plugin $fpath)
+  if is_plugin "$ZSH_CUSTOM" "$plugin"; then
+    fpath=("$ZSH_CUSTOM/plugins/$plugin" $fpath)
+  elif is_plugin "$ZSH" "$plugin"; then
+    fpath=("$ZSH/plugins/$plugin" $fpath)
   else
     echo "[oh-my-zsh] plugin '$plugin' not found"
   fi
@@ -49,14 +97,14 @@ done
 # Figure out the SHORT hostname
 if [[ "$OSTYPE" = darwin* ]]; then
   # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
-  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
 else
-  SHORT_HOST=${HOST/.*/}
+  SHORT_HOST="${HOST/.*/}"
 fi
 
 # Save the location of the current completion dump file.
-if [ -z "$ZSH_COMPDUMP" ]; then
-  ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+if [[ -z "$ZSH_COMPDUMP" ]]; then
+  ZSH_COMPDUMP="${ZDOTDIR:-$HOME}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
 # Construct zcompdump OMZ metadata
@@ -70,19 +118,20 @@ if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
   zcompdump_refresh=1
 fi
 
-if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
-  source $ZSH/lib/compfix.zsh
-  # If completion insecurities exist, warn the user
-  handle_completion_insecurities
+if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
+  source "$ZSH/lib/compfix.zsh"
   # Load only from secure directories
-  compinit -i -C -d "${ZSH_COMPDUMP}"
+  compinit -i -d "$ZSH_COMPDUMP"
+  # If completion insecurities exist, warn the user
+  handle_completion_insecurities &|
 else
   # If the user wants it, load from all found directories
-  compinit -u -C -d "${ZSH_COMPDUMP}"
+  compinit -u -d "$ZSH_COMPDUMP"
 fi
 
 # Append zcompdump metadata if missing
-if (( $zcompdump_refresh )); then
+if (( $zcompdump_refresh )) \
+  || ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null; then
   # Use `tee` in case the $ZSH_COMPDUMP filename is invalid, to silence the error
   # See https://github.com/ohmyzsh/ohmyzsh/commit/dd1a7269#commitcomment-39003489
   tee -a "$ZSH_COMPDUMP" &>/dev/null <<EOF
@@ -91,40 +140,51 @@ $zcompdump_revision
 $zcompdump_fpath
 EOF
 fi
-
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 
+# zcompile the completion dump file if the .zwc is older or missing.
+zrecompile -q -p "$ZSH_COMPDUMP" && command rm -f "$ZSH_COMPDUMP.zwc.old"
 
 # Load all of the config files in ~/oh-my-zsh 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 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"
 done
+unset custom_config_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
+  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
 done
+unset plugin
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
+for config_file ("$ZSH_CUSTOM"/*.zsh(N)); do
+  source "$config_file"
 done
 unset config_file
 
 # Load the theme
-if [ ! "$ZSH_THEME" = ""  ]; then
-  if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
+is_theme() {
+  local base_dir=$1
+  local name=$2
+  builtin test -f $base_dir/$name.zsh-theme
+}
+
+if [[ -n "$ZSH_THEME" ]]; then
+  if is_theme "$ZSH_CUSTOM" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-  elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
+  elif is_theme "$ZSH_CUSTOM/themes" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
-  else
+  elif is_theme "$ZSH/themes" "$ZSH_THEME"; then
     source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  else
+    echo "[oh-my-zsh] theme '$ZSH_THEME' not found"
   fi
 fi

plugins/1password/1password.plugin.zsh

@@ -0,0 +1,9 @@
+# Do nothing if op is not installed
+(( ${+commands[op]} )) || return
+
+# Load op completion
+eval "$(op completion zsh)"
+compdef _op op
+
+# Load opswd function
+autoload -Uz opswd

plugins/1password/README.md

@@ -0,0 +1,38 @@
+# 1Password
+
+This plugin adds 1Password functionality to oh-my-zsh.
+
+To use, add `1password` to the list of plugins in your `.zshrc` file:
+
+```zsh
+plugins=(... 1password)
+```
+
+Then, you can use the command `opswd` to copy passwords for services into your
+clipboard.
+
+## `opswd`
+
+The `opswd` command is a wrapper around the `op` command. It takes a service
+name as an argument and copies the password for that service to the clipboard.
+
+If the service also contains a TOTP, it is copied to the clipboard after 10 seconds.
+Finally, after 20 seconds, the clipboard is cleared.
+
+The function has completion support, so you can use tab completion to select
+which service you want to get.
+
+For example, `opswd github.com` will put your GitHub password into your clipboard, and if
+a TOTP is available, it will be copied to the clipboard after 10 seconds.
+
+> NOTE: you need to be signed in for `opswd` to work. If you are using biometric unlock,
+> 1Password CLI will automatically prompt you to sign in. See:
+>
+> - [Get started with 1Password CLI 2: Sign in](https://developer.1password.com/docs/cli/get-started#sign-in)
+> - [Sign in to your 1Password account manually](https://developer.1password.com/docs/cli/sign-in-manually)
+
+## Requirements
+
+- [1Password CLI 2](https://developer.1password.com/docs/cli/get-started#install)
+
+  > NOTE: if you're using 1Password CLI 1, [see how to upgrade to CLI 2](https://developer.1password.com/docs/cli/upgrade).

plugins/1password/_opswd

@@ -0,0 +1,19 @@
+#compdef opswd
+
+function _opswd() {
+  local -a services
+  services=("${(@f)$(op item list --categories Login --cache 2>/dev/null | awk 'NR != 1 { print $2 }')}")
+  [[ -z "$services" ]] || compadd -a -- services
+}
+
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  function _opswd() {
+    local -a services
+    services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+    [[ -z "$services" ]] || compadd -a -- services
+  }
+}
+
+_opswd "$@"

plugins/1password/opswd

@@ -0,0 +1,78 @@
+#autoload
+
+# opswd puts the password of the named service into the clipboard. If there's a
+# one time password, it will be copied into the clipboard after 10 seconds. The
+# clipboard is cleared after another 20 seconds.
+function opswd() {
+  if [[ $# -lt 1 ]]; then
+    echo "Usage: opswd <service>"
+    return 1
+  fi
+
+  local service=$1
+
+  # If not logged in, print error and return
+  op user list > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op item get "$service" --fields password 2>/dev/null); then
+    echo "error: could not obtain password for $service"
+    return 1
+  fi
+
+  echo -n "$password" | clipcopy
+  echo "✔ password for $service copied to clipboard"
+
+  # If there's a one time password, copy it to the clipboard after 10 seconds
+  local totp
+  if totp=$(op item get --otp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+    sleep 10 && echo -n "$totp" | clipcopy
+    echo "✔ TOTP for $service copied to clipboard"
+  fi
+
+  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+}
+
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  print -ru2 ${(%):-"%F{yellow}opswd: usage with op version $(op --version) is deprecated. Upgrade to CLI 2 and reload zsh.
+For instructions, see https://developer.1password.com/docs/cli/upgrade.%f"}
+
+  # opswd puts the password of the named service into the clipboard. If there's a
+  # one time password, it will be copied into the clipboard after 10 seconds. The
+  # clipboard is cleared after another 20 seconds.
+  function opswd() {
+    if [[ $# -lt 1 ]]; then
+      echo "Usage: opswd <service>"
+      return 1
+    fi
+
+    local service=$1
+
+    # If not logged in, print error and return
+    op list users > /dev/null || return
+
+    local password
+    # Copy the password to the clipboard
+    if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+      echo "error: could not obtain password for $service"
+      return 1
+    fi
+
+    echo -n "$password" | clipcopy
+    echo "✔ password for $service copied to clipboard"
+
+    # If there's a one time password, copy it to the clipboard after 5 seconds
+    local totp
+    if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+      sleep 10 && echo -n "$totp" | clipcopy
+      echo "✔ TOTP for $service copied to clipboard"
+    fi
+
+    (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+  }
+}
+
+opswd "$@"

plugins/ag/README.md

@@ -0,0 +1,13 @@
+# The Silver Searcher
+
+This plugin provides completion support for [`ag`](https://github.com/ggreer/the_silver_searcher).
+
+To use it, add ag to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... ag)
+```
+
+## INSTALLATION NOTES
+
+Besides oh-my-zsh, `ag` needs to be installed by following these steps: https://github.com/ggreer/the_silver_searcher#installing.

plugins/ag/_ag

@@ -0,0 +1,66 @@
+#compdef ag
+#autoload
+
+typeset -A opt_args
+
+# Took the liberty of not listing every option… specially aliases and -D
+_ag () {
+  local -a _1st_arguments
+  _1st_arguments=(
+    '--ackmate:Print results in AckMate-parseable format'
+    {'-A','--after'}':[LINES] Print lines after match (Default: 2)'
+    {'-B','--before'}':[LINES] Print lines before match (Default: 2)'
+    '--break:Print newlines between matches in different files'
+    '--nobreak:Do not print newlines between matches in different files'
+    {'-c','--count'}':Only print the number of matches in each file'
+    '--color:Print color codes in results (Default: On)'
+    '--nocolor:Do not print color codes in results'
+    '--color-line-number:Color codes for line numbers (Default: 1;33)'
+    '--color-match:Color codes for result match numbers (Default: 30;43)'
+    '--color-path:Color codes for path names (Default: 1;32)'
+    '--column:Print column numbers in results'
+    {'-H','--heading'}':Print file names (On unless searching a single file)'
+    '--noheading:Do not print file names (On unless searching a single file)'
+    '--line-numbers:Print line numbers even for streams'
+    {'-C','--context'}':[LINES] Print lines before and after matches (Default: 2)'
+    '-g:[PATTERN] Print filenames matching PATTERN'
+    {'-l','--files-with-matches'}':Only print filenames that contain matches'
+    {'-L','--files-without-matches'}':Only print filenames that do not contain matches'
+    '--no-numbers:Do not print line numbers'
+    {'-o','--only-matching'}':Prints only the matching part of the lines'
+    '--print-long-lines:Print matches on very long lines (Default: 2k characters)'
+    '--passthrough:When searching a stream, print all lines even if they do not match'
+    '--silent:Suppress all log messages, including errors'
+    '--stats:Print stats (files scanned, time taken, etc.)'
+    '--vimgrep:Print results like vim :vimgrep /pattern/g would'
+    {'-0','--null'}':Separate filenames with null (for "xargs -0")'
+
+    {'-a','--all-types'}':Search all files (does not include hidden files / .gitignore)'
+    '--depth:[NUM] Search up to NUM directories deep (Default: 25)'
+    {'-f','--follow'}':Follow symlinks'
+    {'-G','--file-search-regex'}':[PATTERN] Limit search to filenames matching PATTERN'
+    '--hidden:Search hidden files (obeys .*ignore files)'
+    {'-i','--ignore-case'}':Match case insensitively'
+    '--ignore:[PATTERN] Ignore files/directories matching PATTERN'
+    {'-m','--max-count'}':[NUM] Skip the rest of a file after NUM matches (Default: 10k)'
+    {'-p','--path-to-agignore'}':[PATH] Use .agignore file at PATH'
+    {'-Q','--literal'}':Do not parse PATTERN as a regular expression'
+    {'-s','--case-sensitive'}':Match case'
+    {'-S','--smart-case'}':Insensitive match unless PATTERN has uppercase (Default: On)'
+    '--search-binary:Search binary files for matches'
+    {'-t','--all-text'}':Search all text files (Hidden files not included)'
+    {'-u','--unrestricted'}':Search all files (ignore .agignore and _all_)'
+    {'-U','--skip-vcs-ignores'}':Ignore VCS files (stil obey .agignore)'
+    {'-v','--invert-match'}':Invert match'
+    {'-w','--word-regexp'}':Only match whole words'
+    {'-z','--search-zip'}':Search contents of compressed (e.g., gzip) files'
+
+    '--list-file-types:list of supported file types'
+  )
+
+  if [[ $words[-1] =~ "^-" ]]; then
+    _describe -t commands "ag options" _1st_arguments && ret=0
+  else
+    _files && ret=0
+  fi
+}

plugins/aliases/.gitignore

@@ -0,0 +1 @@
+__pycache__

plugins/aliases/README.md

@@ -0,0 +1,28 @@
+# Aliases cheatsheet
+
+**Maintainer:** [@hqingyi](https://github.com/hqingyi)
+
+With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
+that are currently available based on the plugins you have enabled.
+
+To use it, add `aliases` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(aliases)
+```
+
+Requirements: Python needs to be installed.
+
+## Usage
+
+- `acs`: show all aliases by group.
+
+- `acs -h/--help`: print help mesage.
+
+- `acs <keyword>`: filter aliases by `<keyword>` and highlight.
+
+- `acs -g <group>/--group <group`: show only aliases for group `<group>`. Multiple uses of the flag show all groups,
+
+- `acs --groups-only`: show only group names
+
+  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)

plugins/aliases/aliases.plugin.zsh

@@ -0,0 +1,14 @@
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+eval '
+  function acs(){
+    (( $+commands[python3] )) || {
+      echo "[error] No python executable detected"
+      return
+    }
+    alias | python3 "'"${0:h}"'/cheatsheet.py" "$@"
+  }
+'

plugins/aliases/cheatsheet.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import sys
+import itertools
+import termcolor
+import argparse
+
+def parse(line):
+    left = line[0:line.find('=')].strip()
+    right = line[line.find('=')+1:].strip('\'"\n ')
+    try:
+        cmd = next(part for part in right.split() if len([char for char in '=<>' if char in part])==0)
+    except StopIteration:
+        cmd = right
+    return (left, right, cmd)
+
+def cheatsheet(lines):
+    exps = [ parse(line) for line in lines ]
+    cheatsheet = {'_default': []}
+    for key, group in itertools.groupby(exps, lambda exp:exp[2]):
+        group_list = [ item for item in group ]
+        if len(group_list)==1:
+            target_aliases = cheatsheet['_default']
+        else:
+            if key not in cheatsheet:
+                cheatsheet[key] = []
+            target_aliases = cheatsheet[key]
+        target_aliases.extend(group_list)
+    return cheatsheet
+
+def pretty_print_group(key, aliases, highlight=None, only_groupname=False):
+    if len(aliases) == 0:
+        return
+    group_hl_formatter = lambda g, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'red') for part in ('[%s]' % g).split(hl)])
+    alias_hl_formatter = lambda alias, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'green') for part in ('\t%s = %s' % alias[0:2]).split(hl)])
+    group_formatter = lambda g: termcolor.colored('[%s]' % g, 'red')
+    alias_formatter = lambda alias: termcolor.colored('\t%s = %s' % alias[0:2], 'green')
+    if highlight and len(highlight)>0:
+        print (group_hl_formatter(key, highlight))
+        if not only_groupname:
+            print ('\n'.join([alias_hl_formatter(alias, highlight) for alias in aliases]))
+    else:
+        print (group_formatter(key))
+        if not only_groupname:
+            print ('\n'.join([alias_formatter(alias) for alias in aliases]))
+    print ('')
+
+def pretty_print(cheatsheet, wfilter, group_list=None, groups_only=False):
+    sorted_key = sorted(cheatsheet.keys())
+    for key in sorted_key:
+        if group_list and key not in group_list:
+            continue
+        aliases = cheatsheet.get(key)
+        if not wfilter:
+            pretty_print_group(key, aliases, wfilter, groups_only)
+        else:
+            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.")
+    parser.add_argument('filter', nargs="*", help="search aliases matching string")
+    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")
+    args = parser.parse_args()
+
+    lines = sys.stdin.readlines()
+    group_list = args.group_list or None
+    wfilter = " ".join(args.filter) or None
+    pretty_print(cheatsheet(lines), wfilter, group_list, args.groups_only)

plugins/aliases/termcolor.py

@@ -0,0 +1,168 @@
+# coding: utf-8
+# Copyright (c) 2008-2011 Volvox Development Team
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Konstantin Lepa <konstantin.lepa@gmail.com>
+
+"""ANSI Color formatting for output in terminal."""
+
+from __future__ import print_function
+import os
+
+
+__ALL__ = [ 'colored', 'cprint' ]
+
+VERSION = (1, 1, 0)
+
+ATTRIBUTES = dict(
+        list(zip([
+            'bold',
+            'dark',
+            '',
+            'underline',
+            'blink',
+            '',
+            'reverse',
+            'concealed'
+            ],
+            list(range(1, 9))
+            ))
+        )
+del ATTRIBUTES['']
+
+
+HIGHLIGHTS = dict(
+        list(zip([
+            'on_grey',
+            'on_red',
+            'on_green',
+            'on_yellow',
+            'on_blue',
+            'on_magenta',
+            'on_cyan',
+            'on_white'
+            ],
+            list(range(40, 48))
+            ))
+        )
+
+
+COLORS = dict(
+        list(zip([
+            'grey',
+            'red',
+            'green',
+            'yellow',
+            'blue',
+            'magenta',
+            'cyan',
+            'white',
+            ],
+            list(range(30, 38))
+            ))
+        )
+
+
+RESET = '\033[0m'
+
+
+def colored(text, color=None, on_color=None, attrs=None):
+    """Colorize text.
+
+    Available text colors:
+        red, green, yellow, blue, magenta, cyan, white.
+
+    Available text highlights:
+        on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan, on_white.
+
+    Available attributes:
+        bold, dark, underline, blink, reverse, concealed.
+
+    Example:
+        colored('Hello, World!', 'red', 'on_grey', ['blue', 'blink'])
+        colored('Hello, World!', 'green')
+    """
+    if os.getenv('ANSI_COLORS_DISABLED') is None:
+        fmt_str = '\033[%dm%s'
+        if color is not None:
+            text = fmt_str % (COLORS[color], text)
+
+        if on_color is not None:
+            text = fmt_str % (HIGHLIGHTS[on_color], text)
+
+        if attrs is not None:
+            for attr in attrs:
+                text = fmt_str % (ATTRIBUTES[attr], text)
+
+        text += RESET
+    return text
+
+
+def cprint(text, color=None, on_color=None, attrs=None, **kwargs):
+    """Print colorize text.
+
+    It accepts arguments of print function.
+    """
+
+    print((colored(text, color, on_color, attrs)), **kwargs)
+
+
+if __name__ == '__main__':
+    print('Current terminal type: %s' % os.getenv('TERM'))
+    print('Test basic colors:')
+    cprint('Grey color', 'grey')
+    cprint('Red color', 'red')
+    cprint('Green color', 'green')
+    cprint('Yellow color', 'yellow')
+    cprint('Blue color', 'blue')
+    cprint('Magenta color', 'magenta')
+    cprint('Cyan color', 'cyan')
+    cprint('White color', 'white')
+    print(('-' * 78))
+
+    print('Test highlights:')
+    cprint('On grey color', on_color='on_grey')
+    cprint('On red color', on_color='on_red')
+    cprint('On green color', on_color='on_green')
+    cprint('On yellow color', on_color='on_yellow')
+    cprint('On blue color', on_color='on_blue')
+    cprint('On magenta color', on_color='on_magenta')
+    cprint('On cyan color', on_color='on_cyan')
+    cprint('On white color', color='grey', on_color='on_white')
+    print('-' * 78)
+
+    print('Test attributes:')
+    cprint('Bold grey color', 'grey', attrs=['bold'])
+    cprint('Dark red color', 'red', attrs=['dark'])
+    cprint('Underline green color', 'green', attrs=['underline'])
+    cprint('Blink yellow color', 'yellow', attrs=['blink'])
+    cprint('Reversed blue color', 'blue', attrs=['reverse'])
+    cprint('Concealed Magenta color', 'magenta', attrs=['concealed'])
+    cprint('Bold underline reverse cyan color', 'cyan',
+            attrs=['bold', 'underline', 'reverse'])
+    cprint('Dark blink concealed white color', 'white',
+            attrs=['dark', 'blink', 'concealed'])
+    print(('-' * 78))
+
+    print('Test mixing:')
+    cprint('Underline red on grey color', 'red', 'on_grey',
+            ['underline'])
+    cprint('Reversed green on red color', 'green', 'on_red', ['reverse'])
+

plugins/ansible/ansible.plugin.zsh

@@ -4,7 +4,7 @@ function ansible-version(){
 }
 
 function ansible-role-init(){
-    if ! [ -z $1] ; then
+    if ! [ -z $1 ] ; then
         echo "Ansible Role : $1 Creating...."
         ansible-galaxy init $1
         tree $1
@@ -25,4 +25,4 @@ alias ainv='ansible-inventory '
 alias adoc='ansible-doc '
 alias agal='ansible-galaxy '
 alias apull='ansible-pull '
-alias aval='ansible-vault'
+alias aval='ansible-vault'

plugins/ant/README.md

@@ -2,9 +2,9 @@
 
 This plugin provides completion for [Ant](https://ant.apache.org/).
 
-To use it add ant to the plugins array in your zshrc file.
+To use it, add `ant` to the plugins array in your zshrc file:
 
-```bash
+```zsh
 plugins=(... ant)
 ```
 

plugins/ant/_ant

@@ -0,0 +1,22 @@
+#compdef ant
+
+_ant_does_target_list_need_generating () {
+  [[ ! -f .ant_targets ]] && return 0
+  [[ build.xml -nt .ant_targets ]] && return 0
+  return 1
+}
+
+_ant () {
+  if [[ ! -f build.xml ]]; then
+    return
+  fi
+
+  if ! _ant_does_target_list_need_generating; then
+    return
+  fi
+
+  ant -p | awk -F " " 'NR > 5 { print lastTarget } { lastTarget = $1 }' >| .ant_targets
+  compadd -- "$(cat .ant_targets)"
+}
+
+_ant "$@"

plugins/ant/ant.plugin.zsh

@@ -1,16 +1,2 @@
-_ant_does_target_list_need_generating () {
-  [ ! -f .ant_targets ] && return 0;
-  [ build.xml -nt .ant_targets ] && return 0;
-  return 1;
-}
-
-_ant () {
-  if [ -f build.xml ]; then
-    if _ant_does_target_list_need_generating; then
-    	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
-    fi
-    compadd -- `cat .ant_targets`
-  fi
-}
-
-compdef _ant ant
+# Default to colored output
+export ANT_ARGS='-logger org.apache.tools.ant.listener.AnsiColorLogger'

plugins/arcanist/README.md

@@ -14,6 +14,7 @@ plugins=(... arcanist)
 | ------- | ---------------------------------- |
 | ara     | `arc amend`                        |
 | arb     | `arc branch`                       |
+| arbl    | `arc bland`                        |
 | arco    | `arc cover`                        |
 | arci    | `arc commit`                       |
 | ard     | `arc diff`                         |
@@ -24,6 +25,7 @@ plugins=(... arcanist)
 | ardpc   | `arc diff --plan-changes`          |
 | are     | `arc export`                       |
 | arh     | `arc help`                         |
+| arho    | `arc hotfix`                       |
 | arl     | `arc land`                         |
 | arli    | `arc lint`                         |
 | arls    | `arc list`                         |

plugins/arcanist/arcanist.plugin.zsh

@@ -5,6 +5,7 @@
 
 alias ara='arc amend'
 alias arb='arc branch'
+alias arbl='arc bland'
 alias arco='arc cover'
 alias arci='arc commit'
 
@@ -17,6 +18,7 @@ alias ardp='arc diff --preview' # creates a new diff in the phab interface
 
 alias are='arc export'
 alias arh='arc help'
+alias arho='arc hotfix'
 alias arl='arc land'
 alias arli='arc lint'
 alias arls='arc list'

plugins/archlinux/README.md

@@ -1,4 +1,4 @@
-# Archlinux plugin
+# Arch Linux plugin
 
 This plugin adds some aliases and functions to work with Arch Linux.
 
@@ -10,145 +10,174 @@ plugins=(... archlinux)
 
 ## Features
 
-#### YAY
+### Pacman
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| yaconf  | yay -Pg                            | Print current configuration                                         |
-| yain    | yay -S                             | Install packages from the repositories                              |
-| yains   | yay -U                             | Install a package from a local file                                 |
-| yainsd  | yay -S --asdeps                    | Install packages as dependencies of another package                 |
-| yaloc   | yay -Qi                            | Display information about a package in the local database           |
-| yalocs  | yay -Qs                            | Search for packages in the local database                           |
-| yalst   | yay -Qe                            | List installed packages including from AUR (tagged as "local")      |
-| yamir   | yay -Syy                           | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yay -Qtd                           | Remove orphans using yay                                            |
-| yare    | yay -R                             | Remove packages, keeping its settings and dependencies              |
-| yarem   | yay -Rns                           | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | yay -Si                            | Display information about a package in the repositories             |
-| yareps  | yay -Ss                            | Search for packages in the repositories                             |
-| yaupg   | yay -Syu                           | Sync with repositories before upgrading packages                    |
-| yasu    | yay -Syu --no-confirm              | Same as `yaupg`, but without confirmation                           |
+| Alias        | Command                                | Description                                                      |
+|--------------|----------------------------------------|------------------------------------------------------------------|
+| pacin        | `sudo pacman -S`                       | Install packages from the repositories                           |
+| pacins       | `sudo pacman -U`                       | Install a package from a local file                              |
+| pacinsd      | `sudo pacman -S --asdeps`              | Install packages as dependencies of another package              |
+| paclean      | `sudo pacman -Sc`                      | Clean out old and unused caches and packages                     |
+| pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
+| paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
+| paclr        | `sudo pacman -Scc`                     | Remove all files from the cache                                  |
+| paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
+| pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
+| pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
+| pacrem       | `sudo pacman -Rns`                     | Remove packages, including its settings and dependencies         |
+| pacrep       | `pacman -Si`                           | Display information about a package in the repositories          |
+| pacreps      | `pacman -Ss`                           | Search for packages in the repositories                          |
+| pacrmorphans | `sudo pacman -Rs $(pacman -Qtdq)`      | Delete all orphaned packages                                     |
+| pacupd       | `sudo pacman -Sy`                      | Update and refresh local package, ABS and AUR databases          |
+| pacupg       | `sudo pacman -Syu`                     | Sync with repositories before upgrading packages                 |
+| pacfileupg   | `sudo pacman -Fy`                      | Download fresh package databases from the server                 |
+| pacfiles     | `pacman -F`                            | Search package file names for matching strings                   |
+| pacls        | `pacman -Ql`                           | List files in a package                                          |
+| pacown       | `pacman -Qo`                           | Show which package owns a file                                   |
+| upgrade[¹](#f1) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
-#### TRIZEN
+| Function       | Description                                               |
+|----------------|-----------------------------------------------------------|
+| pacdisowned    | List all disowned files in your system                    |
+| paclist        | List all explicitly installed packages with a description |
+| pacmanallkeys  | Get all keys for developers and trusted users             |
+| pacmansignkeys | Locally trust all keys passed as parameters               |
+| pacweb         | Open the website of an ArchLinux package                  |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| trconf  | trizen -C                          | Fix all configuration files with vimdiff                            |
-| trin    | trizen -S                          | Install packages from the repositories                              |
-| trins   | trizen -U                          | Install a package from a local file                                 |
-| trinsd  | trizen -S --asdeps                 | Install packages as dependencies of another package                 |
-| trloc   | trizen -Qi                         | Display information about a package in the local database           |
-| trlocs  | trizen -Qs                         | Search for packages in the local database                           |
-| trlst   | trizen -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| trmir   | trizen -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| trorph  | trizen -Qtd                        | Remove orphans using yaourt                                         |
-| trre    | trizen -R                          | Remove packages, keeping its settings and dependencies              |
-| trrem   | trizen -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| trrep   | trizen -Si                         | Display information about a package in the repositories             |
-| trreps  | trizen -Ss                         | Search for packages in the repositories                             |
-| trupd   | trizen -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| trupd   | trizen -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| trupd   | trizen -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| trupd   | trizen -Sy                         | Update and refresh the local package database                       |
-| trupg   | trizen -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| trsu    | trizen -Syua --no-confirm          | Same as `trupg`, but without confirmation                           |
-| upgrade | trizen -Syu                        | Sync with repositories before upgrading packages                    |
+Note: paclist used to print packages with a description which are (1) explicitly installed
+and (2) available for upgrade. Due to flawed scripting, it also printed all packages if no
+upgrades were available. Use `pacman -Que` instead.
 
-#### YAOURT
+### AUR helpers
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| yaconf  | yaourt -C                          | Fix all configuration files with vimdiff                            |
-| yain    | yaourt -S                          | Install packages from the repositories                              |
-| yains   | yaourt -U                          | Install a package from a local file                                 |
-| yainsd  | yaourt -S --asdeps                 | Install packages as dependencies of another package                 |
-| yaloc   | yaourt -Qi                         | Display information about a package in the local database           |
-| yalocs  | yaourt -Qs                         | Search for packages in the local database                           |
-| yalst   | yaourt -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| yamir   | yaourt -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yaourt -Qtd                        | Remove orphans using yaourt                                         |
-| yare    | yaourt -R                          | Remove packages, keeping its settings and dependencies              |
-| yarem   | yaourt -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | yaourt -Si                         | Display information about a package in the repositories             |
-| yareps  | yaourt -Ss                         | Search for packages in the repositories                             |
-| yaupd   | yaourt -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| yaupd   | yaourt -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| yaupd   | yaourt -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| yaupd   | yaourt -Sy                         | Update and refresh the local package database                       |
-| yaupg   | yaourt -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
-| upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
+#### Aura
 
-#### PACAUR
+| Alias   | Command                                         | Description                                                             |
+|---------|-------------------------------------------------|-------------------------------------------------------------------------|
+| auclean | `sudo aura -Sc`                                 | Clean out old and unused caches and packages                            |
+| auclr   | `sudo aura -Scc`                                | Remove all files from the cache                                         |
+| auin    | `sudo aura -S`                                  | Install packages from the repositories                                  |
+| aurin   | `sudo aura -A`                                  | Install packages from the repositories                                  |
+| auins   | `sudo aura -U`                                  | Install a package from a local file                                     |
+| auinsd  | `sudo aura -S --asdeps`                         | Install packages as dependencies of another package (repositories only) |
+| aurinsd | `sudo aura -A --asdeps`                         | Install packages as dependencies of another package (AUR only)          |
+| auloc   | `aura -Qi`                                      | Display information about a package in the local database               |
+| aulocs  | `aura -Qs`                                      | Search for packages in the local database                               |
+| auls    | `aura -Qql`                                     | List all files owned by a given package                                 |
+| aulst   | `aura -Qe`                                      | List installed packages including from AUR (tagged as "local")          |
+| aumir   | `sudo aura -Syy`                                | Force refresh of all package lists after updating mirrorlist            |
+| aurph   | `sudo aura -Oj`                                 | Remove orphans using aura                                               |
+| auown   | `aura -Qqo`                                     | Search for packages that own the specified file(s)                      |
+| aure    | `sudo aura -R`                                  | Remove packages, keeping its settings and dependencies                  |
+| aurem   | `sudo aura -Rns`                                | Remove packages, including its settings and unneeded dependencies       |
+| aurep   | `aura -Si`                                      | Display information about a package in the repositories                 |
+| aurrep  | `aura -Ai`                                      | Display information about a package from AUR                            |
+| aureps  | `aura -As --both`                               | Search for packages in the repositories and AUR                         |
+| auras   | `aura -As --both`                               | Same as above                                                           |
+| auupd   | `sudo aura -Sy`                                 | Update and refresh local package, ABS and AUR databases                 |
+| auupg   | `sudo sh -c "aura -Syu              && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too)   |
+| ausu    | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation                |
+| upgrade[¹](#f1) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| pain    | pacaur -S                          | Install packages from the repositories                              |
-| pains   | pacaur -U                          | Install a package from a local file                                 |
-| painsd  | pacaur -S --asdeps                 | Install packages as dependencies of another package                 |
-| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
-| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
-| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
-| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
-| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| parep   | pacaur -Si                         | Display information about a package in the repositories             |
-| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
-| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
-| paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
-| upgrade | pacaur -Syu                        | Sync with repositories before upgrading packages                    |
+| Function        | Description                                                         |
+|-----------------|---------------------------------------------------------------------|
+| auownloc _file_ | Display information about a package that owns the specified file(s) |
+| auownls  _file_ | List all files owned by a package that owns the specified file(s)   |
 
-#### PACMAN
+#### Pacaur
 
-| Alias        | Command                                 | Description                                                  |
-|--------------|-----------------------------------------|--------------------------------------------------------------|
-| pacin        | sudo pacman -S                          | Install packages from the repositories                       |
-| pacins       | sudo pacman -U                          | Install a package from a local file                          |
-| pacinsd      | sudo pacman -S --asdeps                 | Install packages as dependencies of another package          |
-| pacloc       | pacman -Qi                              | Display information about a package in the local database    |
-| paclocs      | pacman -Qs                              | Search for packages in the local database                    |
-| paclsorphans | sudo pacman -Qdt                        | List all orphaned packages                                   |
-| pacmir       | sudo pacman -Syy                        | Force refresh of all package lists after updating mirrorlist |
-| pacre        | sudo pacman -R                          | Remove packages, keeping its settings and dependencies       |
-| pacrem       | sudo pacman -Rns                        | Remove packages, including its settings and dependencies     |
-| pacrep       | pacman -Si                              | Display information about a package in the repositories      |
-| pacreps      | pacman -Ss                              | Search for packages in the repositories                      |
-| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)         | Delete all orphaned packages                                 |
-| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases  |
-| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases       |
-| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases       |
-| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
-| pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
-| pacfiles     | pacman -F                               | Search package file names for matching strings               |
-| pacls        | pacman -Ql                              | List files in a package                                      |
-| pacown       | pacman -Qo                              | Show which package owns a file                               |
+| Alias   | Command                           | Description                                                         |
+|---------|-----------------------------------|---------------------------------------------------------------------|
+| pacclean| `pacaur -Sc`                      | Clean out old and unused caches and packages                        |
+| pacclr  | `pacaur -Scc`                     | Remove all files from the cache                                     |
+| pain    | `pacaur -S`                       | Install packages from the repositories                              |
+| pains   | `pacaur -U`                       | Install a package from a local file                                 |
+| painsd  | `pacaur -S --asdeps`              | Install packages as dependencies of another package                 |
+| paloc   | `pacaur -Qi`                      | Display information about a package in the local database           |
+| palocs  | `pacaur -Qs`                      | Search for packages in the local database                           |
+| palst   | `pacaur -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| pamir   | `pacaur -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| paorph  | `pacaur -Qtd`                     | Remove orphans using pacaur                                         |
+| pare    | `pacaur -R`                       | Remove packages, keeping its settings and dependencies              |
+| parem   | `pacaur -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| parep   | `pacaur -Si`                      | Display information about a package in the repositories             |
+| pareps  | `pacaur -Ss`                      | Search for packages in the repositories                             |
+| paupd   | `pacaur -Sy`                      | Update and refresh local package, ABS and AUR databases             |
+| paupg   | `pacaur -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
+| pasu    | `pacaur -Syua --no-confirm`       | Same as `paupg`, but without confirmation                           |
+| upgrade[¹](#f1) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
-| Function       | Description                                          |
-|----------------|------------------------------------------------------|
-| pacdisowned    | List all disowned files in your system               |
-| paclist        | List all installed packages with a short description |
-| pacmanallkeys  | Get all keys for developers and trusted users        |
-| pacmansignkeys | Locally trust all keys passed as parameters          |
-| pacweb         | Open the website of an ArchLinux package             |
+#### Trizen
+
+| Alias   | Command                           | Description                                                         |
+|---------|-----------------------------------|---------------------------------------------------------------------|
+| trconf  | `trizen -C`                       | Fix all configuration files with vimdiff                            |
+| trclean | `trizen -Sc`                      | Clean out old and unused caches and packages                        |
+| trclr   | `trizen -Scc`                     | Remove all files from the cache                                     |
+| trin    | `trizen -S`                       | Install packages from the repositories                              |
+| trins   | `trizen -U`                       | Install a package from a local file                                 |
+| trinsd  | `trizen -S --asdeps`              | Install packages as dependencies of another package                 |
+| trloc   | `trizen -Qi`                      | Display information about a package in the local database           |
+| trlocs  | `trizen -Qs`                      | Search for packages in the local database                           |
+| trlst   | `trizen -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| trmir   | `trizen -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| trorph  | `trizen -Qtd`                     | Remove orphans using yaourt                                         |
+| trre    | `trizen -R`                       | Remove packages, keeping its settings and dependencies              |
+| trrem   | `trizen -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| trrep   | `trizen -Si`                      | Display information about a package in the repositories             |
+| trreps  | `trizen -Ss`                      | Search for packages in the repositories                             |
+| trupd   | `trizen -Sy`                      | Update and refresh local package, ABS and AUR databases             |
+| trupg   | `trizen -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
+| trsu    | `trizen -Syua --no-confirm`       | Same as `trupg`, but without confirmation                           |
+| upgrade[¹](#f1) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
+
+#### Yay
+
+| Alias   | Command                        | Description                                                       |
+|---------|--------------------------------|-------------------------------------------------------------------|
+| yaconf  | `yay -Pg`                      | Print current configuration                                       |
+| yaclean | `yay -Sc`                      | Clean out old and unused caches and packages                      |
+| yaclr   | `yay -Scc`                     | Remove all files from the cache                                   |
+| yain    | `yay -S`                       | Install packages from the repositories                            |
+| yains   | `yay -U`                       | Install a package from a local file                               |
+| yainsd  | `yay -S --asdeps`              | Install packages as dependencies of another package               |
+| yaloc   | `yay -Qi`                      | Display information about a package in the local database         |
+| yalocs  | `yay -Qs`                      | Search for packages in the local database                         |
+| yalst   | `yay -Qe`                      | List installed packages including from AUR (tagged as "local")    |
+| yamir   | `yay -Syy`                     | Force refresh of all package lists after updating mirrorlist      |
+| yaorph  | `yay -Qtd`                     | Remove orphans using yay                                          |
+| yare    | `yay -R`                       | Remove packages, keeping its settings and dependencies            |
+| yarem   | `yay -Rns`                     | Remove packages, including its settings and unneeded dependencies |
+| yarep   | `yay -Si`                      | Display information about a package in the repositories           |
+| yareps  | `yay -Ss`                      | Search for packages in the repositories                           |
+| yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
+| yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
+| yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
+| upgrade[¹](#f1) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
+<span id="f1">¹</span>
+The `upgrade` alias is set for all package managers. Its value will depend on
+whether the package manager is installed, checked in the following order:
+
+1. `yay`
+2. `trizen`
+3. `pacaur`
+4. `aura`
+5. `pacman`
+
 ## Contributors
 
 - Benjamin Boudreau - dreurmail@gmail.com
 - Celso Miranda - contacto@celsomiranda.net
+- ratijas (ivan tkachenko) - me@ratijas.tk
+- Juraj Fiala - doctorjellyface@riseup.net
 - KhasMek - Boushh@gmail.com
+- Majora320 (Moses Miller) - Majora320@gmail.com
 - Martin Putniorz - mputniorz@gmail.com
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
-- Juraj Fiala - doctorjellyface@riseup.net
-- Majora320 (Moses Miller) - Majora320@gmail.com
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
+- Jeff M. Hubbard - jeffmhubbard@gmail.com
+- K. Harishankar(harishnkr) - hari2menon1234@gmail.com

plugins/archlinux/archlinux.plugin.zsh

@@ -1,143 +1,13 @@
-if (( $+commands[trizen] )); then
-  alias trconf='trizen -C'
-  alias trupg='trizen -Syua'
-  alias trsu='trizen -Syua --noconfirm'
-  alias trin='trizen -S'
-  alias trins='trizen -U'
-  alias trre='trizen -R'
-  alias trrem='trizen -Rns'
-  alias trrep='trizen -Si'
-  alias trreps='trizen -Ss'
-  alias trloc='trizen -Qi'
-  alias trlocs='trizen -Qs'
-  alias trlst='trizen -Qe'
-  alias trorph='trizen -Qtd'
-  alias trinsd='trizen -S --asdeps'
-  alias trmir='trizen -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias trupd='trizen -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo aur'
-  else
-    alias trupd='trizen -Sy'
-  fi
-fi
-
-if (( $+commands[yaourt] )); then
-  alias yaconf='yaourt -C'
-  alias yaupg='yaourt -Syua'
-  alias yasu='yaourt -Syua --noconfirm'
-  alias yain='yaourt -S'
-  alias yains='yaourt -U'
-  alias yare='yaourt -R'
-  alias yarem='yaourt -Rns'
-  alias yarep='yaourt -Si'
-  alias yareps='yaourt -Ss'
-  alias yaloc='yaourt -Qi'
-  alias yalocs='yaourt -Qs'
-  alias yalst='yaourt -Qe'
-  alias yaorph='yaourt -Qtd'
-  alias yainsd='yaourt -S --asdeps'
-  alias yamir='yaourt -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yaourt -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo aur'
-  else
-    alias yaupd='yaourt -Sy'
-  fi
-fi
-
-if (( $+commands[yay] )); then
-  alias yaconf='yay -Pg'
-  alias yaupg='yay -Syu'
-  alias yasu='yay -Syu --noconfirm'
-  alias yain='yay -S'
-  alias yains='yay -U'
-  alias yare='yay -R'
-  alias yarem='yay -Rns'
-  alias yarep='yay -Si'
-  alias yareps='yay -Ss'
-  alias yaloc='yay -Qi'
-  alias yalocs='yay -Qs'
-  alias yalst='yay -Qe'
-  alias yaorph='yay -Qtd'
-  alias yainsd='yay -S --asdeps'
-  alias yamir='yay -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yay -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo aur'
-  else
-    alias yaupd='yay -Sy'
-  fi
-fi
-
-if (( $+commands[pacaur] )); then
-  alias paupg='pacaur -Syu'
-  alias pasu='pacaur -Syu --noconfirm'
-  alias pain='pacaur -S'
-  alias pains='pacaur -U'
-  alias pare='pacaur -R'
-  alias parem='pacaur -Rns'
-  alias parep='pacaur -Si'
-  alias pareps='pacaur -Ss'
-  alias paloc='pacaur -Qi'
-  alias palocs='pacaur -Qs'
-  alias palst='pacaur -Qe'
-  alias paorph='pacaur -Qtd'
-  alias painsd='pacaur -S --asdeps'
-  alias pamir='pacaur -Syy'
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias paupd='pacaur -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo aur'
-  else
-    alias paupd='pacaur -Sy'
-  fi
-fi
-
-if (( $+commands[trizen] )); then
-  function upgrade() {
-    trizen -Syu
-  }
-elif (( $+commands[pacaur] )); then
-  function upgrade() {
-    pacaur -Syu
-  }
-elif (( $+commands[yaourt] )); then
-  function upgrade() {
-    yaourt -Syu
-  }
-elif (( $+commands[yay] )); then
-  function upgrade() {
-    yay -Syu
-  }
-else
-  function upgrade() {
-    sudo pacman -Syu
-  }
-fi
+#######################################
+#               Pacman                #
+#######################################
 
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'
+alias paclean='sudo pacman -Sc'
 alias pacins='sudo pacman -U'
+alias paclr='sudo pacman -Scc'
 alias pacre='sudo pacman -R'
 alias pacrem='sudo pacman -Rns'
 alias pacrep='pacman -Si'
@@ -152,33 +22,24 @@ alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
-
-
-if (( $+commands[abs] && $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'
-elif (( $+commands[abs] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs'
-elif (( $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo aur'
-else
-  alias pacupd='sudo pacman -Sy'
-fi
+alias pacupd="sudo pacman -Sy"
+alias upgrade='sudo pacman -Syu'
 
 function paclist() {
-  # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
-  LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
-    awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
+  # 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}" '{}'
 }
 
 function pacdisowned() {
-  emulate -L zsh
-
+  local tmp db fs
   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
   db=$tmp/db
   fs=$tmp/fs
 
   mkdir "$tmp"
-  trap  'rm -rf "$tmp"' EXIT
+  trap 'rm -rf "$tmp"' EXIT
 
   pacman -Qlq | sort -u > "$db"
 
@@ -188,16 +49,11 @@ function pacdisowned() {
   comm -23 "$fs" "$db"
 }
 
-function pacmanallkeys() {
-  emulate -L zsh
-  curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
-    awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
-    xargs sudo pacman-key --recv-keys
-}
+alias pacmanallkeys='sudo pacman-key --refresh-keys'
 
 function pacmansignkeys() {
-  emulate -L zsh
-  for key in $*; do
+  local key
+  for key in $@; do
     sudo pacman-key --recv-keys $key
     sudo pacman-key --lsign-key $key
     printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg \
@@ -207,13 +63,122 @@ function pacmansignkeys() {
 
 if (( $+commands[xdg-open] )); then
   function pacweb() {
-    pkg="$1"
-    infos="$(LANG=C pacman -Si "$pkg")"
+    if [[ $# = 0 || "$1" =~ '--help|-h' ]]; then
+      local underline_color="\e[${color[underline]}m"
+      echo "$0 - open the website of an ArchLinux package"
+      echo
+      echo "Usage:"
+      echo "    $bold_color$0$reset_color ${underline_color}target${reset_color}"
+      return 1
+    fi
+
+    local pkg="$1"
+    local infos="$(LANG=C pacman -Si "$pkg")"
     if [[ -z "$infos" ]]; then
       return
     fi
-    repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
-    arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
+    local repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
+    local arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
     xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
   }
 fi
+
+#######################################
+#             AUR helpers             #
+#######################################
+
+if (( $+commands[aura] )); then
+  alias auin='sudo aura -S'
+  alias aurin='sudo aura -A'
+  alias auclean='sudo aura -Sc'
+  alias auclr='sudo aura -Scc'
+  alias auins='sudo aura -U'
+  alias auinsd='sudo aura -S --asdeps'
+  alias aurinsd='sudo aura -A --asdeps'
+  alias auloc='aura -Qi'
+  alias aulocs='aura -Qs'
+  alias aulst='aura -Qe'
+  alias aumir='sudo aura -Syy'
+  alias aurph='sudo aura -Oj'
+  alias aure='sudo aura -R'
+  alias aurem='sudo aura -Rns'
+  alias aurep='aura -Si'
+  alias aurrep='aura -Ai'
+  alias aureps='aura -As --both'
+  alias auras='aura -As --both'
+  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"
+  alias auls="aura -Qql"
+  function auownloc() { aura -Qi  $(aura -Qqo $@); }
+  function auownls () { aura -Qql $(aura -Qqo $@); }
+fi
+
+if (( $+commands[pacaur] )); then
+  alias pacclean='pacaur -Sc'
+  alias pacclr='pacaur -Scc'
+  alias paupg='pacaur -Syu'
+  alias pasu='pacaur -Syu --noconfirm'
+  alias pain='pacaur -S'
+  alias pains='pacaur -U'
+  alias pare='pacaur -R'
+  alias parem='pacaur -Rns'
+  alias parep='pacaur -Si'
+  alias pareps='pacaur -Ss'
+  alias paloc='pacaur -Qi'
+  alias palocs='pacaur -Qs'
+  alias palst='pacaur -Qe'
+  alias paorph='pacaur -Qtd'
+  alias painsd='pacaur -S --asdeps'
+  alias pamir='pacaur -Syy'
+  alias paupd="pacaur -Sy"
+  alias upgrade='pacaur -Syu'
+fi
+
+if (( $+commands[trizen] )); then
+  alias trconf='trizen -C'
+  alias trupg='trizen -Syua'
+  alias trsu='trizen -Syua --noconfirm'
+  alias trin='trizen -S'
+  alias trclean='trizen -Sc'
+  alias trclr='trizen -Scc'
+  alias trins='trizen -U'
+  alias trre='trizen -R'
+  alias trrem='trizen -Rns'
+  alias trrep='trizen -Si'
+  alias trreps='trizen -Ss'
+  alias trloc='trizen -Qi'
+  alias trlocs='trizen -Qs'
+  alias trlst='trizen -Qe'
+  alias trorph='trizen -Qtd'
+  alias trinsd='trizen -S --asdeps'
+  alias trmir='trizen -Syy'
+  alias trupd="trizen -Sy"
+  alias upgrade='trizen -Syu'
+fi
+
+if (( $+commands[yay] )); then
+  alias yaconf='yay -Pg'
+  alias yaclean='yay -Sc'
+  alias yaclr='yay -Scc'
+  alias yaupg='yay -Syu'
+  alias yasu='yay -Syu --noconfirm'
+  alias yain='yay -S'
+  alias yains='yay -U'
+  alias yare='yay -R'
+  alias yarem='yay -Rns'
+  alias yarep='yay -Si'
+  alias yareps='yay -Ss'
+  alias yaloc='yay -Qi'
+  alias yalocs='yay -Qs'
+  alias yalst='yay -Qe'
+  alias yaorph='yay -Qtd'
+  alias yainsd='yay -S --asdeps'
+  alias yamir='yay -Syy'
+  alias yaupd="yay -Sy"
+  alias upgrade='yay -Syu'
+fi

plugins/asdf/asdf.plugin.zsh

@@ -2,18 +2,26 @@
 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
-   ASDF_DIR="$(brew --prefix asdf)"
-   ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d"
+  brew_prefix="$(brew --prefix asdf)"
+  ASDF_DIR="${brew_prefix}/libexec"
+  ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d"
+  unset brew_prefix
 fi
 
 # Load command
 if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
-    . "$ASDF_DIR/asdf.sh"
+  . "$ASDF_DIR/asdf.sh"
 
-    # Load completions
-    if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
-        . "$ASDF_COMPLETIONS/asdf.bash"
-    fi
+  # Load completions
+  if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
+    . "$ASDF_COMPLETIONS/asdf.bash"
+  fi
 fi

plugins/autoenv/autoenv.plugin.zsh

@@ -13,6 +13,7 @@ if ! type autoenv_init >/dev/null; then
       ~/.autoenv
       ~/.local/bin
       /usr/local/opt/autoenv
+      /opt/homebrew/opt/autoenv
       /usr/local/bin
       /usr/share/autoenv-git
       ~/Library/Python/bin

plugins/autojump/autojump.plugin.zsh

@@ -8,8 +8,10 @@ autojump_paths=(
   /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)
 )
 
 for file in $autojump_paths; do

plugins/aws/README.md

@@ -14,6 +14,14 @@ plugins=(... aws)
 * `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.
   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. 
+
+* `acp [<profile>] [<mfa_token>]`: in addition to `asp` functionality, it actually changes
+   the profile by assuming the role specified in the `<profile>` configuration. It supports
+   MFA and sets `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if
+   obtained. It requires the roles to be configured as per the
+   [official guide](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-role.html).
+   Run `acp` without arguments to clear the profile.
 
 * `agp`: gets the current value of `$AWS_PROFILE`.
 
@@ -33,6 +41,36 @@ plugins=(... aws)
 The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
 the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
 
-- ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
+* ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
 
-- ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+* ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+
+## Configuration
+
+[Configuration and credential file settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) by AWS
+
+### Scenario: IAM roles with a source profile and MFA authentication
+
+Source profile credentials in `~/.aws/credentials`:
+
+```
+[source-profile-name]
+aws_access_key_id = ...
+aws_secret_access_key = ...
+```
+
+Role configuration in `~/.aws/config`:
+
+```
+[profile source-profile-name]
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+region = us-east-1
+output = json
+
+[profile profile-with-role]
+role_arn = arn:aws:iam::9999999999999:role/myrole
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+source_profile = source-profile-name
+region = us-east-1
+output = json
+```

plugins/aws/aws.plugin.zsh

@@ -21,6 +21,112 @@ function asp() {
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
   export AWS_EB_PROFILE=$1
+
+  if [[ "$2" == "login" ]]; then
+    aws sso login
+  fi
+}
+
+# AWS profile switch
+function acp() {
+  if [[ -z "$1" ]]; then
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
+    echo AWS profile cleared.
+    return
+  fi
+
+  local -a available_profiles
+  available_profiles=($(aws_profiles))
+  if [[ -z "${available_profiles[(r)$1]}" ]]; then
+    echo "${fg[red]}Profile '$1' not found in '${AWS_CONFIG_FILE:-$HOME/.aws/config}'" >&2
+    echo "Available profiles: ${(j:, :)available_profiles:-no profiles found}${reset_color}" >&2
+    return 1
+  fi
+
+  local profile="$1"
+  local mfa_token="$2"
+
+  # Get fallback credentials for if the aws command fails or no command is run
+  local aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"
+  local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $profile)"
+  local aws_session_token="$(aws configure get aws_session_token --profile $profile)"
+
+
+  # First, if the profile has MFA configured, lets get the token and session duration
+  local mfa_serial="$(aws configure get mfa_serial --profile $profile)"
+  local sess_duration="$(aws configure get duration_seconds --profile $profile)"
+
+  if [[ -n "$mfa_serial" ]]; then
+    local -a mfa_opt
+    if [[ -z "$mfa_token" ]]; then
+      echo -n "Please enter your MFA token for $mfa_serial: "
+      read -r mfa_token
+    fi
+    if [[ -z "$sess_duration" ]]; then
+      echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
+      read -r sess_duration
+    fi
+    mfa_opt=(--serial-number "$mfa_serial" --token-code "$mfa_token" --duration-seconds "${sess_duration:-3600}")
+  fi
+
+  # Now see whether we need to just MFA for the current role, or assume a different one
+  local role_arn="$(aws configure get role_arn --profile $profile)"
+  local sess_name="$(aws configure get role_session_name --profile $profile)"
+
+  if [[ -n "$role_arn" ]]; then
+    # Means we need to assume a specified role
+    aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
+
+    # Check whether external_id is configured to use while assuming the role
+    local external_id="$(aws configure get external_id --profile $profile)"
+    if [[ -n "$external_id" ]]; then
+      aws_command+=(--external-id "$external_id")
+    fi
+
+    # Get source profile to use to assume role
+    local source_profile="$(aws configure get source_profile --profile $profile)"
+    if [[ -z "$sess_name" ]]; then
+      sess_name="${source_profile:-profile}"
+    fi
+    aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
+
+    echo "Assuming role $role_arn using profile ${source_profile:-profile}"
+  else
+    # Means we only need to do MFA
+    aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
+    echo "Obtaining session token for profile $profile"
+  fi
+
+  # Format output of aws command for easier processing
+  aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
+
+  # Run the aws command to obtain credentials
+  local -a credentials
+  credentials=(${(ps:\t:)"$(${aws_command[@]})"})
+
+  if [[ -n "$credentials" ]]; then
+    aws_access_key_id="${credentials[1]}"
+    aws_secret_access_key="${credentials[2]}"
+    aws_session_token="${credentials[3]}"
+  fi
+
+  # Switch to AWS profile
+  if [[ -n "${aws_access_key_id}" && -n "$aws_secret_access_key" ]]; then
+    export AWS_DEFAULT_PROFILE="$profile"
+    export AWS_PROFILE="$profile"
+    export AWS_EB_PROFILE="$profile"
+    export AWS_ACCESS_KEY_ID="$aws_access_key_id"
+    export AWS_SECRET_ACCESS_KEY="$aws_secret_access_key"
+
+    if [[ -n "$aws_session_token" ]]; then
+      export AWS_SESSION_TOKEN="$aws_session_token"
+    else
+      unset AWS_SESSION_TOKEN
+    fi
+
+    echo "Switched to AWS Profile: $profile"
+  fi
 }
 
 function aws_change_access_key() {
@@ -29,33 +135,33 @@ function aws_change_access_key() {
     return 1
   fi
 
-  echo Insert the credentials when asked.
+  echo "Insert the credentials when asked."
   asp "$1" || return 1
   AWS_PAGER="" aws iam create-access-key
   AWS_PAGER="" aws configure --profile "$1"
 
-  echo You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`
-  echo Your current keys are:
+  echo "You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`"
+  echo "Your current keys are:"
   AWS_PAGER="" aws iam list-access-keys
 }
 
 function aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9@_\.-]*\).*/\1/'
+  grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }
 
 function _aws_profiles() {
   reply=($(aws_profiles))
 }
-compctl -K _aws_profiles asp aws_change_access_key
+compctl -K _aws_profiles asp acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {
-  [[ -z $AWS_PROFILE ]] && return
-  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
+  [[ -n "$AWS_PROFILE" ]] || return
+  echo "${ZSH_THEME_AWS_PREFIX=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX=>}"
 }
 
-if [ "$SHOW_AWS_PROMPT" != false ]; then
+if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then
   RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi
 
@@ -64,6 +170,7 @@ fi
 
 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
 if command -v aws_completer &> /dev/null; then
+  autoload -Uz bashcompinit && bashcompinit
   complete -C aws_completer aws
 else
   function _awscli-homebrew-installed() {

plugins/battery/README.md

@@ -8,15 +8,22 @@ To use, add `battery` to the list of plugins in your `.zshrc` file:
 
 Then, add the `battery_pct_prompt` function to your custom theme. For example:
 
-```
+```zsh
 RPROMPT='$(battery_pct_prompt) ...'
 ```
 
 ## Requirements
 
-On Linux, you must have the `acpi` tool installed on your operating system.
+- On Linux, you must have the `acpi` or `acpitool` commands installed on your operating system.
+  On Debian/Ubuntu, you can do that with `sudo apt install acpi` or `sudo apt install acpitool`.
 
-Here's an example of how to install with apt:
-```
-sudo apt-get install acpi
-```
+- On Android (via [Termux](https://play.google.com/store/apps/details?id=com.termux)), you must have:
+
+  1. The `Termux:API` addon app installed:
+     [Google Play](https://play.google.com/store/apps/details?id=com.termux.api) | [F-Droid](https://f-droid.org/packages/com.termux.api/)
+
+  2. The `termux-api` package installed within termux:
+
+     ```sh
+     pkg install termux-api
+     ```

plugins/battery/battery.plugin.zsh

@@ -10,20 +10,17 @@
 # Author: J (927589452)                   #
 # Modified to add support for FreeBSD     #
 ###########################################
+# Author: Avneet Singh (kalsi-avneet)     #
+# Modified to add support for Android     #
+###########################################
 
 if [[ "$OSTYPE" = darwin* ]]; then
-
   function battery_is_charging() {
     ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
   }
-
   function battery_pct() {
-    local battery_status="$(ioreg -rc AppleSmartBattery)"
-    local -i capacity=$(sed -n -e '/MaxCapacity/s/^.*"MaxCapacity"\ =\ //p' <<< $battery_status)
-    local -i current=$(sed -n -e '/CurrentCapacity/s/^.*"CurrentCapacity"\ =\ //p' <<< $battery_status)
-    echo $(( current * 100 / capacity ))
+    pmset -g batt | grep -Eo "\d+%" | cut -d% -f1
   }
-
   function battery_pct_remaining() {
     if battery_is_charging; then
       echo "External Power"
@@ -31,7 +28,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       battery_pct
     fi
   }
-
   function battery_time_remaining() {
     local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | command grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]]; then
@@ -45,7 +41,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       echo "∞"
     fi
   }
-
   function battery_pct_prompt () {
     local battery_pct color
     if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
@@ -64,17 +59,14 @@ if [[ "$OSTYPE" = darwin* ]]; then
   }
 
 elif [[ "$OSTYPE" = freebsd* ]]; then
-
   function battery_is_charging() {
     [[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
   }
-
   function battery_pct() {
     if (( $+commands[sysctl] )); then
       sysctl -n hw.acpi.battery.life
     fi
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -82,7 +74,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     local remaining_time
     remaining_time=$(sysctl -n hw.acpi.battery.time)
@@ -92,7 +83,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       printf %02d:%02d $hour $minute
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -109,19 +99,22 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
-elif [[ "$OSTYPE" = linux*  ]]; then
-
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
   function battery_is_charging() {
-    ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
   }
-
   function battery_pct() {
-    if (( $+commands[acpi] )); then
-      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Full|(Disc|C)harging)' | cut -f2 -d ',' | tr -cd '[:digit:]'
-    fi
+    # Sample output:
+    # {
+    #   "health": "GOOD",
+    #   "percentage": 93,
+    #   "plugged": "UNPLUGGED",
+    #   "status": "DISCHARGING",
+    #   "temperature": 29.0,
+    #   "current": 361816
+    # }
+    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -129,13 +122,72 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "External Power"
     fi
   }
-
-  function battery_time_remaining() {
-    if ! battery_is_charging; then
-      acpi 2>/dev/null | command grep -v "rate information unavailable" | cut -f3 -d ','
-    fi
-  }
-
+  function battery_time_remaining() { } # Not available on android
+  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
+      ! acpitool 2>/dev/null | command grep -qE '^\s+Battery.*Discharging'
+    elif (( $+commands[acpi] )); then
+      ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
+    fi
+  }
+  function battery_pct() {
+    if (( $+commands[acpitool] )); then
+      # Sample output:
+      #   Battery #1     : Unknown, 99.55%
+      #   Battery #2     : Discharging, 49.58%, 01:12:05
+      #   All batteries  : 62.60%, 02:03:03
+      local -i pct=$(acpitool 2>/dev/null | command awk -F, '
+        /^\s+All batteries/ {
+          gsub(/[^0-9.]/, "", $1)
+          pct=$1
+          exit
+        }
+        !pct && /^\s+Battery/ {
+          gsub(/[^0-9.]/, "", $2)
+          pct=$2
+        }
+        END { print pct }
+        ')
+      echo $pct
+    elif (( $+commands[acpi] )); then
+      # Sample output:
+      # Battery 0: Discharging, 0%, rate information unavailable
+      # Battery 1: Full, 100%
+      acpi 2>/dev/null | command awk -F, '
+        /rate information unavailable/ { next }
+        /^Battery.*: /{ gsub(/[^0-9]/, "", $2); print $2; exit }
+      '
+    fi
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() {
+    if ! battery_is_charging; then
+      acpi 2>/dev/null | command grep -v "rate information unavailable" | cut -f3 -d ','
+    fi
+  }
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -152,7 +204,6 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }
@@ -177,7 +228,7 @@ function battery_level_gauge() {
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
   local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
 
-  local battery_remaining_percentage=$(battery_pct)
+  local -i battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
 
   if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then

plugins/bazel/README.md

@@ -1,5 +1,14 @@
-## Bazel autocomplete plugin
+# Bazel plugin
 
-A copy of the completion script from the
-[bazelbuild/bazel](https://github.com/bazelbuild/bazel/master/scripts/zsh_completion/_bazel)
-git repo.
+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.
+
+To use it, add `bazel` to the plugins array in your zshrc file:
+
+```zsh
+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

plugins/bazel/_bazel

@@ -164,7 +164,7 @@ _get_build_targets() {
       ;;
   esac
   completions=(${$(_bazel_b query "kind(\"${rule_re}\", ${pkg}:all)" 2>/dev/null)##*:})
-  if ( (( ${#completions} > 0 )) && [[ $target_type != run ]] ); then
+  if ( (( ${#completions} > 0 )) && [[ $target_type != bin ]] ); then
     completions+=(all)
   fi
   echo ${completions[*]}

plugins/bedtools/README.md

@@ -0,0 +1,5 @@
+# Bedtools plugin
+
+This plugin adds support for the [bedtools suite](http://bedtools.readthedocs.org/en/latest/):
+
+* Adds autocomplete options for all bedtools sub commands.

plugins/bedtools/_bedtools

@@ -0,0 +1,64 @@
+#compdef bedtools
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _files
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "bedtools command" \
+        "--contact[Feature requests, bugs, mailing lists, etc.]" \
+        "--help[Print this help menu.]" \
+        "--version[What version of bedtools are you using?.]" \
+        "annotate[Annotate coverage of features from multiple files.]" \
+        "bamtobed[Convert BAM alignments to BED (& other) formats.]" \
+        "bamtofastq[Convert BAM records to FASTQ records.]" \
+        "bed12tobed6[Breaks BED12 intervals into discrete BED6 intervals.]" \
+        "bedpetobam[Convert BEDPE intervals to BAM records.]" \
+        "bedtobam[Convert intervals to BAM records.]" \
+        "closest[Find the closest, potentially non-overlapping interval.]" \
+        "cluster[Cluster (but don't merge) overlapping/nearby intervals.]" \
+        "complement[Extract intervals _not_ represented by an interval file.]" \
+        "coverage[Compute the coverage over defined intervals.]" \
+        "expand[Replicate lines based on lists of values in columns.]" \
+        "fisher[Calculate Fisher statistic b/w two feature files.]" \
+        "flank[Create new intervals from the flanks of existing intervals.]" \
+        "genomecov[Compute the coverage over an entire genome.]" \
+        "getfasta[Use intervals to extract sequences from a FASTA file.]" \
+        "groupby[Group by common cols. & summarize oth. cols. (~ SQL "groupBy")]" \
+        "igv[Create an IGV snapshot batch script.]" \
+        "intersect[Find overlapping intervals in various ways.]" \
+        "jaccard[Calculate the Jaccard statistic b/w two sets of intervals.]" \
+        "links[Create a HTML page of links to UCSC locations.]" \
+        "makewindows[Make interval "windows" across a genome.]" \
+        "map[Apply a function to a column for each overlapping interval.]" \
+        "maskfasta[Use intervals to mask sequences from a FASTA file.]" \
+        "merge[Combine overlapping/nearby intervals into a single interval.]" \
+        "multicov[Counts coverage from multiple BAMs at specific intervals.]" \
+        "multiinter[Identifies common intervals among multiple interval files.]" \
+        "nuc[Profile the nucleotide content of intervals in a FASTA file.]" \
+        "overlap[Computes the amount of overlap from two intervals.]" \
+        "pairtobed[Find pairs that overlap intervals in various ways.]" \
+        "pairtopair[Find pairs that overlap other pairs in various ways.]" \
+        "random[Generate random intervals in a genome.]" \
+        "reldist[Calculate the distribution of relative distances b/w two files.]" \
+        "sample[Sample random records from file using reservoir sampling.]" \
+        "shuffle[Randomly redistrubute intervals in a genome.]" \
+        "slop[Adjust the size of intervals.]" \
+        "sort[Order the intervals in a file.]" \
+        "subtract[Remove intervals based on overlaps b/w two files.]" \
+        "tag[Tag BAM alignments based on overlaps with interval files.]" \
+        "unionbedg[Combines coverage intervals from multiple BEDGRAPH files.]" \
+        "window[Find overlapping intervals within a window around an interval.]" \
+    ret=0
+    ;;
+  *)
+    _files
+    ;;
+esac
+
+return ret

plugins/bgnotify/bgnotify.plugin.zsh

@@ -20,6 +20,12 @@ if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom functi
   }
 fi
 
+currentAppId () {
+  if (( $+commands[osascript] )); then
+    osascript -e 'tell application (path to frontmost application as text) to id' 2>/dev/null
+  fi
+}
+
 currentWindowId () {
   if hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
@@ -32,11 +38,20 @@ currentWindowId () {
 
 bgnotify () { ## args: (title, subtitle)
   if hash terminal-notifier 2>/dev/null; then #osx
-    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2';
-    [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
+    local term_id="$bgnotify_appid"
+    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
+
     ## now call terminal-notifier, (hopefully with $term_id!)
-    [ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||
-    terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
+    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
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m "$1" "$2"
   elif hash notify-send 2>/dev/null; then #ubuntu gnome!
@@ -54,6 +69,7 @@ bgnotify () { ## args: (title, subtitle)
 bgnotify_begin() {
   bgnotify_timestamp=$EPOCHSECONDS
   bgnotify_lastcmd="${1:-$2}"
+  bgnotify_appid="$(currentAppId)"
   bgnotify_windowid=$(currentWindowId)
 }
 
@@ -62,7 +78,7 @@ bgnotify_end() {
   elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
   past_threshold=$(( elapsed >= bgnotify_threshold ))
   if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
-    if [ $(currentWindowId) != "$bgnotify_windowid" ]; then
+    if [[ $(currentAppId) != "$bgnotify_appid" || $(currentWindowId) != "$bgnotify_windowid" ]]; then
       print -n "\a"
       bgnotify_formatted "$didexit" "$bgnotify_lastcmd" "$elapsed"
     fi

plugins/boot2docker/README.md

@@ -1,6 +0,0 @@
-## Boot2docker autocomplete plugin
-
-- Adds autocomplete options for all boot2docker commands.
-
-
-Maintainer : Manfred Touron ([@moul](https://github.com/moul))

plugins/boot2docker/_boot2docker

@@ -1,73 +0,0 @@
-#compdef boot2docker
-
-# Boot2docker autocompletion for oh-my-zsh
-# Requires: Boot2docker installed
-# Author: Manfred Touron (@moul)
-
-local -a _1st_arguments
-_1st_arguments=(
-   "init":"Create a new Boot2Docker VM."
-   "up":"Start VM from any states."
-   "start":"Start VM from any states."
-   "boot":"Start VM from any states."
-   "ssh":"[ssh-command] Login to VM via SSH."
-   "save":"Suspend VM and save state to disk."
-   "suspend":"Suspend VM and save state to disk."
-   "down":"Gracefully shutdown the VM."
-   "stop":"Gracefully shutdown the VM."
-   "halt":"Gracefully shutdown the VM."
-   "restart":"Gracefully reboot the VM."
-   "poweroff":"Forcefully power off the VM (may corrupt disk image)."
-   "reset":"Forcefully power cycle the VM (may corrupt disk image)."
-   "delete":"Delete Boot2Docker VM and its disk image."
-   "destroy":"Delete Boot2Docker VM and its disk image."
-   "config":"Show selected profile file settings."
-   "cfg":"Show selected profile file settings."
-   "info":"Display detailed information of VM."
-   "ip":"Display the IP address of the VM's Host-only network."
-   "socket":"Display the DOCKER_HOST socket to connect to."
-   "shellinit":"Display the shell command to set up the Docker client."
-   "status":"Display current state of VM."
-   "download":"Download Boot2Docker ISO image."
-   "upgrade":"Upgrade the Boot2Docker ISO image (restart if running)."
-   "version":"Display version information."
-)
-
-_arguments \
-  '(--basevmdk)--basevmdk[Path to VMDK to use as base for persistent partition]' \
-  '(--cpus)'{-c,--cpus}'[number of CPUs for boot2docker.]' \
-  '(--clobber)--clobber[overwrite Docker client binary on boot2docker upgrade]' \
-  '(--dhcp)--dhcp[enable VirtualBox host-only network DHCP.]' \
-  '(--dhcpip)--dhcpip[VirtualBox host-only network DHCP server address.]' \
-  '(-s --disksize)'{-s,--disksize}'[boot2docker disk image size (in MB).]' \
-  '(--dockerport)--dockerport[host Docker port (forward to port 2376 in VM). (deprecated - use with care)]' \
-  '(--driver)--driver[hypervisor driver.]' \
-  '(--force-upgrade-download)--force-upgrade-download[always download on boot2docker upgrade, never skip.]' \
-  '(--hostip)--hostip[VirtualBox host-only network IP address.]' \
-  '(--iso)--iso[path to boot2docker ISO image.]' \
-  '(--iso-url)--iso-url[/api.github.com/repos/boot2docker/boot2docker/releases": source URL to provision the boot2docker ISO image.]' \
-  '(--lowerip)--lowerip[VirtualBox host-only network DHCP lower bound.]' \
-  '(--memory)'{-m,--memory}'[virtual machine memory size (in MB).]' \
-  '(--netmask)--netmask[VirtualBox host-only network mask.]' \
-  '(--no-dummy)--no-dummy[Example parameter for the dummy driver.]' \
-  '(--retries)--retries[number of port knocking retries during 'start']' \
-  '(--serial)--serial[try serial console to get IP address (experimental)]' \
-  '(--serialfile)--serialfile[path to the serial socket/pipe.]' \
-  '(--ssh)--ssh[path to SSH client utility.]' \
-  '(--ssh-keygen)--ssh-keygen[path to ssh-keygen utility.]' \
-  '(--sshkey)--sshkey[path to SSH key to use.]' \
-  '(--sshport)--sshport[host SSH port (forward to port 22 in VM).]' \
-  '(--upperip)--upperip[VirtualBox host-only network DHCP upper bound.]' \
-  '(--vbm)--vbm[path to VirtualBox management utility.]' \
-  '(--vbox-share)--vbox-share[(defaults to "/Users=Users" if no shares are specified; use "disable" to explicitly prevent any shares from being created) List of directories to share during "up|start|boot" via VirtualBox Guest Additions, with optional labels]' \
-  '(--verbose)'{-v,--verbose}'[display verbose command invocations.]' \
-  '(--vm)--vm[virtual machine name.]' \
-  '(--waittime)--waittime[Time in milliseconds to wait between port knocking retries during 'start']' \
-  '*:: :->subcmds' && return 0
-
-#_arguments '*:: :->command'
-
-if (( CURRENT == 1 )); then
-    _describe -t commands "boot2docker command" _1st_arguments
-    return
-fi

plugins/bower/bower.plugin.zsh

@@ -1,4 +1,6 @@
 alias bi="bower install"
+alias bisd="bower install --save-dev"
+alias bis="bower install --save"
 alias bl="bower list"
 alias bs="bower search"
 
@@ -7,7 +9,7 @@ _bower_installed_packages () {
 }
 _bower ()
 {
-    local -a _1st_arguments _no_color _dopts _save_dev _force_lastest _production
+    local -a _1st_arguments _no_color _dopts _save_dev _force_latest _production
     local expl
     typeset -A opt_args
 
@@ -20,7 +22,7 @@ _bower ()
 
     _save_dev=('(--save-dev)--save-dev[Save installed packages into the project"s bower.json devDependencies]')
 
-    _force_lastest=('(--force-latest)--force-latest[Force latest version on conflict]')
+    _force_latest=('(--force-latest)--force-latest[Force latest version on conflict]')
 
     _production=('(--production)--production[Do not install project devDependencies]')
 
@@ -52,7 +54,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_save_dev \
-        $_force_lastest \
+        $_force_latest \
         $_no_color \
         $_production
         ;;
@@ -60,7 +62,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_no_color \
-        $_force_lastest
+        $_force_latest
         _bower_installed_packages
         compadd "$@" $(echo $bower_package_list)
         ;;

plugins/branch/README.md

@@ -1,31 +1,47 @@
-# Branch
+# Branch plugin
 
-Displays the current Git or Mercurial branch fast.
+This plugin displays the current Git or Mercurial branch, fast. If in a Mercurial repository,
+also display the current bookmark, if present.
+
+To use it, add `branch` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... branch)
+```
 
 ## Speed test
 
-### Mercurial
+- `hg branch`:
 
-```shell
-$ time hg branch
-0.11s user 0.14s system 70% cpu 0.355 total
-```
+  ```console
+  $ time hg branch
+  0.11s user 0.14s system 70% cpu 0.355 total
+  ```
 
-### Branch plugin
+- branch plugin:
 
-```shell
-$ time zsh /tmp/branch_prompt_info_test.zsh
-0.00s user 0.01s system 78% cpu 0.014 total
-```
+  ```console
+  $ time zsh /tmp/branch_prompt_info_test.zsh
+  0.00s user 0.01s system 78% cpu 0.014 total
+  ```
 
 ## Usage
 
-Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`)
-adding `$(branch_prompt_info)` in your prompt like this:
+Copy your theme to `$ZSH_CUSTOM/themes/` and modify it to add `$(branch_prompt_info)` in your prompt.
+This example is for the `robbyrussell` theme:
 
 ```diff
-- PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-+ PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(branch_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
+index 2fd5f2cd..9d89a464 100644
+--- a/themes/robbyrussell.zsh-theme
++++ b/themes/robbyrussell.zsh-theme
+@@ -1,5 +1,5 @@
+ 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%} "
 ```
 
 ## Maintainer

plugins/branch/branch.plugin.zsh

@@ -3,29 +3,33 @@
 # Oct 2, 2015
 
 function branch_prompt_info() {
-  # Defines path as current directory
-  local current_dir=$PWD
-  # While current path is not root path
-  while [[ $current_dir != '/' ]]
-  do
-    # Git repository
-    if [[ -d "${current_dir}/.git" ]]
-    then
-      echo '±' ${"$(<"$current_dir/.git/HEAD")"##*/}
-      return;
+  # Start checking in current working directory
+  local branch="" dir="$PWD"
+  while [[ "$dir" != '/' ]]; do
+    # Found .git directory
+    if [[ -d "${dir}/.git" ]]; then
+      branch="${"$(<"${dir}/.git/HEAD")"##*/}"
+      echo '±' "${branch:gs/%/%%}"
+      return
     fi
-    # Mercurial repository
-    if [[ -d "${current_dir}/.hg" ]]
-    then
-      if [[ -f "$current_dir/.hg/branch" ]]
-      then
-        echo '☿' $(<"$current_dir/.hg/branch")
+
+    # Found .hg directory
+    if [[ -d "${dir}/.hg" ]]; then
+      if [[ -f "${dir}/.hg/branch" ]]; then
+        branch="$(<"${dir}/.hg/branch")"
       else
-        echo '☿ default'
+        branch="default"
       fi
-      return;
+
+      if [[ -f "${dir}/.hg/bookmarks.current" ]]; then
+        branch="${branch}/$(<"${dir}/.hg/bookmarks.current")"
+      fi
+
+      echo '☿' "${branch:gs/%/%%}"
+      return
     fi
-    # Defines path as parent directory and keeps looking for :)
-    current_dir="${current_dir:h}"
+
+    # Check parent directory
+    dir="${dir:h}"
   done
 }

plugins/brew/README.md

@@ -8,19 +8,26 @@ To use it, add `brew` to the plugins array of your zshrc file:
 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.
+
 ## Aliases
 
-| Alias    | Command                                                       | Description                                                         |
-|----------|-------------------------------------------------------------  |---------------------------------------------------------------------|
-| `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                                | Update Homebrew data, then list outdated formulae and casks.        |
-| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae and casks, then run cleanup.              |
-| `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
-| `buf`    | `brew upgrade --formula`                                      | Upgrade only formulas (not casks).                                  |
-| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew data, then list outdated casks.                     |
-| `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| Alias    | Command                               | Description                                                         |
+| -------- | ------------------------------------- | ------------------------------------------------------------------- |
+| `bcubc`  | `brew upgrade --cask && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| `bcubo`  | `brew update && brew outdated --cask` | Update Homebrew data, then list outdated casks.                     |
+| `brewp`  | `brew pin`                            | Pin a specified formula so that it's not upgraded.                  |
+| `brews`  | `brew list -1`                        | List installed formulae or the installed files for a given formula. |
+| `brewsp` | `brew list --pinned`                  | List pinned formulae, or show the version of a given formula.       |
+| `bubc`   | `brew upgrade && brew cleanup`        | Upgrade outdated formulae and casks, then run cleanup.              |
+| `bubo`   | `brew update && brew outdated`        | Update Homebrew data, then list outdated formulae and casks.        |
+| `bubu`   | `bubo && bubc`                        | Do the last two operations above.                                   |
+| `buf`    | `brew upgrade --formula`              | Upgrade only formulas (not casks).                                  |
 
 ## Completion
 

plugins/brew/brew.plugin.zsh

@@ -1,9 +1,48 @@
+if (( ! $+commands[brew] )); then
+  if [[ -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"
+  elif [[ -x /home/linuxbrew/.linuxbrew/bin/brew ]]; then
+    BREW_LOCATION="/home/linuxbrew/.linuxbrew/bin/brew"
+  elif [[ -x "$HOME/.linuxbrew/bin/brew" ]]; then
+    BREW_LOCATION="$HOME/.linuxbrew/bin/brew"
+  else
+    return
+  fi
+
+  # Only add Homebrew installation to PATH, MANPATH, and INFOPATH if brew is
+  # not already on the path, to prevent duplicate entries. This aligns with
+  # the behavior of the brew installer.sh post-install steps.
+  eval "$("$BREW_LOCATION" shellenv)"
+  unset BREW_LOCATION
+fi
+
+if [[ -z "$HOMEBREW_PREFIX" ]]; then
+  # Maintain compatability with potential custom user profiles, where we had
+  # previously relied on always sourcing shellenv. OMZ plugins should not rely
+  # on this to be defined due to out of order processing.
+  export HOMEBREW_PREFIX="$(brew --prefix)"
+fi
+
+alias bcubc='brew upgrade --cask && brew cleanup'
+alias bcubo='brew update && brew outdated --cask'
 alias brewp='brew pin'
-alias brews='brew list -1'
 alias brewsp='brew list --pinned'
-alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
+alias bubo='brew update && brew outdated'
 alias bubu='bubo && bubc'
 alias buf='brew upgrade --formula'
-alias bcubo='brew update && brew outdated --cask'
-alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup'
+
+function brews() {
+  local formulae="$(brew leaves | xargs brew deps --installed --for-each)"
+  local casks="$(brew list --cask)"
+
+  local blue="$(tput setaf 4)"
+  local bold="$(tput bold)"
+  local off="$(tput sgr0)"
+
+  echo "${blue}==>${off} ${bold}Formulae${off}"
+  echo "${formulae}" | sed "s/^\(.*\):\(.*\)$/\1${blue}\2${off}/"
+  echo "\n${blue}==>${off} ${bold}Casks${off}\n${casks}"
+}

plugins/bundler/_bundler

@@ -18,6 +18,7 @@ case $state in
 			"check[Determine whether the requirements for your application are installed]" \
 			"list[Show all of the gems in the current bundle]" \
 			"show[Show the source location of a particular gem in the bundle]" \
+			"info[Show details of a particular gem in the bundle]" \
 			"outdated[Show all of the outdated gems in the current bundle]" \
 			"console[Start an IRB session in the context of the current bundle]" \
 			"open[Open an installed gem in the editor]" \
@@ -84,7 +85,7 @@ case $state in
 					'(--verbose)--verbose[Enable verbose output mode]'
 				ret=0
 				;;
-			(open|show)
+			(open|show|info)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then
 					_values 'gems' $_gems && ret=0

plugins/bundler/bundler.plugin.zsh

@@ -40,7 +40,7 @@ bundle_install() {
   else
     local cores_num="$(nproc)"
   fi
-  bundle install --jobs="$cores_num" "$@"
+  BUNDLE_JOBS="$cores_num" bundle install "$@"
 }
 
 ## Gem wrapper
@@ -81,14 +81,12 @@ bundled_commands=(
 )
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
-for cmd in $UNBUNDLED_COMMANDS; do
-  bundled_commands=(${bundled_commands#$cmd});
-done
+bundled_commands=(${bundled_commands:|UNBUNDLED_COMMANDS})
+unset UNBUNDLED_COMMANDS
 
 # Add $BUNDLED_COMMANDS to the bundled_commands list
-for cmd in $BUNDLED_COMMANDS; do
-  bundled_commands+=($cmd);
-done
+bundled_commands+=($BUNDLED_COMMANDS)
+unset BUNDLED_COMMANDS
 
 # Check if in the root or a subdirectory of a bundled project
 _within-bundled-project() {
@@ -126,5 +124,4 @@ for cmd in $bundled_commands; do
     compdef "_$cmd" "bundled_$cmd"="$cmd"
   fi
 done
-
 unset cmd bundled_commands

plugins/cargo/README.md

@@ -1,11 +0,0 @@
-# cargo
-
-This plugin adds completion for the Rust build tool [`Cargo`](https://github.com/rust-lang/cargo).
-
-To use it, add `cargo` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... cargo)
-```
-
-Updated on March 3rd, 2019, from [Cargo 0.34.0](https://github.com/rust-lang/cargo/releases/tag/0.34.0).

plugins/cargo/_cargo

@@ -1,407 +0,0 @@
-#compdef cargo
-
-autoload -U regexp-replace
-
-_cargo() {
-    local curcontext="$curcontext" ret=1
-    local -a command_scope_spec common parallel features msgfmt triple target registry
-    local -a state line state_descr # These are set by _arguments
-    typeset -A opt_args
-
-    common=(
-        '(-q --quiet)*'{-v,--verbose}'[use verbose output]'
-        '(-q --quiet -v --verbose)'{-q,--quiet}'[no output printed to stdout]'
-        '-Z+[pass unstable (nightly-only) flags to cargo]: :_cargo_unstable_flags'
-        '--frozen[require that Cargo.lock and cache are up-to-date]'
-        '--locked[require that Cargo.lock is up-to-date]'
-        '--color=[specify colorization option]:coloring:(auto always never)'
-        '(- 1 *)'{-h,--help}'[show help message]'
-    )
-
-    # leading items in parentheses are an exclusion list for the arguments following that arg
-    # See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
-    #   - => exclude all other options
-    #   1 => exclude positional arg 1
-    #   * => exclude all other args
-    #   +blah => exclude +blah
-    _arguments -s -S -C $common \
-        '(- 1 *)--list[list installed commands]' \
-        '(- 1 *)--explain=[provide a detailed explanation of an error message]:error code' \
-        '(- 1 *)'{-V,--version}'[show version information]' \
-        '(+beta +nightly)+stable[use the stable toolchain]' \
-        '(+stable +nightly)+beta[use the beta toolchain]' \
-        '(+stable +beta)+nightly[use the nightly toolchain]' \
-        '1: :_cargo_cmds' \
-        '*:: :->args'
-
-    # These flags are mutually exclusive specifiers for the scope of a command; as
-    # they are used in multiple places without change, they are expanded into the
-    # appropriate command's `_arguments` where appropriate.
-    command_scope_spec=(
-        '(--bin --example --test --lib)--bench=[specify benchmark name]: :_cargo_benchmark_names'
-        '(--bench --bin --test --lib)--example=[specify example name]:example name'
-        '(--bench --example --test --lib)--bin=[specify binary name]:binary name'
-        '(--bench --bin --example --test)--lib=[specify library name]:library name'
-        '(--bench --bin --example --lib)--test=[specify test name]:test name'
-    )
-
-    parallel=(
-        '(-j --jobs)'{-j+,--jobs=}'[specify number of parallel jobs]:jobs [# of CPUs]'
-    )
-
-    features=(
-        '(--all-features)--features=[specify features to activate]:feature'
-        '(--features)--all-features[activate all available features]'
-        "--no-default-features[don't build the default features]"
-    )
-
-    msgfmt='--message-format=[specify error format]:error format [human]:(human json short)'
-    triple='--target=[specify target triple]:target triple'
-    target='--target-dir=[specify directory for all generated artifacts]:directory:_directories'
-    manifest='--manifest-path=[specify path to manifest]:path:_directories'
-    registry='--registry=[specify registry to use]:registry'
-
-    case $state in
-        args)
-            curcontext="${curcontext%:*}-${words[1]}:"
-            case ${words[1]} in
-                bench)
-                    _arguments -s -A "^--" $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--all-targets[benchmark all targets]' \
-                        "--no-run[compile but don't run]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to run benchmarks for]:package:_cargo_package_names' \
-                        '--exclude=[exclude packages from the benchmark]:spec' \
-                        '--no-fail-fast[run all benchmarks regardless of failure]' \
-                        '1: :_guard "^-*" "bench name"' \
-                        '*:args:_default'
-                        ;;
-
-                build)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '--build-plan[output the build plan in JSON]' \
-                        ;;
-
-                check)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to check]:package:_cargo_package_names' \
-                        '--release[check in release mode]' \
-                        ;;
-
-                clean)
-                    _arguments -s -S $common $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to clean]:package:_cargo_package_names' \
-                        '--release[clean release artifacts]' \
-                        '--doc[clean just the documentation directory]'
-                        ;;
-
-                doc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--no-deps[do not build docs for dependencies]' \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open docs in browser after the build]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        ;;
-
-                fetch)
-                    _arguments -s -S $common $triple $manifest
-                        ;;
-
-                fix)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--broken-code[fix code even if it already has compiler errors]' \
-                        '--edition[fix in preparation for the next edition]' \
-                        '--edition-idioms[fix warnings to migrate to the idioms of an edition]' \
-                        '--allow-no-vcs[fix code even if a VCS was not detected]' \
-                        '--allow-dirty[fix code even if the working directory is dirty]' \
-                        '--allow-staged[fix code even if the working directory has staged changes]'
-                ;;
-
-                generate-lockfile)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                git-checkout)
-                    _arguments -s -S $common \
-                        '--reference=:reference' \
-                        '--url=:url:_urls'
-                        ;;
-
-                help)
-                    _cargo_cmds
-                        ;;
-
-                init)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--edition=[specify edition to set for the crate generated]:edition:(2015 2018)' \
-                        '--vcs=[initialize a new repo with a given VCS]:vcs:(git hg pijul fossil none)' \
-                        '--name=[set the resulting package name]:name' \
-                        '1:path:_directories'
-                        ;;
-
-                install)
-                    _arguments -s -S $common $parallel $features $triple $registry \
-                        '(-f --force)'{-f,--force}'[force overwriting of existing crates or binaries]' \
-                        '--bin=[only install the specified binary]:binary' \
-                        '--branch=[branch to use when installing from git]:branch' \
-                        '--debug[build in debug mode instead of release mode]' \
-                        '--example=[install the specified example instead of binaries]:example' \
-                        '--git=[specify URL from which to install the crate]:url:_urls' \
-                        '--path=[local filesystem path to crate to install]: :_directories' \
-                        '--rev=[specific commit to use when installing from git]:commit' \
-                        '--root=[directory to install packages into]: :_directories' \
-                        '--tag=[tag to use when installing from git]:tag' \
-                        '--vers=[version to install from crates.io]:version' \
-                        '--list[list all installed packages and their versions]' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                locate-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                login)
-                    _arguments -s -S $common $registry \
-                        '*: :_guard "^-*" "token"'
-                        ;;
-
-                metadata)
-                    _arguments -s -S $common $features $manifest \
-                        "--no-deps[output information only about the root package and don't fetch dependencies]" \
-                        '--format-version=[specify format version]:version [1]:(1)'
-                        ;;
-
-                new)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--vcs:initialize a new repo with a given VCS:(git hg none)' \
-                        '--name=[set the resulting package name]'
-                        ;;
-
-                owner)
-                    _arguments -s -S $common $registry \
-                        '(-a --add)'{-a,--add}'[specify name of a user or team to invite as an owner]:name' \
-                        '--index=[specify registry index]:index' \
-                        '(-l --list)'{-l,--list}'[list owners of a crate]' \
-                        '(-r --remove)'{-r,--remove}'[specify name of a user or team to remove as an owner]:name' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                package)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest \
-                        '(-l --list)'{-l,--list}'[print files included in a package without making one]' \
-                        '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't build to verify contents]"
-                        ;;
-
-                pkgid)
-                    _arguments -s -S $common $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to get ID specifier for]:package:_cargo_package_names' \
-                        '*: :_guard "^-*" "spec"'
-                        ;;
-
-                publish)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest $registry \
-                        '--index=[specify registry index]:index' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't verify the contents by building them]" \
-                        '--token=[specify token to use when uploading]:token' \
-                        '--dry-run[perform all checks without uploading]'
-                        ;;
-
-                read-manifest)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                run)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--example=[name of the bin target]:name' \
-                        '--bin=[name of the bin target]:name' \
-                        '(-p --package)'{-p+,--package=}'[specify package with the target to run]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '*: :_default'
-                        ;;
-
-                rustc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--profile=[specify profile to build the selected target for]:profile' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustc rustc -default-'
-                        ;;
-
-                rustdoc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open the docs in a browser after the operation]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustdoc rustdoc -default-'
-                        ;;
-
-                search)
-                    _arguments -s -S $common $registry \
-                        '--index=[specify registry index]:index' \
-                        '--limit=[limit the number of results]:results [10]' \
-                        '*: :_guard "^-*" "query"'
-                        ;;
-
-                test)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--test=[test name]: :_cargo_test_names' \
-                        '--no-fail-fast[run all tests regardless of failure]' \
-                        '--no-run[compile but do not run]' \
-                        '(-p --package)'{-p+,--package=}'[package to run tests for]:package:_cargo_package_names' \
-                        '--all[test all packages in the workspace]' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        '1: :_cargo_test_names' \
-                        '(--doc --bin --example --test --bench)--lib[only test library]' \
-                        '(--lib --bin --example --test --bench)--doc[only test documentation]' \
-                        '(--lib --doc --example --test --bench)--bin=[binary name]' \
-                        '(--lib --doc --bin --test --bench)--example=[example name]' \
-                        '(--lib --doc --bin --example --bench)--test=[test name]' \
-                        '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
-                        '*: :_default'
-                        ;;
-
-                uninstall)
-                    _arguments -s -S $common \
-                        '(-p --package)'{-p+,--package=}'[specify package to uninstall]:package:_cargo_package_names' \
-                        '--bin=[only uninstall the specified binary]:name' \
-                        '--root=[directory to uninstall packages from]: :_files -/' \
-                        '*:crate:_cargo_installed_crates -F line'
-                        ;;
-
-                update)
-                    _arguments -s -S $common $manifest \
-                        '--aggressive=[force dependency update]' \
-                        "--dry-run[don't actually write the lockfile]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to update]:package:_cargo_package_names' \
-                        '--precise=[update single dependency to precise release]:release'
-                        ;;
-
-                verify-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                version)
-                    _arguments -s -S $common
-                        ;;
-
-                yank)
-                    _arguments -s -S $common $registry \
-                        '--vers=[specify yank version]:version' \
-                        '--undo[undo a yank, putting a version back into the index]' \
-                        '--index=[specify registry index to yank from]:registry index' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-                *)
-                    # allow plugins to define their own functions
-                    if ! _call_function ret _cargo-${words[1]}; then
-                        # fallback on default completion for unknown commands
-                        _default && ret=0
-                    fi
-                    (( ! ret ))
-                ;;
-            esac
-            ;;
-    esac
-}
-
-_cargo_unstable_flags() {
-    local flags
-    flags=( help ${${${(M)${(f)"$(_call_program flags cargo -Z help)"}:#*--*}/ #-- #/:}##*-Z } )
-    _describe -t flags 'unstable flag' flags
-}
-
-_cargo_installed_crates() {
-    local expl
-    _description crates expl 'crate'
-    compadd "$@" "$expl[@]" - ${${${(f)"$(cargo install --list)"}:# *}%% *}
-}
-
-_cargo_cmds() {
-    local -a commands
-    # This uses Parameter Expansion Flags, which are a built-in Zsh feature.
-    # See more: http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
-    # and       http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
-    #
-    # # How this work?
-    #
-    # First it splits the result of `cargo --list` at newline, then it removes the first line.
-    # Then it removes indentation (4 whitespaces) before each items. (Note the x## pattern [1]).
-    # Then it replaces those spaces between item and description with a `:`
-    #
-    # [1]: https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org#patterns
-    commands=( ${${${(M)"${(f)$(_call_program commands cargo --list)}":#    *}/ ##/}/ ##/:} )
-    _describe -t commands 'command' commands
-}
-
-
-#FIXME: Disabled until fixed
-#gets package names from the manifest file
-_cargo_package_names() {
-    _message -e packages package
-}
-
-# Extracts the values of "name" from the array given in $1 and shows them as
-# command line options for completion
-_cargo_names_from_array() {
-    # strip json from the path
-    local manifest=${${${"$(cargo locate-project)"}%\"\}}##*\"}
-    if [[ -z $manifest ]]; then
-        return 0
-    fi
-
-    local last_line
-    local -a names;
-    local in_block=false
-    local block_name=$1
-    names=()
-    while read -r line; do
-        if [[ $last_line == "[[$block_name]]" ]]; then
-            in_block=true
-        else
-            if [[ $last_line =~ '\s*\[\[.*' ]]; then
-                in_block=false
-            fi
-        fi
-
-        if [[ $in_block == true ]]; then
-            if [[ $line =~ '\s*name\s*=' ]]; then
-                regexp-replace line '^\s*name\s*=\s*|"' ''
-                names+=( "$line" )
-            fi
-        fi
-
-        last_line=$line
-    done < "$manifest"
-    _describe "$block_name" names
-
-}
-
-#Gets the test names from the manifest file
-_cargo_test_names() {
-    _cargo_names_from_array "test"
-}
-
-#Gets the bench names from the manifest file
-_cargo_benchmark_names() {
-    _cargo_names_from_array "bench"
-}
-
-_cargo

plugins/catimg/catimg.plugin.zsh

@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################

plugins/catimg/catimg.sh

@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################

plugins/charm/README.md

@@ -0,0 +1,9 @@
+# Charm plugin
+
+This plugin adds completion for the [charm](https://github.com/charmbracelet/charm) CLI.
+
+To use it, add `charm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... charm)
+```

plugins/charm/charm.plugin.zsh

@@ -0,0 +1,14 @@
+# Autocompletion for the Charm CLI (charm).
+if (( ! $+commands[charm] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `charm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_charm" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _charm
+  _comps[charm]=_charm
+fi
+
+charm completion zsh >| "$ZSH_CACHE_DIR/completions/_charm" &|

plugins/chruby/README.md

@@ -5,6 +5,7 @@ current Ruby version, and completion and a prompt function to display the Ruby v
 Supports brew and manual installation of chruby.
 
 To use it, add `chruby` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... chruby)
 ```
@@ -14,7 +15,7 @@ plugins=(... chruby)
 If you'd prefer to specify an explicit path to load chruby from
 you can set variables like so:
 
-```
+```zsh
 zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
 zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
 ```

plugins/chruby/chruby.plugin.zsh

@@ -1,121 +1,94 @@
-#
-# INSTRUCTIONS
-#
-#  With either a manual or brew installed chruby things should just work.
-#
-#  If you'd prefer to specify an explicit path to load chruby from
-#  you can set variables like so:
-#
-#    zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
-#    zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
-# 
-# TODO
-#  - autodetermine correct source path on non OS X systems
-#  - completion if ruby-install exists
+## load chruby from different locations
+
+_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
+
+  if [[ -r ${_chruby_path} ]]; then
+    source ${_chruby_path}
+  fi
+
+  if [[ -r ${_chruby_auto} ]]; then
+    source ${_chruby_auto}
+  fi
+}
+
+_source-from-homebrew() {
+  (( $+commands[brew] )) || return 1
+
+  local _brew_prefix
+  # check default brew prefix
+  if [[ -h /usr/local/opt/chruby ]];then
+    _brew_prefix="/usr/local/opt/chruby"
+  else
+    # 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
+
+  [[ -r "$_brew_prefix" ]] || return 1
+
+  source $_brew_prefix/share/chruby/chruby.sh
+  source $_brew_prefix/share/chruby/auto.sh
+}
+
+_load-chruby-dirs() {
+  local dir
+  for dir in "$HOME/.rubies" "$PREFIX/opt/rubies"; do
+    if [[ -d "$dir" ]]; then
+      RUBIES+=("$dir")
+    fi
+  done
+}
+
+# Load chruby
+if _source-from-omz-settings; then
+  _load-chruby-dirs
+elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
+  source /usr/local/share/chruby/chruby.sh
+  source /usr/local/share/chruby/auto.sh
+  _load-chruby-dirs
+elif _source-from-homebrew; then
+  _load-chruby-dirs
+fi
+
+unfunction _source-from-homebrew _source-from-omz-settings _load-chruby-dirs
+
+
+## chruby utility functions and aliases
 
 # rvm and rbenv plugins also provide this alias
 alias rubies='chruby'
 
-
-_homebrew-installed() {
-    whence brew &> /dev/null
-    _xit=$?
-    if [ $_xit -eq 0 ];then
-    	# ok , we have brew installed
-	# speculatively we check default brew prefix
-        if [ -h  /usr/local/opt/chruby ];then
-		_brew_prefix="/usr/local/opt/chruby"
-	else
-		# 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
-	return 0
-   else
-        return $_xit
-   fi
-}
-
-_chruby-from-homebrew-installed() {
-  [ -r _brew_prefix ] &> /dev/null
-}
-
-_ruby-build_installed() {
-    whence ruby-build &> /dev/null
-}
-
-_ruby-install-installed() {
-    whence ruby-install &> /dev/null
-}
-
-# Simple definition completer for ruby-build
-if _ruby-build_installed; then
-    _ruby-build() { compadd $(ruby-build --definitions) }
-    compdef _ruby-build ruby-build
-fi
-
-_source_from_omz_settings() {
-    local _chruby_path
-    local _chruby_auto
-    
-    zstyle -s :omz:plugins:chruby path _chruby_path
-    zstyle -s :omz:plugins:chruby auto _chruby_auto
-
-    if [[ -r ${_chruby_path} ]]; then
-        source ${_chruby_path}
-    fi
-
-    if [[ -r ${_chruby_auto} ]]; then
-        source ${_chruby_auto}
-    fi
-}
-
-_chruby_dirs() {
-    chrubydirs=($HOME/.rubies/ $PREFIX/opt/rubies)
-    for dir in chrubydirs; do
-        if [[ -d $dir ]]; then
-            RUBIES+=$dir
-        fi
-    done
-}
-
-if _homebrew-installed && _chruby-from-homebrew-installed ; then
-    source $_brew_prefix/share/chruby/chruby.sh
-    source $_brew_prefix/share/chruby/auto.sh
-    _chruby_dirs
-elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
-    source /usr/local/share/chruby/chruby.sh
-    source /usr/local/share/chruby/auto.sh
-    _chruby_dirs
-else
-    _source_from_omz_settings
-    _chruby_dirs
-fi
-
-function ensure_chruby() {
-    $(whence chruby)
-}
-
 function current_ruby() {
-    local _ruby
-    _ruby="$(chruby |grep \* |tr -d '* ')"
-    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
-        echo ${_ruby}
-    else
-        echo "system"
-    fi
+  local ruby
+  ruby="$(chruby | grep \* | tr -d '* ')"
+  if [[ $(chruby | grep -c \*) -eq 1 ]]; then
+    echo ${ruby}
+  else
+    echo "system"
+  fi
 }
 
 function chruby_prompt_info() {
-    echo "$(current_ruby)"
+  echo "${$(current_ruby):gs/%/%%}"
 }
 
-# complete on installed rubies
+# Complete chruby command with installed rubies
 _chruby() {
-    compadd $(chruby | tr -d '* ')
-    local default_path='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
-    if PATH=${default_path} type ruby &> /dev/null; then
-        compadd system
-    fi
+  compadd $(chruby | tr -d '* ')
+  if PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" command ruby &>/dev/null; then
+    compadd system
+  fi
 }
+
 compdef _chruby chruby
+
+
+# Simple definition completer for ruby-build
+if command ruby-build &> /dev/null; then
+  _ruby-build() { compadd $(ruby-build --definitions) }
+  compdef _ruby-build ruby-build
+fi

plugins/chucknorris/README.md

@@ -1,8 +1,6 @@
 # chucknorris
 
-Chuck Norris fortunes plugin for oh-my-zsh. Perfectly suitable as MOTD.
-
-**Maintainers**: [apjanke](https://github.com/apjanke) [maff](https://github.com/maff)
+Chuck Norris fortunes plugin for Oh My Zsh. Perfectly suitable as MOTD.
 
 To use it add `chucknorris` to the plugins array in you zshrc file.
 

plugins/chucknorris/chucknorris.plugin.zsh

@@ -1,28 +1,24 @@
-# chucknorris: Chuck Norris fortunes
-
-# Automatically generate or update Chuck's compiled fortune data file
-# $0 must be used outside a local function. This variable name is unlikly to collide.
-CHUCKNORRIS_PLUGIN_DIR=${0:h}
-
 () {
-local DIR=$CHUCKNORRIS_PLUGIN_DIR/fortunes
-if [[ ! -f $DIR/chucknorris.dat ]] || [[ $DIR/chucknorris.dat -ot $DIR/chucknorris ]]; then
-  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
-  local strfile=strfile
-  if ! which strfile &>/dev/null && [[ -f /usr/sbin/strfile ]]; then
-    strfile=/usr/sbin/strfile
+  # %x: name of file containing code being executed
+  local fortunes_dir="${${(%):-%x}:h}/fortunes"
+
+  # Aliases
+  alias chuck="fortune -a $fortunes_dir"
+  alias chuck_cow="chuck | cowthink"
+
+  # Automatically generate or update Chuck's compiled fortune data file
+  if [[ "$fortunes_dir/chucknorris" -ot "$fortunes_dir/chucknorris.dat" ]]; then
+    return
   fi
-  if which $strfile &> /dev/null; then
-    $strfile $DIR/chucknorris $DIR/chucknorris.dat >/dev/null
-  else
+
+  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
+  local strfile="${commands[strfile]:-/usr/sbin/strfile}"
+  if [[ ! -x "$strfile" ]]; then
     echo "[oh-my-zsh] chucknorris depends on strfile, which is not installed" >&2
     echo "[oh-my-zsh] strfile is often provided as part of the 'fortune' package" >&2
+    return
   fi
-fi
 
-# Aliases
-alias chuck="fortune -a $DIR"
-alias chuck_cow="chuck | cowthink"
+  # Generate the compiled fortune data file
+  $strfile "$fortunes_dir/chucknorris" "$fortunes_dir/chucknorris.dat" >/dev/null
 }
-
-unset CHUCKNORRIS_PLUGIN_DIR

plugins/chucknorris/fortunes/chucknorris

@@ -228,7 +228,7 @@ Chuck Norris once punched the ground to stop an earthquake. The resulting afters
 %
 Chuck Norris once round-house kicked a salesman. Over the phone.
 %
-Chuck Norris once rounhouse kicked a football. The astronomical society now considers it a planet.
+Chuck Norris once roundhouse kicked a football. The astronomical society now considers it a planet.
 %
 Chuck Norris once thought he was wrong. He was, however, mistaken.
 %
@@ -312,7 +312,7 @@ Chuck Norris. Enough said.
 %
 Chuck Norris: even Naruto can't believe it.
 %
-Chunk Norris can make sour milk turn fresh.
+Chuck Norris can make sour milk turn fresh.
 %
 Contrary to popular belief, Rome WAS built in a day, by Chuck Norris.
 %
@@ -342,7 +342,7 @@ Every time there's an earthquake, you know Chuck Norris is hungry. The earthquak
 %
 Evolution's driving mechanism is nature's desperate attempt to escape Chuck Norris.
 %
-Fear of spiders is arachnaphobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
+Fear of spiders is arachnophobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
 %
 Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
@@ -426,7 +426,7 @@ Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag
 %
 Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindness, and possibly foot sized bruises on the face.
 %
 Taking Karate Lessons = $100, Buying MMA DVD's = $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS.
 %
@@ -452,7 +452,7 @@ The best part of waking up is not Folgers in your cup. it's knowing that Chuck N
 %
 The chief export of Chuck Norris is pain.
 %
-The dictionary references Chuck Norris several times, he is metioned under Fear, Law, Order and Chucktatorship.
+The dictionary references Chuck Norris several times, he is mentioned under Fear, Law, Order and Chucktatorship.
 %
 The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
@@ -468,7 +468,7 @@ The only way sharks will come near CN underwater is when CN is inside of a cage.
 %
 The only word that rhymes with orange is Chuck Norris.
 %
-The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequal "The Last Skull Bender".
+The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequel "The Last Skull Bender".
 %
 The quickest way to a man's heart is with Chuck Norris' fist.
 %
@@ -558,3 +558,11 @@ You know Chuck Norris' pet lizard, right? Last I heard, he was in the movie "God
 %
 http://chucknorrisfacts.com/ is built in Drupal because Chuck Norris knows a good CMS when he sees one.
 %
+Chuck Norris made the first Giraffe by uppercutting a horse.
+%
+Chuck Norris can hear sign language.
+%
+Chuck Norris make onions cry.
+%
+Chuck Norris doesn't shake hands, he makes them tremble.
+%

plugins/cloudapp/README.md

@@ -1,26 +0,0 @@
-# CloudApp plugin
-
-## The CloudApp API is deprecated, so the plugin will be removed shortly
-
-[CloudApp](https://www.getcloudapp.com) brings screen recording, screenshots, and GIF creation to the cloud, in an easy-to-use enterprise-level app. The CloudApp plugin allows you to upload a file to your CloadApp account from the command line.
-
-To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:
-
-```zsh
-plugins=(... cloudapp)
-```
-
-## Requirements
-
-1. [Aaron Russell's `cloudapp_api` gem](https://github.com/aaronrussell/cloudapp_api#installation)
-
-2. That you set your CloudApp credentials in `~/.cloudapp` as a simple text file like below:
-   ```
-   email
-   password
-   ```
-
-## Usage
-
-- `cloudapp <filename>`: uploads `<filename>` to your CloudApp account, and if you're using
-  macOS, copies the URL to your clipboard.

plugins/cloudapp/cloudapp.plugin.zsh

@@ -1,4 +0,0 @@
-print -Pn "%F{yellow}"
-print "[oh-my-zsh] The CloudApp API no longer works, so the cloudapp plugin will"
-print "[oh-my-zsh] be removed shortly. Please remove it from your plugins list."
-print -Pn "%f"

plugins/coffee/_coffee

@@ -39,14 +39,14 @@
 #
 # ------------------------------------------------------------------------------
 
-local curcontext="$curcontext" state line ret=1 version opts first second third
+local curcontext="$curcontext" state line ret=1 version
+local -a opts
 typeset -A opt_args
-version=(${(f)"$(_call_program version $words[1] --version)"})
+version=(${(f)"$(_call_program version $words[1] --version)"}) || return ret
 version=${${(z)${version[1]}}[3]}
-first=$(echo $version|cut -d '.' -f 1)
-second=$(echo $version|cut -d '.' -f 2)
-third=$(echo $version|cut -d '.' -f 3)
-if (( $first < 2 )) &&  (( $second < 7 )) && (( $third < 3 ));then
+
+autoload -Uz is-at-least
+if ! is-at-least 1.6.3 "$version"; then
   opts+=('(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]'
          '(-r --require)'{-r,--require}'[require a library before executing your script]:library')
 fi

plugins/colemak/.gitignore

@@ -0,0 +1 @@
+.less

plugins/colemak/colemak.plugin.zsh

@@ -19,4 +19,20 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
-lesskey $ZSH/plugins/colemak/colemak-less
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+# New less versions will read this file directly
+export LESSKEYIN="${0:h:A}/colemak-less"
+
+# Only run lesskey if less version is older than v582
+less_ver=$(less --version | awk '{print $2;exit}')
+autoload -Uz is-at-least
+if ! is-at-least 582 $less_ver; then
+  # Old less versions will read this transformed file
+  export LESSKEY="${0:h:A}/.less"
+  lesskey -o "$LESSKEY" "$LESSKEYIN" 2>/dev/null
+fi
+unset less_ver

plugins/colored-man-pages/README.md

@@ -16,3 +16,17 @@ You can also try to color other pages by prefixing the respective command with `
 ```zsh
 colored git help clone
 ```
+
+## Customization
+
+The plugin declares global associative array `less_termcap`, which maps termcap capabilities to escape
+sequences for the `less` pager. This mapping can be further customized by the user after the plugin is
+loaded. Check out sources for more.
+
+For example: `less_termcap[md]` maps to `LESS_TERMCAP_md` which is the escape sequence that tells `less`
+how to print something in bold. It's currently shown in bold red, but if you want to change it, you
+can redefine `less_termcap[md]` in your zshrc file, after OMZ is sourced:
+
+```zsh
+less_termcap[md]="${fg_bold[blue]}" # this tells less to print bold text in bold blue
+```

plugins/colored-man-pages/colored-man-pages.plugin.zsh

@@ -1,39 +1,53 @@
-if [[ "$OSTYPE" = solaris* ]]
-then
-	if [[ ! -x "$HOME/bin/nroff" ]]
-	then
-		mkdir -p "$HOME/bin"
-		cat > "$HOME/bin/nroff" <<EOF
-#!/bin/sh
-if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then
-	shift
-	exec /usr/bin/nroff -u\$_NROFF_U "\$@"
-fi
-#-- Some other invocation of nroff
-exec /usr/bin/nroff "\$@"
-EOF
-		chmod +x "$HOME/bin/nroff"
-	fi
-fi
+# Requires colors autoload.
+# See termcap(5).
+
+# Set up once, and then reuse. This way it supports user overrides after the
+# plugin is loaded.
+typeset -AHg less_termcap
+
+# bold & blinking mode
+less_termcap[mb]="${fg_bold[red]}"
+less_termcap[md]="${fg_bold[red]}"
+less_termcap[me]="${reset_color}"
+# standout mode
+less_termcap[so]="${fg_bold[yellow]}${bg[blue]}"
+less_termcap[se]="${reset_color}"
+# underlining
+less_termcap[us]="${fg_bold[green]}"
+less_termcap[ue]="${reset_color}"
+
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+# Absolute path to this file's directory.
+typeset -g __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
-	command env \
-		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
-		LESS_TERMCAP_md=$(printf "\e[1;31m") \
-		LESS_TERMCAP_me=$(printf "\e[0m") \
-		LESS_TERMCAP_se=$(printf "\e[0m") \
-		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
-		LESS_TERMCAP_ue=$(printf "\e[0m") \
-		LESS_TERMCAP_us=$(printf "\e[1;32m") \
-		PAGER="${commands[less]:-$PAGER}" \
-		_NROFF_U=1 \
-		PATH="$HOME/bin:$PATH" \
-			"$@"
+  local -a environment
+
+  # Convert associative array to plain array of NAME=VALUE items.
+  local k v
+  for k v in "${(@kv)less_termcap}"; do
+    environment+=( "LESS_TERMCAP_${k}=${v}" )
+  done
+
+  # Prefer `less` whenever available, since we specifically configured
+  # environment for it.
+  environment+=( PAGER="${commands[less]:-$PAGER}" )
+
+  # See ./nroff script.
+  if [[ "$OSTYPE" = solaris* ]]; then
+    environment+=( PATH="${__colored_man_pages_dir}:$PATH" )
+  fi
+
+  command env $environment "$@"
 }
 
 # Colorize man and dman/debman (from debian-goodies)
 function man \
-	dman \
-	debman {
-	colored $0 "$@"
+  dman \
+  debman {
+  colored $0 "$@"
 }

plugins/colored-man-pages/nroff

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# The whole point of this wrapper is to replace emboldening factor -u0 with
+# -u1 under certain circumstances on Solaris.
+
+if [ "$1,$2,$3" = "-u0,-Tlp,-man" ]; then
+  shift
+  exec /usr/bin/nroff -u1 "$@"
+else
+  # Some other invocation of nroff
+  exec /usr/bin/nroff "$@"
+fi

plugins/colorize/colorize.plugin.zsh

@@ -6,7 +6,8 @@ alias cless="colorize_less"
 ZSH_COLORIZE_PLUGIN_PATH=$0:A
 
 colorize_check_requirements() {
-    local available_tools=("chroma" "pygmentize")
+    local -a available_tools
+    available_tools=("chroma" "pygmentize")
 
     if [ -z "$ZSH_COLORIZE_TOOL" ]; then
         if (( $+commands[pygmentize] )); then
@@ -81,7 +82,7 @@ colorize_less() {
         # This variable tells less to pipe every file through the specified command
         # (see the man page of less INPUT PREPROCESSOR).
         # 'zsh -ic "colorize_cat %s 2> /dev/null"' would not work for huge files like
-        # the ~/.zsh_history. For such files the tty of the preprocessor will be supended.
+        # the ~/.zsh_history. For such files the tty of the preprocessor will be suspended.
         # Therefore we must source this file to make colorize_cat available in the
         # preprocessor without the interactive mode.
         # `2>/dev/null` will suppress the error for large files 'broken pipe' of the python
@@ -95,7 +96,7 @@ colorize_less() {
         # which assumes that his LESSOPEN has been executed.
         local LESSCLOSE=""
 
-        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" less "$@"
+        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" command less "$@"
     }
 
     if [ -t 0 ]; then

plugins/command-not-found/README.md

@@ -28,5 +28,7 @@ It works out of the box with the command-not-found packages for:
 - [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
 - [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
+- [Termux](https://github.com/termux/command-not-found)
+- [SUSE](https://www.unix.com/man-page/suse/1/command-not-found/)
 
 You can add support for other platforms by submitting a Pull Request.

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

@@ -1,38 +1,69 @@
-# Uses the command-not-found package zsh support
-# as seen in https://www.porcheron.info/command-not-found-for-zsh/
-# this is installed in Ubuntu
+## Platforms with a built-in command-not-found handler init file
 
-[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+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
+  /opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+  /usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+); do
+  if [[ -r "$file" ]]; then
+    source "$file"
+    unset file
+    return 0
+  fi
+done
+unset file
 
-# Arch Linux command-not-found support, you must have package pkgfile installed
-# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
-[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
 
-# Fedora command-not-found support
-if [ -f /usr/libexec/pk-command-not-found ]; then
-    command_not_found_handler () {
-        runcnf=1
-        retval=127
-        [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
-        [ ! -x /usr/libexec/packagekitd ] && runcnf=0
-        if [ $runcnf -eq 1 ]
-            then
-            /usr/libexec/pk-command-not-found $@
-            retval=$?
-        fi
-        return $retval
-    }
+## Platforms with manual command_not_found_handler() setup
+
+# Debian and derivatives: https://launchpad.net/ubuntu/+source/command-not-found
+if [[ -x /usr/lib/command-not-found || -x /usr/share/command-not-found/command-not-found ]]; then
+  command_not_found_handler() {
+    if [[ -x /usr/lib/command-not-found ]]; then
+      /usr/lib/command-not-found -- "$1"
+      return $?
+    elif [[ -x /usr/share/command-not-found/command-not-found ]]; then
+      /usr/share/command-not-found/command-not-found -- "$1"
+      return $?
+    else
+      printf "zsh: command not found: %s\n" "$1" >&2
+      return 127
+    fi
+  }
 fi
 
-# OSX command-not-found support
-# https://github.com/Homebrew/homebrew-command-not-found
-if [[ -s '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh' ]]; then
-    source '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh'
+# Fedora: https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound
+if [[ -x /usr/libexec/pk-command-not-found ]]; then
+  command_not_found_handler() {
+    if [[ -S /var/run/dbus/system_bus_socket && -x /usr/libexec/packagekitd ]]; then
+      /usr/libexec/pk-command-not-found "$@"
+      return $?
+    fi
+
+    printf "zsh: command not found: %s\n" "$1" >&2
+    return 127
+  }
 fi
 
-# NixOS command-not-found support
-if [ -x /run/current-system/sw/bin/command-not-found ]; then
-    command_not_found_handler () {
-        /run/current-system/sw/bin/command-not-found $@
-    }
+# NixOS: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found
+if [[ -x /run/current-system/sw/bin/command-not-found ]]; then
+  command_not_found_handler() {
+    /run/current-system/sw/bin/command-not-found "$@"
+  }
+fi
+
+# Termux: https://github.com/termux/command-not-found
+if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; then
+  command_not_found_handler() {
+    /data/data/com.termux/files/usr/libexec/termux/command-not-found "$1"
+  }
+fi
+
+# SUSE and derivates: https://www.unix.com/man-page/suse/1/command-not-found/
+if [[ -x /usr/bin/command-not-found ]]; then
+  command_not_found_handler() {
+    /usr/bin/command-not-found "$1"
+  }
 fi