Merge 0868e0df00 into 30e516a3aa

*Total -- 1,425.84kb -> 1,146.04kb (19.62%)

/plugins/kubectx/prod.png -- 3.74kb -> 2.29kb (38.71%)
/plugins/kubectx/stage.png -- 3.74kb -> 2.35kb (37.16%)
/plugins/zsh-navigation-tools/doc/img/n-history2.png -- 105.78kb -> 70.81kb (33.05%)
/plugins/localstack/sqs-send-result.png -- 69.00kb -> 55.75kb (19.21%)
/plugins/z/img/demo.gif -- 1,241.72kb -> 1,012.99kb (18.42%)
/plugins/z/img/zsh_4.3.11_plus.svg -- 0.93kb -> 0.93kb (0.11%)
/plugins/z/img/mit_license.svg -- 0.93kb -> 0.93kb (0.11%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>

plugins/jj/README.md

@@ -0,0 +1,89 @@
+# jj - Jujutsu CLI
+
+This plugin provides autocompletion for [jj](https://martinvonz.github.io/jj).
+
+To use it, add `jj` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... jj)
+```
+
+## Aliases
+
+| Alias  | Command                       |
+| ------ | ----------------------------- |
+| jjc    | `jj commit`                   |
+| jjcmsg | `jj commit --message`         |
+| jjd    | `jj diff`                     |
+| jjdmsg | `jj desc --message`           |
+| jjds   | `jj desc`                     |
+| jje    | `jj edit`                     |
+| jjgcl  | `jj git clone`                |
+| jjgf   | `jj git fetch`                |
+| jjgp   | `jj git push`                 |
+| jjl    | `jj log`                      |
+| jjla   | `jj log -r "all()"`           |
+| jjn    | `jj new`                      |
+| jjrb   | `jj rebase`                   |
+| jjrs   | `jj restore`                  |
+| jjrt   | `cd "$(jj root \|\| echo .)"` |
+| jjsp   | `jj split`                    |
+| jjsq   | `jj squash`                   |
+
+## Prompt usage
+
+Because `jj` has a very powerful [template syntax](https://martinvonz.github.io/jj/latest/templates/), this
+plugin only exposes a convenience function `jj_prompt_template` to read information from the current change.
+It is basically the same as `jj log --no-graph -r @ -T $1`:
+
+```sh
+_my_theme_jj_info() {
+  jj_prompt_template 'self.change_id().shortest(3)'
+}
+
+PROMPT='$(_my_theme_jj_info) $'
+```
+
+`jj_prompt_template` escapes `%` signs in the output. Use `jj_prompt_template_raw` if you don't want that
+(e.g. to colorize the output).
+
+However, because `jj` can be used inside a Git repository, some themes might clash with it. Generally, you can
+fix it with a wrapper function that tries `jj` first and then falls back to `git` if it didn't work:
+
+```sh
+_my_theme_vcs_info() {
+  jj_prompt_template 'self.change_id().shortest(3)' \
+  || git_prompt_info
+}
+
+PROMPT='$(_my_theme_vcs_info) $'
+```
+
+You can find an example
+[here](https://github.com/nasso/omzsh/blob/e439e494f22f4fd4ef1b6cb64626255f4b341c1b/themes/sunakayu.zsh-theme).
+
+### Performance
+
+Sometimes `jj` can be slower than `git`.
+
+If you feel slowdowns, consider using the following:
+
+```
+zstyle :omz:plugins:jj ignore-working-copy yes
+```
+
+This will add `--ignore-working-copy` to all `jj` commands executed by your prompt. The downside here is that
+your prompt might be out-of-sync until the next time `jj` gets a chance to _not_ ignore the working copy (i.e.
+you manually run a `jj` command).
+
+If you prefer to keep your prompt always up-to-date but still don't want to _feel_ the slowdown, you can make
+your prompt asynchronous. This plugin doesn't do this automatically so you'd have to hack your theme a bit for
+that.
+
+## See Also
+
+- [martinvonz/jj](https://github.com/martinvonz/jj)
+
+## Contributors
+
+- [nasso](https://github.com/nasso) - Plugin Author

plugins/jj/jj.plugin.zsh

@@ -0,0 +1,53 @@
+# if jj is not found, don't do the rest of the script
+if (( ! $+commands[jj] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `jj`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_jj" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _jj
+  _comps[jj]=_jj
+fi
+
+jj util completion zsh >| "$ZSH_CACHE_DIR/completions/_jj" &|
+
+function __jj_prompt_jj() {
+  local -a flags
+  flags=("--no-pager")
+  if zstyle -t ':omz:plugins:jj' ignore-working-copy; then
+    flags+=("--ignore-working-copy")
+  fi
+  command jj $flags "$@"
+}
+
+# convenience functions for themes
+function jj_prompt_template_raw() {
+  __jj_prompt_jj log --no-graph -r @ -T "$@" 2> /dev/null
+}
+
+function jj_prompt_template() {
+  local out
+  out=$(jj_prompt_template_raw "$@") || return 1
+  echo "${out:gs/%/%%}"
+}
+
+# Aliases (sorted alphabetically)
+alias jjc='jj commit'
+alias jjcmsg='jj commit --message'
+alias jjd='jj diff'
+alias jjdmsg='jj desc --message'
+alias jjds='jj desc'
+alias jje='jj edit'
+alias jjgcl='jj git clone'
+alias jjgf='jj git fetch'
+alias jjgp='jj git push'
+alias jjl='jj log'
+alias jjla='jj log -r "all()"'
+alias jjn='jj new'
+alias jjrb='jj rebase'
+alias jjrs='jj restore'
+alias jjrt='cd "$(jj root || echo .)"'
+alias jjsp='jj split'
+alias jjsq='jj squash'

plugins/macos/README.md

@@ -16,28 +16,29 @@ plugins=(... macos)
 
 ## Commands
 
-| Command       | Description                                              |
-| :------------ | :------------------------------------------------------- |
-| `tab`         | Open the current directory in a new tab                  |
-| `split_tab`   | Split the current terminal tab horizontally              |
-| `vsplit_tab`  | Split the current terminal tab vertically                |
-| `ofd`         | Open passed directories (or $PWD by default) in Finder   |
-| `pfd`         | Return the path of the frontmost Finder window           |
-| `pfs`         | Return the current Finder selection                      |
-| `cdf`         | `cd` to the current Finder directory                     |
-| `pushdf`      | `pushd` to the current Finder directory                  |
-| `pxd`         | Return the current Xcode project directory               |
-| `cdx`         | `cd` to the current Xcode project directory              |
-| `quick-look`  | Quick-Look a specified file                              |
-| `man-preview` | Open man pages in Preview app                            |
-| `showfiles`   | Show hidden files in Finder                              |
-| `hidefiles`   | Hide the hidden files in Finder                          |
-| `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
-| `music`       | Control Apple Music. Use `music -h` for usage details    |
-| `spotify`     | Control Spotify and search by artist, album, track…      |
-| `rmdsstore`   | Remove .DS_Store files recursively in a directory        |
-| `btrestart`   | Restart the Bluetooth daemon                             |
-| `freespace`   | Erases purgeable disk space with 0s on the selected disk |
+| Command          | Description                                              |
+| :--------------- | :------------------------------------------------------- |
+| `tab`            | Open the current directory in a new tab                  |
+| `split_tab`      | Split the current terminal tab horizontally              |
+| `vsplit_tab`     | Split the current terminal tab vertically                |
+| `ofd`            | Open passed directories (or $PWD by default) in Finder   |
+| `pfd`            | Return the path of the frontmost Finder window           |
+| `pfs`            | Return the current Finder selection                      |
+| `cdf`            | `cd` to the current Finder directory                     |
+| `pushdf`         | `pushd` to the current Finder directory                  |
+| `pxd`            | Return the current Xcode project directory               |
+| `cdx`            | `cd` to the current Xcode project directory              |
+| `quick-look`     | Quick-Look a specified file                              |
+| `man-preview`    | Open man pages in Preview app                            |
+| `showfiles`      | Show hidden files in Finder                              |
+| `hidefiles`      | Hide the hidden files in Finder                          |
+| `resetlaunchpad` | Reset the Launchpad layout                               |
+| `itunes`         | _DEPRECATED_. Use `music` from macOS Catalina on         |
+| `music`          | Control Apple Music. Use `music -h` for usage details    |
+| `spotify`        | Control Spotify and search by artist, album, track…      |
+| `rmdsstore`      | Remove .DS_Store files recursively in a directory        |
+| `btrestart`      | Restart the Bluetooth daemon                             |
+| `freespace`      | Erases purgeable disk space with 0s on the selected disk |
 
 ## Acknowledgements
 

plugins/macos/macos.plugin.zsh

@@ -17,6 +17,20 @@ function ofd {
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
 alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
 
+# Reset the Launchpad layout
+function resetlaunchpad() {
+  if [[ "$(sw_vers --productVersion)" -ge 15.0 ]]; then
+    local user_dir="$(getconf DARWIN_USER_DIR)"
+    if [[ -n "$user_dir" && -d "$user_dir/com.apple.dock.launchpad" ]]; then
+      rm -rf "$user_dir/com.apple.dock.launchpad" &&
+      killall Dock
+    fi
+  else
+    defaults write com.apple.dock ResetLaunchPad -bool true
+    && killall Dock
+  fi
+}
+
 # Bluetooth restart
 function btrestart() {
   sudo kextunload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport

plugins/z/img/mit_license.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="78" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="78" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h47v20H0z"/><path fill="#97CA00" d="M47 0h31v20H47z"/><path fill="url(#b)" d="M0 0h78v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="245" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">license</text><text x="245" y="140" transform="scale(.1)" textLength="370">license</text><text x="615" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="210">MIT</text><text x="615" y="140" transform="scale(.1)" textLength="210">MIT</text></g> </svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="78" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="78" height="20" fill="#fff" rx="3"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h47v20H0z"/><path fill="#97CA00" d="M47 0h31v20H47z"/><path fill="url(#b)" d="M0 0h78v20H0z"/></g><g fill="#fff" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110" text-anchor="middle"><text x="245" y="150" fill="#010101" fill-opacity=".3" textLength="370" transform="scale(.1)">license</text><text x="245" y="140" textLength="370" transform="scale(.1)">license</text><text x="615" y="150" fill="#010101" fill-opacity=".3" textLength="210" transform="scale(.1)">MIT</text><text x="615" y="140" textLength="210" transform="scale(.1)">MIT</text></g></svg>

plugins/z/img/zsh_4.3.11_plus.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="84" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="84" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h29v20H0z"/><path fill="#e05d44" d="M29 0h55v20H29z"/><path fill="url(#b)" d="M0 0h84v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="155" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="190">zsh</text><text x="155" y="140" transform="scale(.1)" textLength="190">zsh</text><text x="555" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="450">4.3.11+</text><text x="555" y="140" transform="scale(.1)" textLength="450">4.3.11+</text></g> </svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="84" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="84" height="20" fill="#fff" rx="3"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h29v20H0z"/><path fill="#e05d44" d="M29 0h55v20H29z"/><path fill="url(#b)" d="M0 0h84v20H0z"/></g><g fill="#fff" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110" text-anchor="middle"><text x="155" y="150" fill="#010101" fill-opacity=".3" textLength="190" transform="scale(.1)">zsh</text><text x="155" y="140" textLength="190" transform="scale(.1)">zsh</text><text x="555" y="150" fill="#010101" fill-opacity=".3" textLength="450" transform="scale(.1)">4.3.11+</text><text x="555" y="140" textLength="450" transform="scale(.1)">4.3.11+</text></g></svg>