change vcs function to use Zsh builtin

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index 9b5e9d4b33704fa8696a50c380c3057246d1ae45..a9f0781169f6a1bb67d772987064cab481888306 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,5 +1,5 @@
 #######################################################################
-# Admone ZSH prompt. Copyright Armaan Bhojwani. MIT licensed, see the #
+# Admone Zsh prompt. Copyright Armaan Bhojwani. MIT licensed, see the #
 # LICENSE file or https://www.opensource.org/licenses/MIT for more    #
 # information. Git repo at https://codeberg.org/armaan/admone         #
 #######################################################################
@@ -23,26 +23,26 @@ ADMONE_BLOCK_SEPARATOR="─"
   # ADMONE_BLOCK_SEPARATOR="∙"
 ADMONE_BLOCK_LEFT="["
 ADMONE_BLOCK_RIGHT="]"
-  # ADMONE_BLOCK_LEFT="{"
-  # ADMONE_BLOCK_RIGHT="}"
   # ADMONE_BLOCK_LEFT="("
   # ADMONE_BLOCK_RIGHT=")"
-ADMONE_VI_MODE_CURSOR="1"
-  # ADMONE_VI_MODE_CURSOR="1"
 ADMONE_SHOW_0_EXIT_CODE="0"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code"
+ADMONE_INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
 ADMONE_FORMAT_LOWER="%B%F{%(?.cyan.red)}"
 
+zstyle ':vcs_info:git:*' formats '%b%u%c'
+zstyle ':vcs_info:git:*' actionformats '%b|%a%u%c'
+zstyle ':vcs_info:*' unstagedstr ' *'
+zstyle ':vcs_info:*' stagedstr ' +'
+
 admone-pwd() {
   echo "%F{blue}%~%f"
 }
-admone-git() {
-  git_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
-  echo "%F{green}${git_branch}%f"
+admone-vcs() {
+  echo "%F{green}${vcs_info_msg_0_}%f"
 }
 admone-exit-code() {
   ([[ $ADMONE_SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
-  echo "%(?,,%F{red}%?%f)"
+    echo "%(?,,%F{red}%?%f)"
 }
 admone-date() {
   echo $(date -I)
@@ -66,20 +66,18 @@ admone-time() {
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
-  if [[ $ADMONE_VI_MODE_CURSOR == "1" ]]; then
-    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 -R
-  fi
+  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 -R
 }
 
 set-prompt() {
@@ -89,10 +87,13 @@ set-prompt() {
 
   # Add in functions as defined above
   NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
-  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
-    THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $(($i + 1)))"
-    [[ $i == 0 ]] && upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
-    [[ $i == 0 ]] || upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+
+  THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f 1)"
+  upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+
+  for (( i = 0; i < $NUM_FUNCS; i++ )); do
+    THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $(($i + 2)))"
+    upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
   done
 
   # Add line above
@@ -102,8 +103,16 @@ set-prompt() {
 }
 
 # Set everything!
+if [[ ! $(echo $ADMONE_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
+  add-zsh-hook precmd set-prompt
+else
+  autoload -Uz add-zsh-hook
+  add-zsh-hook precmd set-prompt
+fi
+
 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