diff --git a/.zprezto/abra/functions.zsh b/.zprezto/abra/functions.zsh index b6253bb..0573f7f 100644 --- a/.zprezto/abra/functions.zsh +++ b/.zprezto/abra/functions.zsh @@ -1,5 +1,5 @@ function is_local { - local HOSTNAME=$(hostname) + local HOSTNAME="$(hostname)" [[ "$HOSTNAME" =~ '^abra0' || "$HOSTNAME" == "svxf2-osx" ]] } @@ -155,7 +155,7 @@ function ffmpeg_timelapse { } function ffmpeg_timelapse_today { - local TODAY=$(date '+%Y-%m-%d') + local TODAY="$(date '+%Y-%m-%d')" ffmpeg_timelapse "$TODAY" -preset ultrafast -crf 20 } @@ -166,14 +166,14 @@ function update_.g { return fi - local RES=$(.g pull --no-stat 2>&1) + local RES="$(.g pull --no-stat 2>&1)" if [[ $? != 0 ]]; then # something went wrong return fi - if [[ ! ($RES =~ "Already up.to.date") ]]; then + if [[ ! $RES =~ "Already up.to.date" ]]; then echo "Updated .g" echo $RES echo "======" diff --git a/.zprezto/abra/options.zsh b/.zprezto/abra/options.zsh index b3e855d..2413689 100644 --- a/.zprezto/abra/options.zsh +++ b/.zprezto/abra/options.zsh @@ -45,3 +45,11 @@ bindkey '\e[4~' end-of-line bindkey "\eOH" beginning-of-line bindkey "\eOF" end-of-line + +# modules + +# saves $EPOCHSECONDS +zmodload zsh/datetime + +# profiler +# zmodload zsh/zprof diff --git a/.zprezto/abra/prompt_abra_setup.zsh b/.zprezto/abra/prompt_abra_setup.zsh index 6e76ed8..8b81d38 100644 --- a/.zprezto/abra/prompt_abra_setup.zsh +++ b/.zprezto/abra/prompt_abra_setup.zsh @@ -1,8 +1,11 @@ pmodload 'helper' +# %>dsadsa>dsadsa -- truncation +# %~ -- current dir # %F{color}...%f -- foreground colors # %B...%b -- bold # %(x.a.b) -- if +# ${(l)} -- padding # color chart: https://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg # COLOR_PWD='141' @@ -17,9 +20,7 @@ COLOR_PWD='cyan' COLOR_PWD_ROOT='red' COLOR_PROMPT_STARTER='green' COLOR_TIME='green' -COLOR_USERNAME='blue' -COLOR_AT=$COLOR_USERNAME -COLOR_HOSTNAME=$COLOR_USERNAME +COLOR_USERHOSTNAME='blue' NEWLINE=$'\n' @@ -32,12 +33,18 @@ function prompt_abra_precmd { git-info || true fi - PRE_LENGTH=$(($COLUMNS*2/3)) + PRE_LENGTH=$(( ${COLUMNS} * 2 / 3 )) - PRE='%$PRE_LENGTH<...<%~ %<<' - PRE=$(print -P $PRE) - PRE=$(print ${(l:$COLUMNS:)PRE}) - print -P '%(!.%F{$COLOR_PWD_ROOT}.%F{$COLOR_PWD})$PRE%f' + # take current directory and truncate left so that up to $PRE_LENGTH chars are left + PRE='%${PRE_LENGTH}<...<%~ %<<' + PRE=$(print -P ${PRE}) + PRE=$(print ${(l:${COLUMNS}:)PRE}) + # print -P '%(!.%F{${COLOR_PWD_ROOT}}.%F{${COLOR_PWD}})${PRE}%f' + print -P '%F{${COLOR_PWD}}${PRE}%f' +} + +function prompt_abra_preexec { + echo hi } function prompt_abra_setup { @@ -50,6 +57,7 @@ function prompt_abra_setup { # Add hook for calling git-info before each command. add-zsh-hook precmd prompt_abra_precmd + add-zsh-hook preexec prompt_abra_preexec # Set git-info parameters. zstyle ':prezto:module:git:info' verbose 'yes' @@ -77,10 +85,8 @@ function prompt_abra_setup { PROMPT=$PROMPT'%(?.%F{$COLOR_PROMPT_STARTER}.%F{red})➤ %f' RPROMPT='' - RPROMPT=$RPROMPT'%(?::%F{red}%?%f )' # last command code if nonzero - RPROMPT=$RPROMPT'%B%F{$COLOR_USERNAME}%n%f%b' - RPROMPT=$RPROMPT'%B%F{$COLOR_AT}@%f%b' - RPROMPT=$RPROMPT'%B%F{$COLOR_HOSTNAME}%2m%f%b' + RPROMPT=$RPROMPT'%(?..%F{red}%?%f )' # last command code if nonzero + RPROMPT=$RPROMPT'%B%(!.%F{${COLOR_PWD_ROOT}}.%F{${COLOR_USERHOSTNAME}})%n@%M%f%b' RPROMPT=$RPROMPT'${git_info[rprompt]} ' RPROMPT=$RPROMPT'%F{$COLOR_TIME}%*%f' }