added more customization options

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index e6cb23f57aa51d5495878e686c6410c38879a99c..dfbb9c398c939b4cc7da5db1a12f595254ba8a9d 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,39 +1,75 @@
 #######################################################################
-# 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. 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
 #
 
-ADMONE_PROMPT_CHAR="❯❯❯"
-ADMONE_PRE_UPPER="╭ "
-ADMONE_PRE_LOWER="╰ "
-ADMONE_BLOCK_SEPARATOR="-"
+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_INCLUDE="admone-pwd;admone-git;admone-exit-code"
+  # 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_GIT_SHOW_BLANK="1"
+ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code;admone-time"
+ADMONE_FORMAT_LOWER="%B%F{%(?.cyan.red)}"
 
 function admone-pwd {
-  echo "%F{blue}%~%f%F{240}"
+  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"
+  git_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
+  if [[ $ADMONE_GIT_SHOW_BLANK == "0" ]]; then
+    if [[ ${git_branch//\%/%%} == "" ]]; then
+      echo "%F{blue}n/a%f"
+    else
+      echo "%F{green}${git_branch//\%/%%}%f"
+    fi
+  else
+    echo "%F{green}${git_branch//\%/%%}%f"
+  fi
 }
 function admone-exit-code {
-  echo "%(?,,%F{1}%?%F{240})"
+  if [[ $ADMONE_SHOW_0_EXIT_CODE == "1" ]]; then
+    echo "%(?,%F{cyan}%?%f,%F{red}%?%f)"
+  elif [[ $ADMONE_SHOW_0_EXIT_CODE == "0" ]]; then
+    echo "%(?,,%F{red}%?%f)"
+  fi
 }
-
 function admone-date {
   echo $(date -I)
 }
+function admone-12hr {
+  echo $(date +%r)
+}
+function admone-24hr {
+  echo $(date +%T)
+}
+# Intergration with https://codeberg.org/armaan/zsh-command-time
 function admone-time {
-  echo $(date -Iseconds)
+  echo "%F{cyan}$timer_show%f"
 }
+
 #######################################################################
 
 #
@@ -42,54 +78,46 @@ function admone-time {
 
 # Cursor shape depends on vi mode
 function zle-keymap-select zle-line-init zle-line-finish {
-  case $KEYMAP in
-    vicmd)
-      print -n -- "\E]50;CursorShape=0\C-G"
-      ;;
-    viins|main)
-      print -n -- "\E]50;CursorShape=1\C-G"
-      ;;
-    *)
-      ;;
-  esac
-
-  zle reset-prompt
-  zle -R
+  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
 }
 
 function set-prompt() {
-  upper="%B${ADMONE_PRE_UPPER}"
-  lower="%B${ADMONE_PRE_LOWER}%B%F{%(?.cyan.red)}${ADMONE_PROMPT_CHAR}%f%b "
+  # Reset prompts
+  upper="${ADMONE_PRE_UPPER}"
+  lower="${ADMONE_PRE_LOWER}${ADMONE_FORMAT_LOWER}${ADMONE_PROMPT_CHAR}%f%b "
 
+  # Add in functions as defined above
   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
+   if [[ $i == 0 ]]; then
+      upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+    else
+      upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+    fi
   done
 
+  # Add line above
   [[ -v PS1_NL ]] && echo || PS1_NL=
+
   PROMPT=$upper$'\n'$lower
 }
 
+# Set everything!
 zle -N zle-line-init
 zle -N zle-line-finish
 zle -N zle-keymap-select