Merge 1b4703387d into 9bcafe1c27

lib/git.zsh

@@ -162,18 +162,6 @@ function git_current_branch() {
   echo ${ref#refs/heads/}
 }
 
-# Outputs the name of the previously checked out branch
-# Usage example: git pull origin $(git_current_branch)
-# rev-parse --symbolic-full-name @{-1} only prints if it is a branch
-function git_previous_branch() {
-  local ref
-  ref=$(__git_prompt_git rev-parse --quiet --symbolic-full-name @{-1} 2> /dev/null)
-  local ret=$?
-  if [[ $ret != 0 ]] || [[ -z $ref ]]; then
-    return  # no git repo or non-branch previous ref
-  fi
-  echo ${ref#refs/heads/}
-}
 
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {

plugins/nvm/README.md

@@ -42,8 +42,6 @@ as you want:
 zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
 ```
 
-There will be a function `_omz_nvm_load` available to load `nvm` without executing any other trigger command.
-
 #### `.nvmrc` autoload
 
 Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_

plugins/nvm/nvm.plugin.zsh

@@ -20,7 +20,7 @@ if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
   return
 fi
 
-function _omz_nvm_setup_completion {
+function _omz_load_nvm_completion {
   local _nvm_completion
   # Load nvm bash completion
   for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
@@ -33,12 +33,12 @@ function _omz_nvm_setup_completion {
       break
     fi
   done
-  unfunction _omz_nvm_setup_completion
+  unfunction _omz_load_nvm_completion
 }
 
-function _omz_nvm_setup_autoload {
+function _omz_setup_autoload {
   if ! zstyle -t ':omz:plugins:nvm' autoload; then
-    unfunction _omz_nvm_setup_autoload
+    unfunction _omz_setup_autoload
     return
   fi
 
@@ -68,13 +68,13 @@ function _omz_nvm_setup_autoload {
   add-zsh-hook chpwd load-nvmrc
 
   load-nvmrc
-  unfunction _omz_nvm_setup_autoload
+  unfunction _omz_setup_autoload
 }
 
 if zstyle -t ':omz:plugins:nvm' lazy; then
   # Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
   zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
-  nvm_lazy_cmd=(_omz_nvm_load nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
+  nvm_lazy_cmd=(nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
   eval "
     function $nvm_lazy_cmd {
       for func in $nvm_lazy_cmd; do
@@ -84,16 +84,14 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
       done
       # Load nvm if it exists in \$NVM_DIR
       [[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
-      _omz_nvm_setup_completion
-      _omz_nvm_setup_autoload
-      if [[ \"\$0\" != _omz_nvm_load ]]; then
-        \"\$0\" \"\$@\"
-      fi
+      _omz_load_nvm_completion
+      _omz_setup_autoload
+      \"\$0\" \"\$@\"
     }
   "
   unset nvm_lazy_cmd
 else
   source "$NVM_DIR/nvm.sh"
-  _omz_nvm_setup_completion
-  _omz_nvm_setup_autoload
+  _omz_load_nvm_completion
+  _omz_setup_autoload
 fi

plugins/terraform/README.md

@@ -15,23 +15,22 @@ plugins=(... terraform)
 
 ## Aliases
 
-| Alias   | Command                          |
-|---------|----------------------------------|
-| `tf`    | `terraform`                      |
-| `tfa`   | `terraform apply`                |
-| `tfaa`  | `terraform apply -auto-approve`  |
-| `tfc`   | `terraform console`              |
-| `tfd`   | `terraform destroy`              |
-| `tff`   | `terraform fmt`                  |
-| `tffr`  | `terraform fmt -recursive`       |
-| `tfi`   | `terraform init`                 |
-| `tfiu`  | `terraform init -upgrade`        |
-| `tfo`   | `terraform output`               |
-| `tfp`   | `terraform plan`                 |
-| `tfv`   | `terraform validate`             |
-| `tfs`   | `terraform state`                |
-| `tft`   | `terraform test`                 |
-| `tfsh`  | `terraform show`                 |
+| Alias  | Command                    |
+|--------|----------------------------|
+| `tf`   | `terraform`                |
+| `tfa`  | `terraform apply`          |
+| `tfc`  | `terraform console`        |
+| `tfd`  | `terraform destroy`        |
+| `tff`  | `terraform fmt`            |
+| `tffr` | `terraform fmt -recursive` |
+| `tfi`  | `terraform init`           |
+| `tfiu` | `terraform init -upgrade`  |
+| `tfo`  | `terraform output`         |
+| `tfp`  | `terraform plan`           |
+| `tfv`  | `terraform validate`       |
+| `tfs`  | `terraform state`          |
+| `tft`  | `terraform test`           |
+| `tfsh` | `terraform show`           |
 
 
 ## Prompt function

plugins/terraform/terraform.plugin.zsh

@@ -17,7 +17,6 @@ function tf_version_prompt_info() {
 
 alias tf='terraform'
 alias tfa='terraform apply'
-alias tfaa='terraform apply -auto-approve'
 alias tfc='terraform console'
 alias tfd='terraform destroy'
 alias tff='terraform fmt'

plugins/web-search/README.md

@@ -51,7 +51,6 @@ Available search contexts are:
 | `packagist`           | `https://packagist.org/?query=`                 |
 | `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
 | `chatgpt`             | `https://chatgpt.com/?q=`                       |
-| `reddit`              | `https://www.reddit.com/search/?q=`             |
 
 Also there are aliases for bang-searching DuckDuckGo:
 

plugins/web-search/web-search.plugin.zsh

@@ -32,7 +32,6 @@ function web_search() {
     packagist       "https://packagist.org/?query="
     gopkg           "https://pkg.go.dev/search?m=package&q="
     chatgpt         "https://chatgpt.com/?q="
-    reddit          "https://www.reddit.com/search/?q="
   )
 
   # check whether the search engine is supported
@@ -86,7 +85,6 @@ alias npmpkg='web_search npmpkg'
 alias packagist='web_search packagist'
 alias gopkg='web_search gopkg'
 alias chatgpt='web_search chatgpt'
-alias reddit='web_search reddit'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'

themes/gnzh.zsh-theme

@@ -30,9 +30,8 @@ local return_code="%(?..%F{red}%? ↵%f)"
 local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
 local current_dir="%B%F{blue}%~%f%b"
 local git_branch='$(git_prompt_info)'
-local venv_prompt='$(virtualenv_prompt_info)' 
 
-PROMPT="╭─${venv_prompt}${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
+PROMPT="╭─${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
 ╰─$PR_PROMPT "
 RPROMPT="${return_code}"
 
@@ -40,7 +39,5 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
 ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
-ZSH_THEME_VIRTUALENV_PREFIX="%F{red}("
-ZSH_THEME_VIRTUALENV_SUFFIX=")%f "
 
 }