X-Git-Url: https://git.armaanb.net/?p=admone.git;a=blobdiff_plain;f=admone.zsh;h=700bfa277fdd03d71d0fa8779fba561b4ade54d1;hp=a9f0781169f6a1bb67d772987064cab481888306;hb=b84abe4590bfdc002f131cc183caec0316861942;hpb=db2076f91e5de878e376a14b086416c5885c46fa

diff --git a/admone.zsh b/admone.zsh
index a9f0781..700bfa2 100644
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,47 +1,55 @@
+# 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. 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_PROMPT_CHAR="❯❯❯"
-  # ADMONE_PROMPT_CHAR="$"
-  # ADMONE_PROMPT_CHAR="%"
-  # ADMONE_PROMPT_CHAR=">"
-  # ADMONE_PROMPT_CHAR="➢"
-  # ADMONE_PROMPT_CHAR="➪"
-ADMONE_PRE_UPPER="╭"
-ADMONE_PRE_LOWER="╰"
-  # ADMONE_PRE_UPPER="┌"
-  # ADMONE_PRE_LOWER="└"
-ADMONE_BLOCK_SEPARATOR="─"
-  # ADMONE_BLOCK_SEPARATOR="∙"
-ADMONE_BLOCK_LEFT="["
-ADMONE_BLOCK_RIGHT="]"
-  # ADMONE_BLOCK_LEFT="("
-  # ADMONE_BLOCK_RIGHT=")"
-ADMONE_SHOW_0_EXIT_CODE="0"
-ADMONE_INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
-ADMONE_FORMAT_LOWER="%B%F{%(?.cyan.red)}"
+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="1" # 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"
 }
 admone-vcs() {
   echo "%F{green}${vcs_info_msg_0_}%f"
+  VCS="1"
 }
 admone-exit-code() {
-  ([[ $ADMONE_SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
+  ([[ $SHOW_0_EXIT_CODE == "1" ]] && echo "%(?,%F{cyan}%?%f,%F{red}%?%f)") ||
     echo "%(?,,%F{red}%?%f)"
 }
 admone-date() {
@@ -59,10 +67,8 @@ admone-time() {
 }
 
 #######################################################################
-
-#
 # BACKEND
-#
+#######################################################################
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
@@ -82,18 +88,18 @@ function zle-keymap-select zle-line-init zle-line-finish {
 
 set-prompt() {
   # Reset prompts
-  upper="${ADMONE_PRE_UPPER}"
-  lower="${ADMONE_PRE_LOWER}${ADMONE_FORMAT_LOWER}${ADMONE_PROMPT_CHAR}%f%b "
+  upper="${PRE_UPPER}"
+  lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
 
   # Add in functions as defined above
-  NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
+  NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
 
-  THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f 1)"
-  upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+  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 $ADMONE_INCLUDE | cut -d ';' -f $(($i + 2)))"
-    upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 2)))"
+    upper+="$BLOCK_SEPARATOR$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
   done
 
   # Add line above
@@ -102,17 +108,34 @@ set-prompt() {
   PROMPT=$upper$'\n'$lower
 }
 
+
 # Set everything!
-if [[ ! $(echo $ADMONE_INCLUDE | grep -q "vcs") ]]; then
+if [[ $TRANSIENT_PROMPT == "1" ]]; then
+  SHORT_PROMPT=$FORMAT_SHORT$SHORT_PROMPT%f' '
+
+  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
-  add-zsh-hook precmd set-prompt
-else
-  autoload -Uz add-zsh-hook
-  add-zsh-hook precmd set-prompt
 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