From: Armaan Bhojwani <me@armaanb.net>
Date: Tue, 23 Feb 2021 16:28:50 +0000 (-0500)
Subject: Combine VCS and PWD
X-Git-Url: https://git.armaanb.net/?p=admone.git;a=commitdiff_plain;h=HEAD

Combine VCS and PWD
---

diff --git a/admone.zsh b/admone.zsh
index 739e78f..e41e7e6 100644
--- a/admone.zsh
+++ b/admone.zsh
@@ -4,7 +4,7 @@
 
 PROMPT_CHAR="➤"
 
-zstyle ':vcs_info:git:*' formats '%b%u%c'
+zstyle ':vcs_info:git:*' formats '%f|%F{green}%b%u%c'
 zstyle ':vcs_info:git:*' actionformats '%b|%a%u%c'
 zstyle ':vcs_info:*' unstagedstr ' *'
 zstyle ':vcs_info:*' stagedstr ' +'
@@ -30,9 +30,7 @@ function zle-keymap-select zle-line-init zle-line-finish {
 # Set everything!
 set-prompt() {
   PROMPT="%B%F{%(?.cyan.red)}${PROMPT_CHAR}%f%b "
-  RPROMPT="[%F{blue}%~%f]"
-  RPROMPT+="[%F{green}${vcs_info_msg_0_}%f]"
-  RPROMPT+="[%(?,%F{cyan}%?%f,%F{red}%?%f)]"
+  RPROMPT="[%F{blue}%~${vcs_info_msg_0_}%f][%(?,%F{cyan}%?,%F{red}%?)%f]"
 
   [[ -v PS1_NL ]] && echo || PS1_NL=
 }