From 1d09c6bb0a950756a65b02457842933e3aa493eb Mon Sep 17 00:00:00 2001
From: vladislav doster <10052309+vladdoster@users.noreply.github.com>
Date: Tue, 26 Mar 2024 03:55:16 -0500
Subject: style: remove trailing whitespace (#12303)

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index aa274a5bb..bd0405efb 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -111,7 +111,7 @@ prompt_git() {
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || \
     ref="◈ $(git describe --exact-match --tags HEAD 2> /dev/null)" || \
-    ref="➦ $(git rev-parse --short HEAD 2> /dev/null)" 
+    ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else
-- 
cgit v1.2.3-70-g09d2


From 7ef3f49f97ff34db3785b1cea444eb4972b1937b Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc@mcornella.com>
Date: Tue, 16 Apr 2024 20:04:25 +0200
Subject: fix(agnoster): prevent accidental alias use

---
 themes/agnoster.zsh-theme | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index bd0405efb..c2a542163 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -96,7 +96,7 @@ prompt_context() {
 # Git: branch/detached head, dirty status
 prompt_git() {
   (( $+commands[git] )) || return
-  if [[ "$(git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then
     return
   fi
   local PL_BRANCH_CHAR
@@ -106,12 +106,12 @@ prompt_git() {
   }
   local ref dirty mode repo_path
 
-   if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
-    repo_path=$(git rev-parse --git-dir 2>/dev/null)
+   if [[ "$(command git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
+    repo_path=$(command git rev-parse --git-dir 2>/dev/null)
     dirty=$(parse_git_dirty)
-    ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-    ref="◈ $(git describe --exact-match --tags HEAD 2> /dev/null)" || \
-    ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+    ref="◈ $(command git describe --exact-match --tags HEAD 2> /dev/null)" || \
+    ref="➦ $(command git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else
@@ -119,8 +119,8 @@ prompt_git() {
     fi
 
     local ahead behind
-    ahead=$(git log --oneline @{upstream}.. 2>/dev/null)
-    behind=$(git log --oneline ..@{upstream} 2>/dev/null)
+    ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
+    behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
     if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
       PL_BRANCH_CHAR=$'\u21c5'
     elif [[ -n "$ahead" ]]; then
@@ -163,10 +163,10 @@ prompt_bzr() {
   done
 
   local bzr_status status_mod status_all revision
-  if bzr_status=$(bzr status 2>&1); then
+  if bzr_status=$(command bzr status 2>&1); then
     status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
     status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
-    revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
+    revision=${$(command bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
     if [[ $status_mod -gt 0 ]] ; then
       prompt_segment yellow black "bzr@$revision ✚"
     else
@@ -182,13 +182,13 @@ prompt_bzr() {
 prompt_hg() {
   (( $+commands[hg] )) || return
   local rev st branch
-  if $(hg id >/dev/null 2>&1); then
-    if $(hg prompt >/dev/null 2>&1); then
-      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
+  if $(command hg id >/dev/null 2>&1); then
+    if $(command hg prompt >/dev/null 2>&1); then
+      if [[ $(command hg prompt "{status|unknown}") = "?" ]]; then
         # if files are not added
         prompt_segment red white
         st='±'
-      elif [[ -n $(hg prompt "{status|modified}") ]]; then
+      elif [[ -n $(command hg prompt "{status|modified}") ]]; then
         # if any modification
         prompt_segment yellow black
         st='±'
@@ -196,15 +196,15 @@ prompt_hg() {
         # if working copy is clean
         prompt_segment green $CURRENT_FG
       fi
-      echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
+      echo -n ${$(command hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
     else
       st=""
-      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-      branch=$(hg id -b 2>/dev/null)
-      if `hg st | grep -q "^\?"`; then
+      rev=$(command hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
+      branch=$(command hg id -b 2>/dev/null)
+      if command hg st | command grep -q "^\?"; then
         prompt_segment red black
         st='±'
-      elif `hg st | grep -q "^[MA]"`; then
+      elif command hg st | command grep -q "^[MA]"; then
         prompt_segment yellow black
         st='±'
       else
-- 
cgit v1.2.3-70-g09d2


From 309129f651eeeca62c3a3b7f6817f0ac601db9f0 Mon Sep 17 00:00:00 2001
From: Daniel Ochoja <37149152+Ochoja@users.noreply.github.com>
Date: Tue, 21 May 2024 19:36:07 +0100
Subject: feat(agnoster): add `anaconda` env information (#12434)

---
 themes/agnoster.zsh-theme | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c2a542163..767a4ed50 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -227,6 +227,14 @@ prompt_virtualenv() {
   fi
 }
 
+# Conda Virtualenv
+promp_conda_virtualenv() {
+  if [[ -n $CONDA_PROMPT_MODIFIER ]]; then
+    prompt_segment black default ${CONDA_PROMPT_MODIFIER:1:-2}
+  fi
+}
+
+
 # Status:
 # - was there an error
 # - am I root
@@ -266,6 +274,7 @@ build_prompt() {
   prompt_bzr
   prompt_hg
   prompt_end
+  promp_conda_virtualenv
 }
 
 PROMPT='%{%f%b%k%}$(build_prompt) '
-- 
cgit v1.2.3-70-g09d2


From bbfb9853591312c180a0c417226e4ef899d4cf3a Mon Sep 17 00:00:00 2001
From: robinverduijn <robinverduijn@users.noreply.github.com>
Date: Tue, 21 May 2024 22:39:12 -0700
Subject: chore(agnoster): typo (#12437)

---
 themes/agnoster.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 767a4ed50..4445ad4a4 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -228,7 +228,7 @@ prompt_virtualenv() {
 }
 
 # Conda Virtualenv
-promp_conda_virtualenv() {
+prompt_conda_virtualenv() {
   if [[ -n $CONDA_PROMPT_MODIFIER ]]; then
     prompt_segment black default ${CONDA_PROMPT_MODIFIER:1:-2}
   fi
@@ -274,7 +274,7 @@ build_prompt() {
   prompt_bzr
   prompt_hg
   prompt_end
-  promp_conda_virtualenv
+  prompt_conda_virtualenv
 }
 
 PROMPT='%{%f%b%k%}$(build_prompt) '
-- 
cgit v1.2.3-70-g09d2


From c77a01dbe28acaa13e53c7dc78d6b798f3f42fc2 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 22 May 2024 09:15:11 +0200
Subject: Revert "feat(agnoster): add `anaconda` env information (#12434)"

This reverts commit 309129f651eeeca62c3a3b7f6817f0ac601db9f0.
---
 themes/agnoster.zsh-theme | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 4445ad4a4..c2a542163 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -227,14 +227,6 @@ prompt_virtualenv() {
   fi
 }
 
-# Conda Virtualenv
-prompt_conda_virtualenv() {
-  if [[ -n $CONDA_PROMPT_MODIFIER ]]; then
-    prompt_segment black default ${CONDA_PROMPT_MODIFIER:1:-2}
-  fi
-}
-
-
 # Status:
 # - was there an error
 # - am I root
@@ -274,7 +266,6 @@ build_prompt() {
   prompt_bzr
   prompt_hg
   prompt_end
-  prompt_conda_virtualenv
 }
 
 PROMPT='%{%f%b%k%}$(build_prompt) '
-- 
cgit v1.2.3-70-g09d2


From 0e99f402cd5a335042559396ae300a7668bac933 Mon Sep 17 00:00:00 2001
From: Stephen Gelman <ssgelm@gmail.com>
Date: Wed, 12 Feb 2025 13:33:35 -0600
Subject: feat(agnoster): add color config and add some git stuff (#12505)

Co-authored-by: Kilobyte22 <stiepen22@gmx.de>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
---
 themes/agnoster.zsh-theme | 147 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 118 insertions(+), 29 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c2a542163..67db2cf46 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -39,6 +39,63 @@ case ${SOLARIZED_THEME:-dark} in
     *)     CURRENT_FG='black';;
 esac
 
+### Theme Configuration Initialization
+#
+# Override these settings in your ~/.zshrc
+
+# Current working directory
+: ${AGNOSTER_DIR_FG:=${CURRENT_FG}}
+: ${AGNOSTER_DIR_BG:=blue}
+
+# user@host
+: ${AGNOSTER_CONTEXT_FG:=default}
+: ${AGNOSTER_CONTEXT_BG:=black}
+
+# Git related
+: ${AGNOSTER_GIT_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_GIT_CLEAN_BG:=green}
+: ${AGNOSTER_GIT_DIRTY_FG:=black}
+: ${AGNOSTER_GIT_DIRTY_BG:=yellow}
+
+# Bazaar related
+: ${AGNOSTER_BZR_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_BZR_CLEAN_BG:=green}
+: ${AGNOSTER_BZR_DIRTY_FG:=black}
+: ${AGNOSTER_BZR_DIRTY_BG:=yellow}
+
+# Mercurial related
+: ${AGNOSTER_HG_NEWFILE_FG:=white}
+: ${AGNOSTER_HG_NEWFILE_BG:=red}
+: ${AGNOSTER_HG_CHANGED_FG:=black}
+: ${AGNOSTER_HG_CHANGED_BG:=yellow}
+: ${AGNOSTER_HG_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_HG_CLEAN_BG:=green}
+
+# VirtualEnv colors
+: ${AGNOSTER_VENV_FG:=black}
+: ${AGNOSTER_VENV_BG:=blue}
+
+# AWS Profile colors
+: ${AGNOSTER_AWS_PROD_FG:=yellow}
+: ${AGNOSTER_AWS_PROD_BG:=red}
+: ${AGNOSTER_AWS_FG:=black}
+: ${AGNOSTER_AWS_BG:=green}
+
+# Status symbols
+: ${AGNOSTER_STATUS_RETVAL_FG:=red}
+: ${AGNOSTER_STATUS_ROOT_FG:=yellow}
+: ${AGNOSTER_STATUS_JOB_FG:=cyan}
+: ${AGNOSTER_STATUS_BG:=black}
+
+## Non-Color settings - set to 'true' to enable
+# Show the actual numeric return value rather than a cross symbol.
+: ${AGNOSTER_STATUS_RETVAL_NUMERIC:=false}
+# Show git working dir in the style "/git/root   master  relative/dir" instead of "/git/root/relative/dir   master"
+: ${AGNOSTER_GIT_INLINE:=false}
+# Show the git branch status in the prompt rather than the generic branch symbol
+: ${AGNOSTER_GIT_BRANCH_STATUS:=true}
+
+
 # Special Powerline characters
 
 () {
@@ -83,16 +140,36 @@ prompt_end() {
   CURRENT_BG=''
 }
 
+git_toplevel() {
+	local repo_root=$(git rev-parse --show-toplevel)
+	if [[ $repo_root = '' ]]; then
+		# We are in a bare repo. Use git dir as root
+		repo_root=$(git rev-parse --git-dir)
+		if [[ $repo_root = '.' ]]; then
+			repo_root=$PWD
+		fi
+	fi
+	echo -n $repo_root
+}
+
 ### Prompt components
 # Each component will draw itself, and hide itself if no information needs to be shown
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
   if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m"
+    prompt_segment "$AGNOSTER_CONTEXT_BG" "$AGNOSTER_CONTEXT_FG" "%(!.%{%F{$AGNOSTER_STATUS_ROOT_FG}%}.)%n@%m"
   fi
 }
 
+prompt_git_relative() {
+  local repo_root=$(git_toplevel)
+  local path_in_repo=$(pwd | sed "s/^$(echo "$repo_root" | sed 's:/:\\/:g;s/\$/\\$/g')//;s:^/::;s:/$::;")
+  if [[ $path_in_repo != '' ]]; then
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$path_in_repo"
+  fi;
+}
+
 # Git: branch/detached head, dirty status
 prompt_git() {
   (( $+commands[git] )) || return
@@ -113,20 +190,22 @@ prompt_git() {
     ref="◈ $(command git describe --exact-match --tags HEAD 2> /dev/null)" || \
     ref="➦ $(command git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
-      prompt_segment yellow black
+      prompt_segment "$AGNOSTER_GIT_DIRTY_BG" "$AGNOSTER_GIT_DIRTY_FG"
     else
-      prompt_segment green $CURRENT_FG
+      prompt_segment "$AGNOSTER_GIT_CLEAN_BG" "$AGNOSTER_GIT_CLEAN_FG"
     fi
 
-    local ahead behind
-    ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
-    behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
-    if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
-      PL_BRANCH_CHAR=$'\u21c5'
-    elif [[ -n "$ahead" ]]; then
-      PL_BRANCH_CHAR=$'\u21b1'
-    elif [[ -n "$behind" ]]; then
-      PL_BRANCH_CHAR=$'\u21b0'
+    if [[ $AGNOSTER_GIT_BRANCH_STATUS == 'true' ]]; then
+      local ahead behind
+      ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
+      behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
+      if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
+        PL_BRANCH_CHAR=$'\u21c5'
+      elif [[ -n "$ahead" ]]; then
+        PL_BRANCH_CHAR=$'\u21b1'
+      elif [[ -n "$behind" ]]; then
+        PL_BRANCH_CHAR=$'\u21b0'
+      fi
     fi
 
     if [[ -e "${repo_path}/BISECT_LOG" ]]; then
@@ -149,6 +228,7 @@ prompt_git() {
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
     echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
+    [[ $AGNOSTER_GIT_INLINE == 'true' ]] && prompt_git_relative
   fi
 }
 
@@ -168,12 +248,12 @@ prompt_bzr() {
     status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
     revision=${$(command bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
     if [[ $status_mod -gt 0 ]] ; then
-      prompt_segment yellow black "bzr@$revision ✚"
+      prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision ✚"
     else
       if [[ $status_all -gt 0 ]] ; then
-        prompt_segment yellow black "bzr@$revision"
+        prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision"
       else
-        prompt_segment green black "bzr@$revision"
+        prompt_segment "$AGNOSTER_BZR_CLEAN_BG" "$AGNOSTER_BZR_CLEAN_FG" "bzr@$revision"
       fi
     fi
   fi
@@ -186,15 +266,15 @@ prompt_hg() {
     if $(command hg prompt >/dev/null 2>&1); then
       if [[ $(command hg prompt "{status|unknown}") = "?" ]]; then
         # if files are not added
-        prompt_segment red white
+        prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
         st='±'
       elif [[ -n $(command hg prompt "{status|modified}") ]]; then
         # if any modification
-        prompt_segment yellow black
+        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
         st='±'
       else
         # if working copy is clean
-        prompt_segment green $CURRENT_FG
+        prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
       fi
       echo -n ${$(command hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
     else
@@ -202,13 +282,13 @@ prompt_hg() {
       rev=$(command hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
       branch=$(command hg id -b 2>/dev/null)
       if command hg st | command grep -q "^\?"; then
-        prompt_segment red black
+        prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
         st='±'
       elif command hg st | command grep -q "^[MA]"; then
-        prompt_segment yellow black
+        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
         st='±'
       else
-        prompt_segment green $CURRENT_FG
+        prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
       fi
       echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
     fi
@@ -217,13 +297,18 @@ prompt_hg() {
 
 # Dir: current working directory
 prompt_dir() {
-  prompt_segment blue $CURRENT_FG '%~'
+  if [[ $AGNOSTER_GIT_INLINE == 'true' ]] && $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    # Git repo and inline path enabled, hence only show the git root
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$(git_toplevel | sed "s:^$HOME:~:")"
+  else
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%~'
+  fi
 }
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
-    prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})"
+    prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"
   fi
 }
 
@@ -234,11 +319,15 @@ prompt_virtualenv() {
 prompt_status() {
   local -a symbols
 
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
-  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
-  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
+  if [[ $AGNOSTER_STATUS_RETVAL_NUMERIC == 'true' ]]; then
+    [[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}$RETVAL"
+  else
+    [[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}✘"
+  fi
+  [[ $UID -eq 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_ROOT_FG}%}⚡"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_JOB_FG}%}⚙"
 
-  [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
+  [[ -n "$symbols" ]] && prompt_segment "$AGNOSTER_STATUS_BG" default "$symbols"
 }
 
 #AWS Profile:
@@ -249,8 +338,8 @@ prompt_status() {
 prompt_aws() {
   [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
   case "$AWS_PROFILE" in
-    *-prod|*production*) prompt_segment red yellow  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
-    *) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *-prod|*production*) prompt_segment "$AGNOSTER_AWS_PROD_BG" "$AGNOSTER_AWS_PROD_FG"  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *) prompt_segment "$AGNOSTER_AWS_BG" "$AGNOSTER_AWS_FG" "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
   esac
 }
 
-- 
cgit v1.2.3-70-g09d2


From 92da3108b52be506dc1334e8f0dc67c5d1c13d57 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Fri, 14 Feb 2025 10:18:01 +0100
Subject: fix(agnoster): print white text over black (#12525)

---
 themes/agnoster.zsh-theme | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 67db2cf46..b48bac56a 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -48,7 +48,7 @@ esac
 : ${AGNOSTER_DIR_BG:=blue}
 
 # user@host
-: ${AGNOSTER_CONTEXT_FG:=default}
+: ${AGNOSTER_CONTEXT_FG:=white}
 : ${AGNOSTER_CONTEXT_BG:=black}
 
 # Git related
@@ -85,6 +85,7 @@ esac
 : ${AGNOSTER_STATUS_RETVAL_FG:=red}
 : ${AGNOSTER_STATUS_ROOT_FG:=yellow}
 : ${AGNOSTER_STATUS_JOB_FG:=cyan}
+: ${AGNOSTER_STATUS_FG:=white}
 : ${AGNOSTER_STATUS_BG:=black}
 
 ## Non-Color settings - set to 'true' to enable
@@ -327,7 +328,7 @@ prompt_status() {
   [[ $UID -eq 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_ROOT_FG}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_JOB_FG}%}⚙"
 
-  [[ -n "$symbols" ]] && prompt_segment "$AGNOSTER_STATUS_BG" default "$symbols"
+  [[ -n "$symbols" ]] && prompt_segment "$AGNOSTER_STATUS_BG" "$AGNOSTER_STATUS_FG" "$symbols"
 }
 
 #AWS Profile:
-- 
cgit v1.2.3-70-g09d2


From 6e7ac0544e71c7b777746cb50f70de68c6495b86 Mon Sep 17 00:00:00 2001
From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com>
Date: Wed, 19 Feb 2025 19:37:18 +0800
Subject: fix(agnoster): print white text over black for light theme only
 (#12983)

---
 themes/agnoster.zsh-theme | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index b48bac56a..adeffe8c2 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -35,8 +35,14 @@
 CURRENT_BG='NONE'
 
 case ${SOLARIZED_THEME:-dark} in
-    light) CURRENT_FG='white';;
-    *)     CURRENT_FG='black';;
+    light)
+      CURRENT_FG='white'
+      CURRENT_DEFAULT_FG='white'
+      ;;
+    *)
+      CURRENT_FG='black'
+      CURRENT_DEFAULT_FG='default'
+      ;;
 esac
 
 ### Theme Configuration Initialization
@@ -48,7 +54,7 @@ esac
 : ${AGNOSTER_DIR_BG:=blue}
 
 # user@host
-: ${AGNOSTER_CONTEXT_FG:=white}
+: ${AGNOSTER_CONTEXT_FG:=${CURRENT_DEFAULT_FG}}
 : ${AGNOSTER_CONTEXT_BG:=black}
 
 # Git related
@@ -85,7 +91,7 @@ esac
 : ${AGNOSTER_STATUS_RETVAL_FG:=red}
 : ${AGNOSTER_STATUS_ROOT_FG:=yellow}
 : ${AGNOSTER_STATUS_JOB_FG:=cyan}
-: ${AGNOSTER_STATUS_FG:=white}
+: ${AGNOSTER_STATUS_FG:=${CURRENT_DEFAULT_FG}}
 : ${AGNOSTER_STATUS_BG:=black}
 
 ## Non-Color settings - set to 'true' to enable
-- 
cgit v1.2.3-70-g09d2


From 95a0ece8d39a7797850ef7a4cc8849b6e1158706 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutiérrez" <paaguti@gmail.com>
Date: Sat, 19 Apr 2025 20:19:23 +0200
Subject: fix(agnoster): respect bg / fg user envs (#12897)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
---
 themes/agnoster.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index adeffe8c2..21c9cf7d5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -36,12 +36,12 @@ CURRENT_BG='NONE'
 
 case ${SOLARIZED_THEME:-dark} in
     light)
-      CURRENT_FG='white'
-      CURRENT_DEFAULT_FG='white'
+      CURRENT_FG=${CURRENT_FG:-'white'}
+      CURRENT_DEFAULT_FG=${CURRENT_DEFAULT_FG:-'white'}
       ;;
     *)
-      CURRENT_FG='black'
-      CURRENT_DEFAULT_FG='default'
+      CURRENT_FG=${CURRENT_FG:-'black'}
+      CURRENT_DEFAULT_FG=${CURRENT_DEFAULT_FG:-'default'}
       ;;
 esac
 
-- 
cgit v1.2.3-70-g09d2


From ac5295678f3325de1a69f9e2a603d69573112d05 Mon Sep 17 00:00:00 2001
From: AYO_YO <64309671+AYO-YO@users.noreply.github.com>
Date: Sun, 8 Jun 2025 16:23:48 +0800
Subject: feat(agnoster): add conda support (#13160)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
---
 themes/agnoster.zsh-theme | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 21c9cf7d5..c99b604b5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -314,6 +314,9 @@ prompt_dir() {
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
+  if [ -n "$CONDA_DEFAULT_ENV" ]; then
+    prompt_segment magenta $CURRENT_FG "🐍 $CONDA_DEFAULT_ENV"
+  fi
   if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
     prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"
   fi
-- 
cgit v1.2.3-70-g09d2


From 3ff8c7ef678a990a88ca988c3a4f007296af4934 Mon Sep 17 00:00:00 2001
From: Rob Lugton <roblugton@users.noreply.github.com>
Date: Tue, 10 Jun 2025 04:40:46 +1000
Subject: feat(agnoster): add terraform to prompt (#7892)

---
 themes/agnoster.zsh-theme | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'themes/agnoster.zsh-theme')

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c99b604b5..63452378d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -353,12 +353,19 @@ prompt_aws() {
   esac
 }
 
+prompt_terraform() {
+  local terraform_info=$(tf_prompt_info)
+  [[ -z "$terraform_info" ]] && return
+  prompt_segment magenta yellow "TF: $terraform_info"
+}
+
 ## Main prompt
 build_prompt() {
   RETVAL=$?
   prompt_status
   prompt_virtualenv
   prompt_aws
+  prompt_terraform
   prompt_context
   prompt_dir
   prompt_git
-- 
cgit v1.2.3-70-g09d2