X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=admone.zsh;h=77fd9875fd83e97ed9540f30c4027edadd6bde53;hb=ff98807b753f332ac33c801ac12fd5c7ac76e0dd;hp=e6cb23f57aa51d5495878e686c6410c38879a99c;hpb=13167eab9ca6e6de99f29a18f04af515de76eb53;p=admone.git

diff --git a/admone.zsh b/admone.zsh
index e6cb23f..77fd987 100644
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,97 +1,141 @@
+# Admone Zsh prompt
+# Copyright Armaan Bhojwani 2020 <code@armaanb.net>
+# MIT licensed, see the LICENSE file for more information.
+# Git repo at <https://codeberg.org/armaan/admone>
+
 #######################################################################
-# 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                      #
+# USER CONFIGURATIONS
 #######################################################################
 
-#
-# USER CONFIGURATIONS
-#
-
-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"
-
-function admone-pwd {
-  echo "%F{blue}%~%f%F{240}"
+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="0"
+INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
+FORMAT_LOWER="%B%F{%(?.cyan.red)}"
+
+TRANSIENT_PROMPT="0" # This is buggy
+SHORT_PROMPT="➤"
+FORMAT_SHORT="%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 ' +'
+
+#######################################################################
+# Functions
+#######################################################################
+
+admone-pwd() {
+  echo "%F{blue}%~%f"
 }
-function admone-git {
-  local 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"
+  VCS="1"
 }
-function admone-exit-code {
-  echo "%(?,,%F{1}%?%F{240})"
+admone-exit-code() {
+  ([[ $SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
+    echo "%(?,,%F{red}%?%f)"
 }
-
-function admone-date {
+admone-date() {
   echo $(date -I)
 }
-function admone-time {
-  echo $(date -Iseconds)
+admone-12hr() {
+  echo $(date +%r)
+}
+admone-24hr() {
+  echo $(date +%T)
+}
+# Intergration with https://codeberg.org/armaan/zsh-command-time
+admone-time() {
+  echo "%F{cyan}$timer_show%f"
 }
-#######################################################################
 
-#
+#######################################################################
 # 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 -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
+set-prompt() {
+  # Reset prompts
+  upper="${PRE_UPPER}"
+  lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
+
+  # Add in functions as defined above
+  NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
+
+  THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
+  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
   [[ -v PS1_NL ]] && echo || PS1_NL=
+
   PROMPT=$upper$'\n'$lower
 }
 
+
+# Set everything!
+if [[ $TRANSIENT_PROMPT == "1" ]]; then
+  SHORT_PROMPT=$FORMAT_SHORT$SHORT_PROMPT' '%f%b
+
+  set-transient-prompt() {
+    if [[ $PROMPT != $SHORT_PROMPT ]]; then
+      PROMPT=$SHORT_PROMPT
+      zle .reset-prompt
+    fi
+  }
+
+  zle-line-finish() {
+    set-transient-prompt
+  }
+
+  trap 'set-transient-prompt; return 130' INT
+fi
+
+if [[ $VCS = "1" ]]; then
+  zstyle ':vcs_info:*' check-for-changes true
+  autoload -Uz add-zsh-hook vcs-info
+  add-zsh-hook precmd vcs_info
+fi
+
+autoload -Uz add-zsh-hook
+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