Merge branch 'ohmyzsh:master' into master

jizongFox · Jan 27, 2023 · d40761e · d40761e
2 parents 0d3f68a + b0bffca
commit d40761e
Show file tree

Hide file tree

Showing 68 changed files with 1,080 additions and 479 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,6 +1,5 @@
 # Plugin owners
 plugins/archlinux/                  @ratijas
-plugins/aws/                        @maksyms
 plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - master
   push:
-    branches: 
+    branches:
       - master
 
 concurrency:
@@ -27,7 +27,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     steps:
       - name: Set up git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install zsh
         if: runner.os == 'Linux'
         run: sudo apt-get update; sudo apt-get install zsh

diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "printWidth": 110,
+  "proseWrap": "always"
+}
diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
@@ -57,6 +57,9 @@ function detect-clipboard() {
   elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
     function clipcopy() { cat "${1:-/dev/stdin}" > /dev/clipboard; }
     function clippaste() { cat /dev/clipboard; }
+  elif (( $+commands[clip.exe] )) && (( $+commands[powershell.exe] )); then
+    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
+    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
     function clipcopy() { cat "${1:-/dev/stdin}" | wl-copy &>/dev/null &|; }
     function clippaste() { wl-paste; }
@@ -81,9 +84,6 @@ function detect-clipboard() {
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer "${1:--}"; }
     function clippaste() { tmux save-buffer -; }
-  elif [[ $(uname -r) = *icrosoft* ]]; then
-    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
-    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   else
     function _retry_clipboard_detection_or_fail() {
       local clipcmd="${1}"; shift

diff --git a/lib/functions.zsh b/lib/functions.zsh
@@ -56,7 +56,7 @@ function takegit() {
 }
 
 function take() {
-  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+  if [[ $1 =~ ^(https?|ftp).*\.(tar\.(gz|bz2|xz)|tgz)$ ]]; then
     takeurl "$1"
   elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
     takegit "$1"

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
@@ -41,7 +41,11 @@ fi
 
 # enable diff color if possible.
 if command diff --color /dev/null /dev/null &>/dev/null; then
-  alias diff='diff --color'
+  function color-diff {
+    diff --color $@
+  }
+  alias diff="color-diff"
+  compdef _diff color-diff # compdef is already loaded by this point
 fi
 
 setopt auto_cd

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
@@ -57,9 +57,7 @@ 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"
-fi
+source "$ZSH/tools/check_for_upgrade.sh"
 
 # Initializes Oh My Zsh
 

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
@@ -1,18 +1,18 @@
 declare -a autojump_paths
 autojump_paths=(
-  $HOME/.autojump/etc/profile.d/autojump.zsh         # manual installation
-  $HOME/.autojump/share/autojump/autojump.zsh        # manual installation
-  $HOME/.nix-profile/etc/profile.d/autojump.sh       # NixOS installation
-  /run/current-system/sw/share/autojump/autojump.zsh # NixOS installation
-  /usr/share/autojump/autojump.zsh                   # Debian and Ubuntu package
-  /etc/profile.d/autojump.zsh                        # manual installation
-  /etc/profile.d/autojump.sh                         # Gentoo installation
-  /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
-  /usr/pkg/share/autojump/autojump.zsh               # NetBSD installation
-  /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
-  /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
-  /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)
-  /etc/profiles/per-user/$USER/bin/autojump          # macOS Nix, Home Manager and flakes
+  $HOME/.autojump/etc/profile.d/autojump.zsh             # manual installation
+  $HOME/.autojump/share/autojump/autojump.zsh            # manual installation
+  $HOME/.nix-profile/etc/profile.d/autojump.sh           # NixOS installation
+  /run/current-system/sw/share/autojump/autojump.zsh     # NixOS installation
+  /usr/share/autojump/autojump.zsh                       # Debian and Ubuntu package
+  /etc/profile.d/autojump.zsh                            # manual installation
+  /etc/profile.d/autojump.sh                             # Gentoo installation
+  /usr/local/share/autojump/autojump.zsh                 # FreeBSD installation
+  /usr/pkg/share/autojump/autojump.zsh                   # NetBSD installation
+  /opt/local/etc/profile.d/autojump.sh                   # macOS with MacPorts
+  /usr/local/etc/profile.d/autojump.sh                   # macOS with Homebrew (default)
+  /opt/homebrew/etc/profile.d/autojump.sh                # macOS with Homebrew (default on M1 macs)
+  /etc/profiles/per-user/$USER/etc/profile.d/autojump.sh # macOS Nix, Home Manager and flakes
 )
 
 for file in $autojump_paths; do

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
@@ -146,6 +146,7 @@ function aws_change_access_key() {
 }
 
 function aws_profiles() {
+  aws --no-cli-pager configure list-profiles 2> /dev/null && return
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
   grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
@@ -17,17 +17,20 @@ defined for convenience.
 
 ## Aliases
 
-| 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).                                  |
+| 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.                     |
+| `bcubc`  | `brew upgrade --cask && brew cleanup`   | Update outdated casks, then run cleanup.                            |
+| `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.              |
+| `bugbc`  | `brew upgrade --greedy && brew cleanup` | Upgrade outdated formulae and casks (greedy), 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.                                   |
+| `bfu`    | `brew upgrade --formula`                | Upgrade only formulas (not casks).                                  |
+| `buz`    | `brew uninstall --zap`                  | Remove all files associated with a cask.                            |
 
 ## Completion
 

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
@@ -27,12 +27,16 @@ fi
 
 alias bcubc='brew upgrade --cask && brew cleanup'
 alias bcubo='brew update && brew outdated --cask'
+alias bcubc='brew upgrade --cask && brew cleanup'
 alias brewp='brew pin'
 alias brewsp='brew list --pinned'
 alias bubc='brew upgrade && brew cleanup'
+alias bugbc='brew upgrade --greedy && brew cleanup'
 alias bubo='brew update && brew outdated'
 alias bubu='bubo && bubc'
-alias buf='brew upgrade --formula'
+alias bubug='bubo && bugbc'
+alias bfu='brew upgrade --formula'
+alias buz='brew uninstall --zap'
 
 function brews() {
   local formulae="$(brew leaves | xargs brew deps --installed --for-each)"

diff --git a/plugins/bridgetown/README.md b/plugins/bridgetown/README.md
@@ -0,0 +1,26 @@
+# Bridgetown plugin
+
+This plugin adds some aliases and autocompletion for common [Bridgetown](https://bridgetownrb.com/) commands.
+
+To use it, add `bridgetown` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... bridgetown)
+```
+
+## Aliases
+
+| Alias | Command                    |
+|-------|----------------------------|
+| br      | `bridgetown`              |
+| bra     | `bin/bridgetown apply`    |
+| brb     | `bin/bridgetown build`    |
+| brc     | `bin/bridgetown console`  |
+| brclean | `bin/bridgetown clean`    |
+| brd     | `bin/bridgetown deploy`   |
+| brdoc   | `bin/bridgetown doctor`   |
+| brh     | `bin/bridgetown help`     |
+| brn     | `bridgetown new`          |
+| brp     | `bridgetown plugins`      |
+| brpl    | `bridgetown plugins list` |
+| brs     | `bin/bridgetown start`    |
diff --git a/plugins/bridgetown/bridgetown.plugin.zsh b/plugins/bridgetown/bridgetown.plugin.zsh
@@ -0,0 +1,12 @@
+alias br='bridgetown'
+alias bra='bin/bridgetown apply'
+alias brb='bin/bridgetown build'
+alias brc='bin/bridgetown console'
+alias brclean='bin/bridgetown clean'
+alias brd='bin/bridgetown deploy'
+alias brdoc='bin/bridgetown doctor'
+alias brh='bin/bridgetown help'
+alias brn='bridgetown new'
+alias brp='bridgetown plugins'
+alias brpl='bridgetown plugins list'
+alias brs='bin/bridgetown start'
diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
@@ -11,22 +11,23 @@ plugins=(... docker-compose)
 
 ## Aliases
 
-| Alias     | Command                        | Description                                                      |
-|-----------|--------------------------------|------------------------------------------------------------------|
-| dco       | `docker-compose`               | Docker-compose main command                                      |
-| dcb       | `docker-compose build`         | Build containers                                                 |
-| dce       | `docker-compose exec`          | Execute command inside a container                               |
-| dcps      | `docker-compose ps`            | List containers                                                  |
-| dcrestart | `docker-compose restart`       | Restart container                                                |
-| dcrm      | `docker-compose rm`            | Remove container                                                 |
-| dcr       | `docker-compose run`           | Run a command in container                                       |
-| dcstop    | `docker-compose stop`          | Stop a container                                                 |
-| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service |
-| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers      |
-| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                             |
-| dcdn      | `docker-compose down`          | Stop and remove containers                                       |
-| dcl       | `docker-compose logs`          | Show logs of container                                           |
-| dclf      | `docker-compose logs -f`       | Show logs and follow output                                      |
-| dcpull    | `docker-compose pull`          | Pull image of a service                                          |
-| dcstart   | `docker-compose start`         | Start a container                                                |
-| dck       | `docker-compose kill`          | Kills containers                                                 |
+| Alias     | Command                        | Description                                                                      |
+|-----------|--------------------------------|----------------------------------------------------------------------------------|
+| dco       | `docker-compose`               | Docker-compose main command                                                      |
+| dcb       | `docker-compose build`         | Build containers                                                                 |
+| dce       | `docker-compose exec`          | Execute command inside a container                                               |
+| dcps      | `docker-compose ps`            | List containers                                                                  |
+| dcrestart | `docker-compose restart`       | Restart container                                                                |
+| dcrm      | `docker-compose rm`            | Remove container                                                                 |
+| dcr       | `docker-compose run`           | Run a command in container                                                       |
+| dcstop    | `docker-compose stop`          | Stop a container                                                                 |
+| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service                 |
+| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers                      |
+| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                                             |
+| dcupdb    | `docker-compose up -d --build` | Same as `dcup`, but build images before starting containers and starts as daemon |
+| dcdn      | `docker-compose down`          | Stop and remove containers                                                       |
+| dcl       | `docker-compose logs`          | Show logs of container                                                           |
+| dclf      | `docker-compose logs -f`       | Show logs and follow output                                                      |
+| dcpull    | `docker-compose pull`          | Pull image of a service                                                          |
+| dcstart   | `docker-compose start`         | Start a container                                                                |
+| dck       | `docker-compose kill`          | Kills containers                                                                 |
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -12,6 +12,7 @@ alias dcstop="$dccmd stop"
 alias dcup="$dccmd up"
 alias dcupb="$dccmd up --build"
 alias dcupd="$dccmd up -d"
+alias dcupdb="$dccmd up -d --build"
 alias dcdn="$dccmd down"
 alias dcl="$dccmd logs"
 alias dclf="$dccmd logs -f"