Combine VCS and PWD

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index e6cb23f57aa51d5495878e686c6410c38879a99c..e41e7e6fc7965e9de61a1588dbbbd95ae2c78d7f 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,97 +1,45 @@
-#######################################################################
-# Admone ZSH prompt. Copyright Armaan Bhojwani, palb91, romkatv.      #
-# MIT licensed, see the LICENSE file or                               #
-# https://www.opensource.org/licenses/MIT for more information.       #
-# Git repo at https://codeberg.org/armaan/admone                      #
-#######################################################################
+# Admone Zsh prompt
+# Copyright Armaan Bhojwani 2021 <me@armaanb.net>
+# MIT licensed, see the LICENSE file for more information.
 
-#
-# USER CONFIGURATIONS
-#
+PROMPT_CHAR="➤"
 
-ADMONE_PROMPT_CHAR="❯❯❯"
-ADMONE_PRE_UPPER="╭ "
-ADMONE_PRE_LOWER="╰ "
-ADMONE_BLOCK_SEPARATOR="-"
-ADMONE_BLOCK_LEFT="["
-ADMONE_BLOCK_RIGHT="]"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code"
+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 ' +'
 
-function admone-pwd {
-  echo "%F{blue}%~%f%F{240}"
-}
-function admone-git {
-  local git_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
-  echo "%F{green}${git_branch//\%/%%}%f"
-}
-function admone-exit-code {
-  echo "%(?,,%F{1}%?%F{240})"
-}
-
-function admone-date {
-  echo $(date -I)
-}
-function admone-time {
-  echo $(date -Iseconds)
-}
-#######################################################################
-
-#
-# BACKEND
-#
+################################################################################
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
   case $KEYMAP in
     vicmd)
+      # Block
       print -n -- "\E]50;CursorShape=0\C-G"
       ;;
     viins|main)
+      # Beam
       print -n -- "\E]50;CursorShape=1\C-G"
       ;;
-    *)
-      ;;
   esac
-
-  zle reset-prompt
+  # zle reset-prompt
   zle -R
 }
 
-function set-prompt() {
-  upper="%B${ADMONE_PRE_UPPER}"
-  lower="%B${ADMONE_PRE_LOWER}%B%F{%(?.cyan.red)}${ADMONE_PROMPT_CHAR}%f%b "
-
-  NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
-  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
-    (( val = $i + 1 ))
-    THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $val)"
-
-    REAL_NUM_FUNCS=$((NUM_FUNCS+1))
-      if [[ $val == $REAL_NUM_FUNCS ]]; then
-        upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-      elif [[ $((REAL_NUM_FUNCS%2)) == 0 ]]; then
-        if [[ $((val%2)) == 0 ]]; then
-          upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
-        else
-          upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-        fi
-      elif [[ $((REAL_NUM_FUNCS%2)) != 0 ]]; then
-        if [[ $val == 1 ]]; then
-          upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
-        elif [[ $((val%2)) != 0 ]]; then
-          upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
-        else
-          upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-      fi
-      fi
-  done
+# Set everything!
+set-prompt() {
+  PROMPT="%B%F{%(?.cyan.red)}${PROMPT_CHAR}%f%b "
+  RPROMPT="[%F{blue}%~${vcs_info_msg_0_}%f][%(?,%F{cyan}%?,%F{red}%?)%f]"
 
   [[ -v PS1_NL ]] && echo || PS1_NL=
-  PROMPT=$upper$'\n'$lower
 }
 
+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
 zle -N zle-line-finish
 zle -N zle-keymap-select
-autoload -Uz add-zsh-hook
-add-zsh-hook precmd set-prompt