summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/p10k-classic.zsh20
-rw-r--r--config/p10k-lean.zsh20
-rw-r--r--config/p10k-rainbow.zsh20
-rw-r--r--internal/p10k.zsh24
4 files changed, 80 insertions, 4 deletions
diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh
index 2a0eb2fb..adf90c76 100644
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@@ -67,7 +67,8 @@
aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
# aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
# azure # azure account name (https://docs.microsoft.com/en-us/cli/azure)
- # gcloud # google cloud acccount and project (https://cloud.google.com/)
+ # gcloud # google cloud cli acccount and project (https://cloud.google.com/)
+ # gcloud_app # google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable)
context # user@hostname
nordvpn # nordvpn connection status, linux only (https://nordvpn.com/)
ranger # ranger shell (https://github.com/ranger/ranger)
@@ -785,6 +786,23 @@
# Custom icon.
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
+ ##########[ gcloud_app: google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable) ]###########
+ # Google cloud color.
+ typeset -g POWERLEVEL9K_GCLOUD_APP_FOREGROUND=32
+
+ # Google cloud format. Uncomment POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION and edit its value if the
+ # default is too verbose.
+ #
+ # P9K_GCLOUD_APP_EMAIL: `.client_email` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE: `.type` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT: `sa` if `type=service_account`, empty otherwise
+ # ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
+ #
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION='${P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT//\%/%%}${P9K_GCLOUD_APP_EMAIL//\%/%%}'
+
+ # Custom icon.
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
#############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]#############
# Kubernetes context classes for the purpose of using different colors, icons and expansions with
# different contexts.
diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh
index ce4d3332..574f654c 100644
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@@ -67,7 +67,8 @@
aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
# aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
# azure # azure account name (https://docs.microsoft.com/en-us/cli/azure)
- # gcloud # google cloud acccount and project (https://cloud.google.com/)
+ # gcloud # google cloud cli acccount and project (https://cloud.google.com/)
+ # gcloud_app # google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable)
context # user@hostname
nordvpn # nordvpn connection status, linux only (https://nordvpn.com/)
ranger # ranger shell (https://github.com/ranger/ranger)
@@ -842,6 +843,23 @@
# Custom icon.
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
+ ##########[ gcloud_app: google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable) ]###########
+ # Google cloud color.
+ typeset -g POWERLEVEL9K_GCLOUD_APP_FOREGROUND=32
+
+ # Google cloud format. Uncomment POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION and edit its value if the
+ # default is too verbose.
+ #
+ # P9K_GCLOUD_APP_EMAIL: `.client_email` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE: `.type` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT: `sa` if `type=service_account`, empty otherwise
+ # ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
+ #
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION='${P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT//\%/%%}${P9K_GCLOUD_APP_EMAIL//\%/%%}'
+
+ # Custom icon.
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
###############################[ public_ip: public IP address ]###############################
# Public IP color.
typeset -g POWERLEVEL9K_PUBLIC_IP_FOREGROUND=94
diff --git a/config/p10k-rainbow.zsh b/config/p10k-rainbow.zsh
index 9419b4c5..677448b6 100644
--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@@ -67,7 +67,8 @@
aws # aws profile (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html)
# aws_eb_env # aws elastic beanstalk environment (https://aws.amazon.com/elasticbeanstalk/)
# azure # azure account name (https://docs.microsoft.com/en-us/cli/azure)
- # gcloud # google cloud acccount and project (https://cloud.google.com/)
+ # gcloud # google cloud cli acccount and project (https://cloud.google.com/)
+ # gcloud_app # google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable)
context # user@hostname
nordvpn # nordvpn connection status, linux only (https://nordvpn.com/)
ranger # ranger shell (https://github.com/ranger/ranger)
@@ -810,6 +811,23 @@
# Custom icon.
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
+ ##########[ gcloud_app: google cloud application credentials (https://cloud.google.com/docs/authentication/getting-started#setting_the_environment_variable) ]###########
+ # Google cloud color.
+ typeset -g POWERLEVEL9K_GCLOUD_APP_FOREGROUND=32
+
+ # Google cloud format. Uncomment POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION and edit its value if the
+ # default is too verbose.
+ #
+ # P9K_GCLOUD_APP_EMAIL: `.client_email` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE: `.type` field of keyfile
+ # P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT: `sa` if `type=service_account`, empty otherwise
+ # ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
+ #
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_CONTENT_EXPANSION='${P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT//\%/%%}${P9K_GCLOUD_APP_EMAIL//\%/%%}'
+
+ # Custom icon.
+ # typeset -g POWERLEVEL9K_GCLOUD_APP_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
#############[ kubecontext: current kubernetes context (https://kubernetes.io/) ]#############
# Kubernetes context classes for the purpose of using different colors, icons and expansions with
# different contexts.
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index b2907ecb..5235aa01 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -3379,7 +3379,6 @@ prompt_azure() {
prompt_gcloud() {
unset P9K_GCLOUD_PROJECT P9K_GCLOUD_ACCOUNT
(( $+commands[gcloud] )) || return
- local cfg=${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json
if ! _p9k_cache_stat_get $0 ~/.config/gcloud/active_config ~/.config/gcloud/configurations/config_default; then
_p9k_cache_stat_set "$(gcloud config get-value account 2>/dev/null)" "$(gcloud config get-value project 2>/dev/null)"
fi
@@ -3389,6 +3388,29 @@ prompt_gcloud() {
_p9k_prompt_segment "$0" "blue" "white" "GCLOUD_ICON" 0 '' "${P9K_GCLOUD_ACCOUNT//\%/%%}:${P9K_GCLOUD_PROJECT//\%/%%}"
}
+prompt_gcloud_app() {
+ unset P9K_GCLOUD_APP_EMAIL P9K_GCLOUD_APP_ACCOUNT_TYPE P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT
+ (( $+commands[gcloud] )) || return
+ [[ ! -z $GOOGLE_APPLICATION_CREDENTIALS ]] || return
+
+ if ! _p9k_cache_stat_get $0 $GOOGLE_APPLICATION_CREDENTIALS; then
+ local email="$(cat $GOOGLE_APPLICATION_CREDENTIALS | jq -r '.client_email')"
+ local account_type="$(cat $GOOGLE_APPLICATION_CREDENTIALS | jq -r '.type')"
+ local account_type_short
+ if [[ "$account_type" == "service_account" ]]; then
+ account_type_short="sa:"
+ fi
+
+ # Service account name may contain only alpha-numeric chars and hyphens, so splitting by `.` gives us `service-account-name@project-id`
+ _p9k_cache_stat_set "${email%%.*}" "$account_type" "$account_type_short"
+ fi
+ [[ -n $_p9k_cache_val[1] || -n $_p9k_cache_val[2] || -n $_p9k_cache_val[3] ]] || return
+ P9K_GCLOUD_APP_EMAIL=$_p9k_cache_val[1]
+ P9K_GCLOUD_APP_ACCOUNT_TYPE=$_p9k_cache_val[2]
+ P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT=$_p9k_cache_val[3]
+ _p9k_prompt_segment "$0" "blue" "white" "GCLOUD_ICON" 0 '' "${P9K_GCLOUD_APP_ACCOUNT_TYPE_SHORT//\%/%%}${P9K_GCLOUD_APP_EMAIL//\%/%%}"
+}
+
typeset -gra __p9k_nordvpn_tag=(
P9K_NORDVPN_STATUS
P9K_NORDVPN_TECHNOLOGY
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 09:24:53 +0300