Merge 0047214255 into 1c34b0e67d

Some terminal themes make CURRENT_FG black/white selection sub-optimal. Allow user to define CURRENT_FG for best legibility in the directory part.

plugins/terraform/terraform.plugin.zsh

@@ -2,9 +2,9 @@ function tf_prompt_info() {
   # dont show 'default' workspace in home dir
   [[ "$PWD" != ~ ]] || return
   # check if in terraform dir and file exists
-  [[ -d .terraform && -r .terraform/environment ]] || return
+  [[ -d "${TF_DATA_DIR:-.terraform}" && -r "${TF_DATA_DIR:-.terraform}/environment" ]] || return
 
-  local workspace="$(< .terraform/environment)"
+  local workspace="$(< "${TF_DATA_DIR:-.terraform}/environment")"
   echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 

themes/agnoster.zsh-theme

@@ -34,9 +34,10 @@
 
 CURRENT_BG='NONE'
 
+# Set CURRENT_FG unless already set in .zshenv
 case ${SOLARIZED_THEME:-dark} in
-    light) CURRENT_FG='white';;
+    light) CURRENT_FG=${CURRENT_FG:-white};;
-    *)     CURRENT_FG='black';;
+    *)     CURRENT_FG=${CURRENT_FG:-black};;
 esac
 
 # Special Powerline characters