From: Armaan Bhojwani Date: Mon, 8 Feb 2021 14:28:06 +0000 (-0500) Subject: Move loose code X-Git-Url: https://git.armaanb.net/?p=admone.git;a=commitdiff_plain;h=c3c7457cd89e022f172010fb4a5612d94844e051 Move loose code --- diff --git a/admone.zsh b/admone.zsh index aba18da..8f13a01 100644 --- a/admone.zsh +++ b/admone.zsh @@ -80,10 +80,6 @@ function zle-keymap-select zle-line-init zle-line-finish { zle -R } -NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)" -THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)" -[[ -v PS1_NL ]] && echo || PS1_NL= - set-twoline-prompt() { # Reset prompts upper="${PRE_UPPER}" @@ -110,13 +106,19 @@ set-oneline-prompt() { RPROMPT+="${BLOCK_LEFT}$($THE_COMMAND)${BLOCK_RIGHT}" done } + # Set everything! set-prompt() { + NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)" + THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)" + if [[ $TWO_LINE == "1" ]]; then set-twoline-prompt else set-oneline-prompt fi + + [[ -v PS1_NL ]] && echo || PS1_NL= } if [[ ! $(echo $INCLUDE | grep -q "vcs") ]]; then