Combine VCS and PWD

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index 7f01fd4f5ff7e97d5c0fe8727a3b321a5843dd4d..e41e7e6fc7965e9de61a1588dbbbd95ae2c78d7f 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -2,67 +2,14 @@
 # Copyright Armaan Bhojwani 2021 <me@armaanb.net>
 # MIT licensed, see the LICENSE file for more information.
 
-#######################################################################
-# USER CONFIGURATIONS
-#######################################################################
-
 PROMPT_CHAR="➤"
-  # PROMPT_CHAR="❯❯❯"
-  # PROMPT_CHAR="$"
-  # PROMPT_CHAR="%"
-  # PROMPT_CHAR=">"
-  # PROMPT_CHAR="➢"
-  # PROMPT_CHAR="➪"
-PRE_UPPER="╭"
-PRE_LOWER="╰"
-  # PRE_UPPER="┌"
-  # PRE_LOWER="└"
-BLOCK_SEPARATOR="─"
-  # BLOCK_SEPARATOR="∙"
-BLOCK_LEFT="["
-BLOCK_RIGHT="]"
-  # BLOCK_LEFT="("
-  # BLOCK_RIGHT=")"
-SHOW_0_EXIT_CODE="1"
-INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
-FORMAT_LOWER="%B%F{%(?.cyan.red)}"
-
-SHORT_PROMPT="➤"
-FORMAT_SHORT="%B%F{%(?.cyan.red)}"
-TWO_LINE="0"
 
-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 ' +'
 
-#######################################################################
-# Functions
-#######################################################################
-
-admone-pwd() {
-  echo "%F{blue}%~%f"
-}
-admone-vcs() {
-  echo "%F{green}${vcs_info_msg_0_}%f"
-}
-admone-exit-code() {
-  ([[ $SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
-    echo "%(?,,%F{red}%?%f)"
-}
-admone-date() {
-  echo $(date -I)
-}
-admone-12hr() {
-  echo $(date +%r)
-}
-admone-24hr() {
-  echo $(date +%T)
-}
-
-#######################################################################
-# BACKEND
-#######################################################################
+################################################################################
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
@@ -76,56 +23,21 @@ function zle-keymap-select zle-line-init zle-line-finish {
       print -n -- "\E]50;CursorShape=1\C-G"
       ;;
   esac
-  zle reset-prompt
+  # zle reset-prompt
   zle -R
 }
 
-NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
-THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
-[[ -v PS1_NL ]] && echo || PS1_NL=
-
-set-twoline-prompt() {
-  # Reset prompts
-  upper="${PRE_UPPER}"
-  lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
-
-  # Add in functions as defined above
-  upper+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
-
-  for (( i = 0; i < $NUM_FUNCS; i++ )); do
-    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 2)))"
-    upper+="$BLOCK_SEPARATOR$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
-  done
-
-  # Add line above
-  PROMPT=$upper$'\n'$lower
-}
-
-set-oneline-prompt() {
-  PROMPT="${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
-  RPROMPT=""
-
-  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
-    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 1)))"
-    RPROMPT+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
-  done
-}
 # Set everything!
 set-prompt() {
-  if [[ $TWO_LINE == "1" ]]; then
-    set-twoline-prompt
-  else
-    set-oneline-prompt
-  fi
-}
+  PROMPT="%B%F{%(?.cyan.red)}${PROMPT_CHAR}%f%b "
+  RPROMPT="[%F{blue}%~${vcs_info_msg_0_}%f][%(?,%F{cyan}%?,%F{red}%?)%f]"
 
-if [[ ! $(echo $INCLUDE | grep -q "vcs") ]]; then
-  zstyle ':vcs_info:*' check-for-changes true
-  autoload -Uz add-zsh-hook vcs-info
-  add-zsh-hook precmd vcs_info
-fi
+  [[ -v PS1_NL ]] && echo || PS1_NL=
+}
 
-autoload -Uz add-zsh-hook
+zstyle ':vcs_info:*' check-for-changes true
+autoload -Uz add-zsh-hook vcs-info
+add-zsh-hook precmd vcs_info
 add-zsh-hook precmd set-prompt
 
 zle -N zle-line-init