made a variety of usability changes

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index 9e32ac802bf5d1689a5c5805c4f6b68c0eb2ff08..555159a3a8ed8f96706d225ec52d4516167d0e57 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -15,7 +15,8 @@ ADMONE_PRE_LOWER="╰ "
 ADMONE_BLOCK_SEPARATOR="-"
 ADMONE_BLOCK_LEFT="["
 ADMONE_BLOCK_RIGHT="]"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code"
+ADMONE_VI_MODE_CURSOR="1"
+ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code;admone-12hr;admone-time"
 
 function admone-pwd {
   echo "%F{blue}%~%f%F{240}"
@@ -27,6 +28,19 @@ function admone-git {
 function admone-exit-code {
   echo "%(?,,%F{1}%?%F{240})"
 }
+function admone-date {
+  echo $(date -I)
+}
+function admone-12hr {
+  echo $(date +%r)
+}
+function admone-24hr {
+  echo $(date +%x)
+}
+function admone-time {
+  # Intergration with https://codeberg.org/armaan/zsh-command-time
+  echo %F{cyan}$timer_show%f
+}
 
 #######################################################################
 
@@ -36,36 +50,42 @@ function admone-exit-code {
 
 # 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"
-      ;; # block cursor
-    viins|main)
-      print -n -- "\E]50;CursorShape=1\C-G"
-      ;; # line cursor
-    *)
-      ;;
-  esac
+  if [[ $ADMONE_VI_MODE_CURSOR == 1 ]]; then
+    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
+    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 "
+  upper="${ADMONE_PRE_UPPER}"
+  lower="${ADMONE_PRE_LOWER}%B%F{%(?.cyan.red)}${ADMONE_PROMPT_CHAR}%f%b "
+
+  NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
+  REAL_NUM_FUNCS=$((NUM_FUNCS+1))
 
-  for (( i = 0; i <= $(echo $ADMONE_INCLUDE | grep -o ';' | wc -l); i++ )); do
+  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
     (( val = $i + 1 ))
     THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $val)"
 
-    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
+    if [[ $val == 1 ]]; 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
 
+  [[ -v PS1_NL ]] && echo || PS1_NL=
   PROMPT=$upper$'\n'$lower
 }