Merge ee799c252b into 7c10d9839f

Add PYTHON_AUTO_VRUN_RECURSIVE option to search parent directories
for virtual environments, useful for monorepos where venv is at
project root but you work in subdirectories.

plugins/opentofu/opentofu.plugin.zsh

@@ -30,14 +30,20 @@ function tofu_version_prompt_info() {
 alias tt='tofu'
 alias tta='tofu apply'
 alias tta!='tofu apply -auto-approve'
+alias ttap='tofu apply -parallelism=1'
+alias ttapp='tofu apply tfplan'
 alias ttc='tofu console'
 alias ttd='tofu destroy'
 alias ttd!='tofu destroy -auto-approve'
 alias ttf='tofu fmt'
 alias ttfr='tofu fmt -recursive'
 alias tti='tofu init'
+alias ttir='tofu init -reconfigure'
+alias ttiu='tofu init -upgrade'
+alias ttiur='tofu init -upgrade -reconfigure'
 alias tto='tofu output'
 alias ttp='tofu plan'
+alias ttpo='tofu plan -out tfplan'
 alias ttv='tofu validate'
 alias tts='tofu state'
 alias ttsh='tofu show'

plugins/python/README.md

@@ -34,6 +34,7 @@ virtual environments:
   `<venv-name>/bin/activate`, and automatically deactivate it when navigating out of it (keeps venv activated
   in subdirectories).
   - To enable the feature, set `PYTHON_AUTO_VRUN=true` before sourcing oh-my-zsh.
+  - To also search parent directories (useful for monorepos), set `PYTHON_AUTO_VRUN_RECURSIVE=true` as well.
   - The plugin activates the first existing virtual environment, in order, appearing in `$PYTHON_VENV_NAMES`.
     The default virtual environment name is `venv`. To use a different name, set
     `PYTHON_VENV_NAME=<venv-name>`. For example: `PYTHON_VENV_NAME=".venv"`

plugins/python/python.plugin.zsh

@@ -113,8 +113,21 @@ if [[ "$PYTHON_AUTO_VRUN" == "true" ]]; then
         # make sure we're not in a venv already
         (( $+functions[deactivate] )) && deactivate > /dev/null 2>&1
         source $file > /dev/null 2>&1
-        break
+        return
       done
+
+      # Search parent directories if recursive mode is enabled
+      if [[ "$PYTHON_AUTO_VRUN_RECURSIVE" == "true" ]]; then
+        local search_dir="$PWD:h"
+        while [[ "$search_dir" != "/" && "$search_dir" != "." ]]; do
+          for file in "${search_dir}/"${^PYTHON_VENV_NAMES[@]}"/bin/activate"(N.); do
+            (( $+functions[deactivate] )) && deactivate > /dev/null 2>&1
+            source $file > /dev/null 2>&1
+            return
+          done
+          search_dir="${search_dir:h}"
+        done
+      fi
     fi
   }
   add-zsh-hook chpwd auto_vrun

plugins/terraform/terraform.plugin.zsh

@@ -4,21 +4,21 @@ function tf_prompt_info() {
   # check if in terraform dir and file exists
   [[ -d "${TF_DATA_DIR:-.terraform}" && -r "${TF_DATA_DIR:-.terraform}/environment" ]] || return
 
-  local workspace="$(< "${TF_DATA_DIR:-.terraform}/environment")"
+  local workspace="$(<"${TF_DATA_DIR:-.terraform}/environment")"
   echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 
 function tf_version_prompt_info() {
-    local terraform_version
-    terraform_version=$(terraform --version | head -n 1 | cut -d ' ' -f 2)
-    echo "${ZSH_THEME_TF_VERSION_PROMPT_PREFIX-[}${terraform_version:gs/%/%%}${ZSH_THEME_TF_VERSION_PROMPT_SUFFIX-]}"
+  local terraform_version
+  terraform_version=$(terraform --version | head -n 1 | cut -d ' ' -f 2)
+  echo "${ZSH_THEME_TF_VERSION_PROMPT_PREFIX-[}${terraform_version:gs/%/%%}${ZSH_THEME_TF_VERSION_PROMPT_SUFFIX-]}"
 }
 
-
 alias tf='terraform'
 alias tfa='terraform apply'
 alias tfa!='terraform apply -auto-approve'
 alias tfap='terraform apply -parallelism=1'
+alias tfapp='terraform apply tfplan'
 alias tfc='terraform console'
 alias tfd='terraform destroy'
 alias tfd!='terraform destroy -auto-approve'
@@ -31,6 +31,7 @@ alias tfiu='terraform init -upgrade'
 alias tfiur='terraform init -upgrade -reconfigure'
 alias tfo='terraform output'
 alias tfp='terraform plan'
+alias tfpo='terraform plan -out tfplan'
 alias tfv='terraform validate'
 alias tfs='terraform state'
 alias tft='terraform test'