diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-07-04 08:44:51 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-07-04 08:44:51 +0300 |
| commit | 06ed564092ac64e77e1fa83398e98d92cf1d9c0d (patch) | |
| tree | 2b5d8520d5f1c63aed0b0a16648d3720e389bd44 | |
| parent | 2d74ac9d069ff58b984f4818a2fb743b0059b3ed (diff) | |
| parent | 882cede0aec99f58ccaf8d0765688bfee7b198fb (diff) | |
Merge branch 'terraform-show-default' of https://github.com/ancarpan/powerlevel10k into ancarpan-terraform-show-default
| -rw-r--r-- | config/p10k-classic.zsh | 2 | ||||
| -rw-r--r-- | config/p10k-lean-8colors.zsh | 2 | ||||
| -rw-r--r-- | config/p10k-lean.zsh | 2 | ||||
| -rw-r--r-- | config/p10k-rainbow.zsh | 2 | ||||
| -rw-r--r-- | internal/p10k.zsh | 4 |
5 files changed, 11 insertions, 1 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh index 9e85288b..b6a72f66 100644 --- a/config/p10k-classic.zsh +++ b/config/p10k-classic.zsh @@ -1153,6 +1153,8 @@ '*' DEFAULT) typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=38 # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Show terraform workspace even if it's default + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS=false #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# # Show kubecontext only when the the command you are typing invokes one of these tools. diff --git a/config/p10k-lean-8colors.zsh b/config/p10k-lean-8colors.zsh index cac63a9a..6c27bca8 100644 --- a/config/p10k-lean-8colors.zsh +++ b/config/p10k-lean-8colors.zsh @@ -1217,6 +1217,8 @@ '*' DEFAULT) typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=4 # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Show terraform workspace even if it's default + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS=false #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# # Show aws only when the the command you are typing invokes one of these tools. diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh index 747bd863..cdca774e 100644 --- a/config/p10k-lean.zsh +++ b/config/p10k-lean.zsh @@ -1217,6 +1217,8 @@ '*' DEFAULT) typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=38 # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Show terraform workspace even if it's default + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS=false #[ aws: aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) ]# # Show aws only when the the command you are typing invokes one of these tools. diff --git a/config/p10k-rainbow.zsh b/config/p10k-rainbow.zsh index 9e91db6c..2a7fd630 100644 --- a/config/p10k-rainbow.zsh +++ b/config/p10k-rainbow.zsh @@ -1216,6 +1216,8 @@ typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_FOREGROUND=4 typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_BACKGROUND=0 # typeset -g POWERLEVEL9K_TERRAFORM_DEFAULT_VISUAL_IDENTIFIER_EXPANSION='⭐' + # Show terraform workspace even if it's default + typeset -g POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS=false #############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]############# # Show kubecontext only when the the command you are typing invokes one of these tools. diff --git a/internal/p10k.zsh b/internal/p10k.zsh index a7e3f77e..4f635df1 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -4666,7 +4666,8 @@ function prompt_terraform() { if [[ -z $TF_WORKSPACE ]]; then _p9k_read_word ${${TF_DATA_DIR:-.terraform}:A}/environment && ws=$_p9k__ret fi - [[ $ws == (|default) ]] && return + [[ $ws == '' ]] && return + [[ ($ws == 'default') && ( ! ${_POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS} ) ]] && return local pat class for pat class in "${_POWERLEVEL9K_TERRAFORM_CLASSES[@]}"; do if [[ $ws == ${~pat} ]]; then @@ -7114,6 +7115,7 @@ _p9k_init_params() { _p9k_declare -a POWERLEVEL9K_KUBECONTEXT_CLASSES -- _p9k_declare -a POWERLEVEL9K_AWS_CLASSES -- _p9k_declare -a POWERLEVEL9K_TERRAFORM_CLASSES -- + _p9k_declare -b POWERLEVEL9K_TERRAFORM_SHOW_DEFAULT_WS 0 _p9k_declare -a POWERLEVEL9K_GOOGLE_APP_CRED_CLASSES -- 'service_account:*' SERVICE_ACCOUNT # Specifies the format of java version. # |