added more customization options

diff --git a/admone.zsh b/admone.zsh
index 2a7fbfda7e2c2ae950790f321f458485adce9bfc..dfbb9c398c939b4cc7da5db1a12f595254ba8a9d 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -15,10 +15,10 @@ 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_PRE_UPPER="╭"
+ADMONE_PRE_LOWER="╰"
+  # ADMONE_PRE_UPPER="┌"
+  # ADMONE_PRE_LOWER="└"
 ADMONE_BLOCK_SEPARATOR="─"
   # ADMONE_BLOCK_SEPARATOR="∙"
 ADMONE_BLOCK_LEFT="["
@@ -28,18 +28,33 @@ 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)
@@ -50,8 +65,8 @@ function admone-12hr {
 function admone-24hr {
   echo $(date +%T)
 }
+# Intergration with https://codeberg.org/armaan/zsh-command-time
 function admone-time {
-  # Intergration with https://codeberg.org/armaan/zsh-command-time
   echo "%F{cyan}$timer_show%f"
 }
 
@@ -63,7 +78,7 @@ function 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
+  if [[ $ADMONE_VI_MODE_CURSOR == "1" ]]; then
     case $KEYMAP in
       vicmd)
         # Block
@@ -74,7 +89,6 @@ function zle-keymap-select zle-line-init zle-line-finish {
         print -n -- "\E]50;CursorShape=1\C-G"
         ;;
     esac
-
     zle reset-prompt
     zle -R
   fi
@@ -90,7 +104,7 @@ function set-prompt() {
   for (( i = 0; i <= $NUM_FUNCS; i++ )); do
     (( val = $i + 1 ))
     THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $val)"
-    if [[ $val == 1 ]]; then
+   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"