Merge branch 'ohmyzsh:master' into master

plugins/cargo/README.md

@@ -1,3 +0,0 @@
-# cargo
-
-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**

plugins/cargo/cargo.plugin.zsh

@@ -1,7 +0,0 @@
-print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
-  fpath=("$ZSH/plugins/rust" $fpath)
-  source "$ZSH/plugins/rust/rust.plugin.zsh"
-}

plugins/copydir/README.md

@@ -1,3 +0,0 @@
-# copydir plugin
-
-This plugin is deprecated. Use the [`copypath` plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/copypath) instead.

plugins/copydir/copydir.plugin.zsh

@@ -1,7 +0,0 @@
-echo ${(%):-'%F{yellow}The `%Bcopydir%b` plugin is deprecated. Use the `%Bcopypath%b` plugin instead.%f'}
-source "$ZSH/plugins/copypath/copypath.plugin.zsh"
-
-# TODO: 2022-02-22: Remove deprecated copydir function.
-function copydir {
-  copypath
-}

plugins/emacs/emacsclient.sh

@@ -11,7 +11,7 @@ emacsfun() {
   esac
 
   # Check if there are suitable frames
-  frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null)"
+  frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null |sed 's/.*\x07//g' )"
 
   # Only create another X frame if there isn't one present
   if [ -z "$frames" -o "$frames" = nil ]; then

plugins/npx/README.md

@@ -1,16 +0,0 @@
-# npx plugin
-
-## Deprecation
-
-Since npm v7, `npx` has been moved to `npm exec`. With the move, [the `--shell-auto-fallback` argument
-for `npx` has been removed](https://github.com/npm/cli/blob/v7.0.0/docs/content/cli-commands/npm-exec.md#compatibility-with-older-npx-versions):
-
-> Shell fallback functionality is removed, as it is not advisable.
-
-When using npm v7, you'll get this error:
-
-> npx: the --shell-auto-fallback argument has been removed
-
-If you get this error, just disable the plugin by removing it from the plugins array in your zshrc file.
-This plugin will no longer be maintained and will be removed in the future, when the older `npx` versions
-are no longer available.

plugins/npx/npx.plugin.zsh

@@ -1,12 +0,0 @@
-if (( ! $+commands[npx] )); then
-  return
-fi
-
-if ! npx_fallback_script="$(npx --shell-auto-fallback zsh 2>/dev/null)"; then
-  print -u2 ${(%):-"%F{yellow}This \`npx\` version ($(npx --version)) is not supported.%f"}
-else
-  source <(<<< "$npx_fallback_script")
-fi
-
-print -u2 ${(%):-"%F{yellow}The \`npx\` plugin is deprecated and will be removed soon. %BPlease disable it%b.%f"}
-unset npx_fallback_script

plugins/osx/README.md

@@ -1,3 +0,0 @@
-# osx plugin
-
-**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**

plugins/osx/osx.plugin.zsh

@@ -1,5 +0,0 @@
-print -u2 ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
-print -u2 ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
-source "$ZSH/plugins/macos/macos.plugin.zsh"

plugins/rustup/README.md

@@ -1,3 +0,0 @@
-# rustup
-
-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**

plugins/rustup/rustup.plugin.zsh

@@ -1,7 +0,0 @@
-print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
-  fpath=("$ZSH/plugins/rust" $fpath)
-  source "$ZSH/plugins/rust/rust.plugin.zsh"
-}

plugins/toolbox/README.md

@@ -17,3 +17,9 @@ You can use it by adding `$(toolbox_prompt_info)` to your `PROMPT` or `RPROMPT`
 ```zsh
 RPROMPT='$(toolbox_prompt_info)'
 ```
+
+## Aliases
+
+| Alias | Command              | Description                            |
+|-------|----------------------|----------------------------------------|
+| tb    | `toolbox enter`      | Enters the toolbox environment         |

plugins/toolbox/toolbox.plugin.zsh

@@ -1,3 +1,5 @@
 function toolbox_prompt_info() {
   [[ -f /run/.toolboxenv ]] && echo "⬢"
 }
+
+alias tb="toolbox enter"