lib/termsupport.zsh

@@ -42,7 +42,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"

plugins/kubectl/README.md

@@ -106,11 +106,3 @@ plugins=(... kubectl)
 | kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
-
-## Wrappers
-
-This plugin provides 3 wrappers to colorize kubectl output in JSON and YAML using various tools (which must be installed):
-
-- `kj`: JSON, colorized with [`jq`](https://stedolan.github.io/jq/).
-- `kjx`: JSON, colorized with [`fx`](https://github.com/antonmedv/fx).
-- `ky`: YAML, colorized with [`yh`](https://github.com/andreazorzetto/yh).

plugins/kubectl/kubectl.plugin.zsh

@@ -150,19 +150,3 @@ alias kepvc='kubectl edit pvc'
 alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
-# Colored JSON output
-kj() {
-  kubectl "$@" -o json | jq
-}
-compdef kj=kubectl
-
-kjx() {
-  kubectl "$@" -o json | fx
-}
-compdef kjx=kubectl
-
-# Colored YAML output
-ky() {
-  kubectl "$@" -o yaml | yh
-}
-compdef ky=kubectl

plugins/nvm/README.md

@@ -1,18 +1,9 @@
 # nvm plugin
 
-This plugin adds autocompletions for [nvm](https://github.com/nvm-sh/nvm) — a Node.js version manager.
+This plugin adds autocompletions for [nvm](https://github.com/creationix/nvm) — a Node.js version manager.
 It also automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
 
 To use it, add `nvm` to the plugins array of your zshrc file:
-
 ```zsh
 plugins=(... nvm)
 ```
-
-## Settings
-
-- **`NVM_DIR`**: if you have installed nvm in a directory other than `$HOME/.nvm`, set and export `NVM_DIR`
-  to be the directory where you installed nvm.
-  
-- **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
-  can set `NVM_HOMEBREW` to be the directory where you installed it.

plugins/nvm/nvm.plugin.zsh

@@ -1,23 +1,8 @@
 # Set NVM_DIR if it isn't already defined
 [[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 
-# Don't try to load nvm if command already available
+# Try to load nvm only if command not already available
-type "nvm" &> /dev/null && return
+if ! type "nvm" &> /dev/null; then
-
+    # Load nvm if it exists
-# Load nvm if it exists in $NVM_DIR
+    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
-if [[ -f "$NVM_DIR/nvm.sh" ]]; then
-    source "$NVM_DIR/nvm.sh"
-    return
-fi
-
-# Otherwise try to load nvm installed via Homebrew
-
-# User can set this if they have an unusual Homebrew setup
-NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
-# Load nvm from Homebrew location if it exists
-[[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh"
-# Load nvm bash completion from Homebrew if it exists
-if [[ -f "$NVM_HOMEBREW/etc/bash_completion.d/nvm" ]]; then
-    autoload -U +X bashcompinit && bashcompinit
-    source "$NVM_HOMEBREW/etc/bash_completion.d/nvm"
 fi