#######################################################################
-# Admone ZSH prompt. Copyright Armaan Bhojwani. MIT licensed, see the #
+# 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_VI_MODE_CURSOR="1"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code;admone-time"
+ # 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)}"
-function admone-pwd {
- echo "%F{blue}%~%f%F{240}"
+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 ' +'
+
+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"
}
-function admone-exit-code {
- echo "%(?,,%F{1}%?%F{240})"
+admone-exit-code() {
+ ([[ $ADMONE_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-12hr {
+admone-12hr() {
echo $(date +%r)
}
-function admone-24hr {
+admone-24hr() {
echo $(date +%T)
}
-function admone-time {
- # Intergration with https://codeberg.org/armaan/zsh-command-time
+# Intergration with https://codeberg.org/armaan/zsh-command-time
+admone-time() {
echo "%F{cyan}$timer_show%f"
}
# Cursor shape depends on vi mode
function zle-keymap-select zle-line-init zle-line-finish {
- 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
+ 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() {
+set-prompt() {
# 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)"
- 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
+
+ THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f 1)"
+ upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_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"
done
# Add line above
}
# Set everything!
+if [[ ! $(echo $ADMONE_INCLUDE | grep -q "vcs") ]]; 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
+
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