update prezto
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pure-prompt",
|
||||
"version": "1.7.0",
|
||||
"version": "1.8.0",
|
||||
"description": "Pretty, minimal and fast ZSH prompt",
|
||||
"license": "MIT",
|
||||
"repository": "sindresorhus/pure",
|
||||
|
||||
@@ -1,486 +0,0 @@
|
||||
# Pure
|
||||
# by Sindre Sorhus
|
||||
# https://github.com/sindresorhus/pure
|
||||
# MIT License
|
||||
|
||||
# For my own and others sanity
|
||||
# git:
|
||||
# %b => current branch
|
||||
# %a => current action (rebase/merge)
|
||||
# prompt:
|
||||
# %F => color dict
|
||||
# %f => reset color
|
||||
# %~ => current path
|
||||
# %* => time
|
||||
# %n => username
|
||||
# %m => shortname host
|
||||
# %(?..) => prompt conditional - %(condition.true.false)
|
||||
# terminal codes:
|
||||
# \e7 => save cursor position
|
||||
# \e[2A => move cursor 2 lines up
|
||||
# \e[1G => go to position 1 in terminal
|
||||
# \e8 => restore cursor position
|
||||
# \e[K => clears everything after the cursor on the current line
|
||||
# \e[2K => clear everything on the current line
|
||||
|
||||
|
||||
# turns seconds into human readable time
|
||||
# 165392 => 1d 21h 56m 32s
|
||||
# https://github.com/sindresorhus/pretty-time-zsh
|
||||
prompt_pure_human_time_to_var() {
|
||||
local human total_seconds=$1 var=$2
|
||||
local days=$(( total_seconds / 60 / 60 / 24 ))
|
||||
local hours=$(( total_seconds / 60 / 60 % 24 ))
|
||||
local minutes=$(( total_seconds / 60 % 60 ))
|
||||
local seconds=$(( total_seconds % 60 ))
|
||||
(( days > 0 )) && human+="${days}d "
|
||||
(( hours > 0 )) && human+="${hours}h "
|
||||
(( minutes > 0 )) && human+="${minutes}m "
|
||||
human+="${seconds}s"
|
||||
|
||||
# store human readable time in variable as specified by caller
|
||||
typeset -g "${var}"="${human}"
|
||||
}
|
||||
|
||||
# stores (into prompt_pure_cmd_exec_time) the exec time of the last command if set threshold was exceeded
|
||||
prompt_pure_check_cmd_exec_time() {
|
||||
integer elapsed
|
||||
(( elapsed = EPOCHSECONDS - ${prompt_pure_cmd_timestamp:-$EPOCHSECONDS} ))
|
||||
typeset -g prompt_pure_cmd_exec_time=
|
||||
(( elapsed > ${PURE_CMD_MAX_EXEC_TIME:-5} )) && {
|
||||
prompt_pure_human_time_to_var $elapsed "prompt_pure_cmd_exec_time"
|
||||
}
|
||||
}
|
||||
|
||||
prompt_pure_set_title() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
# emacs terminal does not support settings the title
|
||||
(( ${+EMACS} )) && return
|
||||
|
||||
case $TTY in
|
||||
# Don't set title over serial console.
|
||||
/dev/ttyS[0-9]*) return;;
|
||||
esac
|
||||
|
||||
# tell the terminal we are setting the title
|
||||
print -n '\e]0;'
|
||||
# show hostname if connected through ssh
|
||||
[[ -n $SSH_CONNECTION ]] && print -Pn '(%m) '
|
||||
case $1 in
|
||||
expand-prompt)
|
||||
print -Pn $2;;
|
||||
ignore-escape)
|
||||
print -rn $2;;
|
||||
esac
|
||||
# end set title
|
||||
print -n '\a'
|
||||
}
|
||||
|
||||
prompt_pure_preexec() {
|
||||
if [[ -n $prompt_pure_git_fetch_pattern ]]; then
|
||||
# detect when git is performing pull/fetch (including git aliases).
|
||||
local -H MATCH MBEGIN MEND match mbegin mend
|
||||
if [[ $2 =~ (git|hub)\ (.*\ )?($prompt_pure_git_fetch_pattern)(\ .*)?$ ]]; then
|
||||
# we must flush the async jobs to cancel our git fetch in order
|
||||
# to avoid conflicts with the user issued pull / fetch.
|
||||
async_flush_jobs 'prompt_pure'
|
||||
fi
|
||||
fi
|
||||
|
||||
typeset -g prompt_pure_cmd_timestamp=$EPOCHSECONDS
|
||||
|
||||
# shows the current dir and executed command in the title while a process is active
|
||||
prompt_pure_set_title 'ignore-escape' "$PWD:t: $2"
|
||||
|
||||
# Disallow python virtualenv from updating the prompt, set it to 12 if
|
||||
# untouched by the user to indicate that Pure modified it. Here we use
|
||||
# magic number 12, same as in psvar.
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=${VIRTUAL_ENV_DISABLE_PROMPT:-12}
|
||||
}
|
||||
|
||||
# string length ignoring ansi escapes
|
||||
prompt_pure_string_length_to_var() {
|
||||
local str=$1 var=$2 length
|
||||
# perform expansion on str and check length
|
||||
length=$(( ${#${(S%%)str//(\%([KF1]|)\{*\}|\%[Bbkf])}} ))
|
||||
|
||||
# store string length in variable as specified by caller
|
||||
typeset -g "${var}"="${length}"
|
||||
}
|
||||
|
||||
prompt_pure_preprompt_render() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
# Set color for git branch/dirty status, change color if dirty checking has
|
||||
# been delayed.
|
||||
local git_color=242
|
||||
[[ -n ${prompt_pure_git_last_dirty_check_timestamp+x} ]] && git_color=red
|
||||
|
||||
# Initialize the preprompt array.
|
||||
local -a preprompt_parts
|
||||
|
||||
# Set the path.
|
||||
preprompt_parts+=('%F{blue}%~%f')
|
||||
|
||||
# Add git branch and dirty status info.
|
||||
typeset -gA prompt_pure_vcs_info
|
||||
if [[ -n $prompt_pure_vcs_info[branch] ]]; then
|
||||
preprompt_parts+=("%F{$git_color}"'${prompt_pure_vcs_info[branch]}${prompt_pure_git_dirty}%f')
|
||||
fi
|
||||
# Git pull/push arrows.
|
||||
if [[ -n $prompt_pure_git_arrows ]]; then
|
||||
preprompt_parts+=('%F{cyan}${prompt_pure_git_arrows}%f')
|
||||
fi
|
||||
|
||||
# Username and machine, if applicable.
|
||||
[[ -n $prompt_pure_username ]] && preprompt_parts+=('$prompt_pure_username')
|
||||
# Execution time.
|
||||
[[ -n $prompt_pure_cmd_exec_time ]] && preprompt_parts+=('%F{yellow}${prompt_pure_cmd_exec_time}%f')
|
||||
|
||||
local cleaned_ps1=$PROMPT
|
||||
local -H MATCH MBEGIN MEND
|
||||
if [[ $PROMPT = *$prompt_newline* ]]; then
|
||||
# When the prompt contains newlines, we keep everything before the first
|
||||
# and after the last newline, leaving us with everything except the
|
||||
# preprompt. This is needed because some software prefixes the prompt
|
||||
# (e.g. virtualenv).
|
||||
cleaned_ps1=${PROMPT%%${prompt_newline}*}${PROMPT##*${prompt_newline}}
|
||||
fi
|
||||
unset MATCH MBEGIN MEND
|
||||
|
||||
# Construct the new prompt with a clean preprompt.
|
||||
local -ah ps1
|
||||
ps1=(
|
||||
$prompt_newline # Initial newline, for spaciousness.
|
||||
${(j. .)preprompt_parts} # Join parts, space separated.
|
||||
$prompt_newline # Separate preprompt and prompt.
|
||||
$cleaned_ps1
|
||||
)
|
||||
|
||||
PROMPT="${(j..)ps1}"
|
||||
|
||||
# Expand the prompt for future comparision.
|
||||
local expanded_prompt
|
||||
expanded_prompt="${(S%%)PROMPT}"
|
||||
|
||||
if [[ $1 != precmd ]] && [[ $prompt_pure_last_prompt != $expanded_prompt ]]; then
|
||||
# Redraw the prompt.
|
||||
zle && zle .reset-prompt
|
||||
fi
|
||||
|
||||
typeset -g prompt_pure_last_prompt=$expanded_prompt
|
||||
}
|
||||
|
||||
prompt_pure_precmd() {
|
||||
# check exec time and store it in a variable
|
||||
prompt_pure_check_cmd_exec_time
|
||||
unset prompt_pure_cmd_timestamp
|
||||
|
||||
# shows the full path in the title
|
||||
prompt_pure_set_title 'expand-prompt' '%~'
|
||||
|
||||
# preform async git dirty check and fetch
|
||||
prompt_pure_async_tasks
|
||||
|
||||
# Check if we should display the virtual env, we use a sufficiently high
|
||||
# index of psvar (12) here to avoid collisions with user defined entries.
|
||||
psvar[12]=
|
||||
# When VIRTUAL_ENV_DISABLE_PROMPT is empty, it was unset by the user and
|
||||
# Pure should take back control.
|
||||
if [[ -n $VIRTUAL_ENV ]] && [[ -z $VIRTUAL_ENV_DISABLE_PROMPT || $VIRTUAL_ENV_DISABLE_PROMPT = 12 ]]; then
|
||||
psvar[12]="${VIRTUAL_ENV:t}"
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=12
|
||||
fi
|
||||
|
||||
# print the preprompt
|
||||
prompt_pure_preprompt_render "precmd"
|
||||
}
|
||||
|
||||
prompt_pure_async_git_aliases() {
|
||||
setopt localoptions noshwordsplit
|
||||
local dir=$1
|
||||
local -a gitalias pullalias
|
||||
|
||||
# we enter repo to get local aliases as well.
|
||||
builtin cd -q $dir
|
||||
|
||||
# list all aliases and split on newline.
|
||||
gitalias=(${(@f)"$(command git config --get-regexp "^alias\.")"})
|
||||
for line in $gitalias; do
|
||||
parts=(${(@)=line}) # split line on spaces
|
||||
aliasname=${parts[1]#alias.} # grab the name (alias.[name])
|
||||
shift parts # remove aliasname
|
||||
|
||||
# check alias for pull or fetch (must be exact match).
|
||||
if [[ $parts =~ ^(.*\ )?(pull|fetch)(\ .*)?$ ]]; then
|
||||
pullalias+=($aliasname)
|
||||
fi
|
||||
done
|
||||
|
||||
print -- ${(j:|:)pullalias} # join on pipe (for use in regex).
|
||||
}
|
||||
|
||||
prompt_pure_async_vcs_info() {
|
||||
setopt localoptions noshwordsplit
|
||||
builtin cd -q $1 2>/dev/null
|
||||
|
||||
# configure vcs_info inside async task, this frees up vcs_info
|
||||
# to be used or configured as the user pleases.
|
||||
zstyle ':vcs_info:*' enable git
|
||||
zstyle ':vcs_info:*' use-simple true
|
||||
# only export two msg variables from vcs_info
|
||||
zstyle ':vcs_info:*' max-exports 2
|
||||
# export branch (%b) and git toplevel (%R)
|
||||
zstyle ':vcs_info:git*' formats '%b' '%R'
|
||||
zstyle ':vcs_info:git*' actionformats '%b|%a' '%R'
|
||||
|
||||
vcs_info
|
||||
|
||||
local -A info
|
||||
info[top]=$vcs_info_msg_1_
|
||||
info[branch]=$vcs_info_msg_0_
|
||||
|
||||
print -r - ${(@kvq)info}
|
||||
}
|
||||
|
||||
# fastest possible way to check if repo is dirty
|
||||
prompt_pure_async_git_dirty() {
|
||||
setopt localoptions noshwordsplit
|
||||
local untracked_dirty=$1 dir=$2
|
||||
|
||||
# use cd -q to avoid side effects of changing directory, e.g. chpwd hooks
|
||||
builtin cd -q $dir
|
||||
|
||||
if [[ $untracked_dirty = 0 ]]; then
|
||||
command git diff --no-ext-diff --quiet --exit-code
|
||||
else
|
||||
test -z "$(command git status --porcelain --ignore-submodules -unormal)"
|
||||
fi
|
||||
|
||||
return $?
|
||||
}
|
||||
|
||||
prompt_pure_async_git_fetch() {
|
||||
setopt localoptions noshwordsplit
|
||||
# use cd -q to avoid side effects of changing directory, e.g. chpwd hooks
|
||||
builtin cd -q $1
|
||||
|
||||
# set GIT_TERMINAL_PROMPT=0 to disable auth prompting for git fetch (git 2.3+)
|
||||
export GIT_TERMINAL_PROMPT=0
|
||||
# set ssh BachMode to disable all interactive ssh password prompting
|
||||
export GIT_SSH_COMMAND=${GIT_SSH_COMMAND:-"ssh -o BatchMode=yes"}
|
||||
|
||||
command git -c gc.auto=0 fetch &>/dev/null || return 99
|
||||
|
||||
# check arrow status after a successful git fetch
|
||||
prompt_pure_async_git_arrows $1
|
||||
}
|
||||
|
||||
prompt_pure_async_git_arrows() {
|
||||
setopt localoptions noshwordsplit
|
||||
builtin cd -q $1
|
||||
command git rev-list --left-right --count HEAD...@'{u}'
|
||||
}
|
||||
|
||||
prompt_pure_async_tasks() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
# initialize async worker
|
||||
((!${prompt_pure_async_init:-0})) && {
|
||||
async_start_worker "prompt_pure" -u -n
|
||||
async_register_callback "prompt_pure" prompt_pure_async_callback
|
||||
typeset -g prompt_pure_async_init=1
|
||||
}
|
||||
|
||||
typeset -gA prompt_pure_vcs_info
|
||||
|
||||
local -H MATCH MBEGIN MEND
|
||||
if ! [[ $PWD = ${prompt_pure_vcs_info[pwd]}* ]]; then
|
||||
# stop any running async jobs
|
||||
async_flush_jobs "prompt_pure"
|
||||
|
||||
# reset git preprompt variables, switching working tree
|
||||
unset prompt_pure_git_dirty
|
||||
unset prompt_pure_git_last_dirty_check_timestamp
|
||||
unset prompt_pure_git_arrows
|
||||
unset prompt_pure_git_fetch_pattern
|
||||
prompt_pure_vcs_info[branch]=
|
||||
prompt_pure_vcs_info[top]=
|
||||
fi
|
||||
unset MATCH MBEGIN MEND
|
||||
|
||||
async_job "prompt_pure" prompt_pure_async_vcs_info $PWD
|
||||
|
||||
# # only perform tasks inside git working tree
|
||||
[[ -n $prompt_pure_vcs_info[top] ]] || return
|
||||
|
||||
prompt_pure_async_refresh
|
||||
}
|
||||
|
||||
prompt_pure_async_refresh() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
if [[ -z $prompt_pure_git_fetch_pattern ]]; then
|
||||
# we set the pattern here to avoid redoing the pattern check until the
|
||||
# working three has changed. pull and fetch are always valid patterns.
|
||||
typeset -g prompt_pure_git_fetch_pattern="pull|fetch"
|
||||
async_job "prompt_pure" prompt_pure_async_git_aliases $working_tree
|
||||
fi
|
||||
|
||||
async_job "prompt_pure" prompt_pure_async_git_arrows $PWD
|
||||
|
||||
# do not preform git fetch if it is disabled or working_tree == HOME
|
||||
if (( ${PURE_GIT_PULL:-1} )) && [[ $working_tree != $HOME ]]; then
|
||||
# tell worker to do a git fetch
|
||||
async_job "prompt_pure" prompt_pure_async_git_fetch $PWD
|
||||
fi
|
||||
|
||||
# if dirty checking is sufficiently fast, tell worker to check it again, or wait for timeout
|
||||
integer time_since_last_dirty_check=$(( EPOCHSECONDS - ${prompt_pure_git_last_dirty_check_timestamp:-0} ))
|
||||
if (( time_since_last_dirty_check > ${PURE_GIT_DELAY_DIRTY_CHECK:-1800} )); then
|
||||
unset prompt_pure_git_last_dirty_check_timestamp
|
||||
# check check if there is anything to pull
|
||||
async_job "prompt_pure" prompt_pure_async_git_dirty ${PURE_GIT_UNTRACKED_DIRTY:-1} $PWD
|
||||
fi
|
||||
}
|
||||
|
||||
prompt_pure_check_git_arrows() {
|
||||
setopt localoptions noshwordsplit
|
||||
local arrows left=${1:-0} right=${2:-0}
|
||||
|
||||
(( right > 0 )) && arrows+=${PURE_GIT_DOWN_ARROW:-⇣}
|
||||
(( left > 0 )) && arrows+=${PURE_GIT_UP_ARROW:-⇡}
|
||||
|
||||
[[ -n $arrows ]] || return
|
||||
typeset -g REPLY=$arrows
|
||||
}
|
||||
|
||||
prompt_pure_async_callback() {
|
||||
setopt localoptions noshwordsplit
|
||||
local job=$1 code=$2 output=$3 exec_time=$4 next_pending=$6
|
||||
local do_render=0
|
||||
|
||||
case $job in
|
||||
prompt_pure_async_vcs_info)
|
||||
local -A info
|
||||
typeset -gA prompt_pure_vcs_info
|
||||
|
||||
# parse output (z) and unquote as array (Q@)
|
||||
info=("${(Q@)${(z)output}}")
|
||||
local -H MATCH MBEGIN MEND
|
||||
# check if git toplevel has changed
|
||||
if [[ $info[top] = $prompt_pure_vcs_info[top] ]]; then
|
||||
# if stored pwd is part of $PWD, $PWD is shorter and likelier
|
||||
# to be toplevel, so we update pwd
|
||||
if [[ $prompt_pure_vcs_info[pwd] = ${PWD}* ]]; then
|
||||
prompt_pure_vcs_info[pwd]=$PWD
|
||||
fi
|
||||
else
|
||||
# store $PWD to detect if we (maybe) left the git path
|
||||
prompt_pure_vcs_info[pwd]=$PWD
|
||||
fi
|
||||
unset MATCH MBEGIN MEND
|
||||
|
||||
# update has a git toplevel set which means we just entered a new
|
||||
# git directory, run the async refresh tasks
|
||||
[[ -n $info[top] ]] && [[ -z $prompt_pure_vcs_info[top] ]] && prompt_pure_async_refresh
|
||||
|
||||
# always update branch and toplevel
|
||||
prompt_pure_vcs_info[branch]=$info[branch]
|
||||
prompt_pure_vcs_info[top]=$info[top]
|
||||
|
||||
do_render=1
|
||||
;;
|
||||
prompt_pure_async_git_aliases)
|
||||
if [[ -n $output ]]; then
|
||||
# append custom git aliases to the predefined ones.
|
||||
prompt_pure_git_fetch_pattern+="|$output"
|
||||
fi
|
||||
;;
|
||||
prompt_pure_async_git_dirty)
|
||||
local prev_dirty=$prompt_pure_git_dirty
|
||||
if (( code == 0 )); then
|
||||
unset prompt_pure_git_dirty
|
||||
else
|
||||
typeset -g prompt_pure_git_dirty="*"
|
||||
fi
|
||||
|
||||
[[ $prev_dirty != $prompt_pure_git_dirty ]] && do_render=1
|
||||
|
||||
# When prompt_pure_git_last_dirty_check_timestamp is set, the git info is displayed in a different color.
|
||||
# To distinguish between a "fresh" and a "cached" result, the preprompt is rendered before setting this
|
||||
# variable. Thus, only upon next rendering of the preprompt will the result appear in a different color.
|
||||
(( $exec_time > 5 )) && prompt_pure_git_last_dirty_check_timestamp=$EPOCHSECONDS
|
||||
;;
|
||||
prompt_pure_async_git_fetch|prompt_pure_async_git_arrows)
|
||||
# prompt_pure_async_git_fetch executes prompt_pure_async_git_arrows
|
||||
# after a successful fetch.
|
||||
if (( code == 0 )); then
|
||||
local REPLY
|
||||
prompt_pure_check_git_arrows ${(ps:\t:)output}
|
||||
if [[ $prompt_pure_git_arrows != $REPLY ]]; then
|
||||
typeset -g prompt_pure_git_arrows=$REPLY
|
||||
do_render=1
|
||||
fi
|
||||
elif (( code != 99 )); then
|
||||
# Unless the exit code is 99, prompt_pure_async_git_arrows
|
||||
# failed with a non-zero exit status, meaning there is no
|
||||
# upstream configured.
|
||||
if [[ -n $prompt_pure_git_arrows ]]; then
|
||||
unset prompt_pure_git_arrows
|
||||
do_render=1
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if (( next_pending )); then
|
||||
(( do_render )) && typeset -g prompt_pure_async_render_requested=1
|
||||
return
|
||||
fi
|
||||
|
||||
[[ ${prompt_pure_async_render_requested:-$do_render} = 1 ]] && prompt_pure_preprompt_render
|
||||
unset prompt_pure_async_render_requested
|
||||
}
|
||||
|
||||
prompt_pure_setup() {
|
||||
# Prevent percentage showing up if output doesn't end with a newline.
|
||||
export PROMPT_EOL_MARK=''
|
||||
|
||||
prompt_opts=(subst percent)
|
||||
|
||||
# borrowed from promptinit, sets the prompt options in case pure was not
|
||||
# initialized via promptinit.
|
||||
setopt noprompt{bang,cr,percent,subst} "prompt${^prompt_opts[@]}"
|
||||
|
||||
if [[ -z $prompt_newline ]]; then
|
||||
# This variable needs to be set, usually set by promptinit.
|
||||
typeset -g prompt_newline=$'\n%{\r%}'
|
||||
fi
|
||||
|
||||
zmodload zsh/datetime
|
||||
zmodload zsh/zle
|
||||
zmodload zsh/parameter
|
||||
|
||||
autoload -Uz add-zsh-hook
|
||||
autoload -Uz vcs_info
|
||||
autoload -Uz async && async
|
||||
|
||||
add-zsh-hook precmd prompt_pure_precmd
|
||||
add-zsh-hook preexec prompt_pure_preexec
|
||||
|
||||
# show username@host if logged in through SSH
|
||||
[[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username='%F{242}%n@%m%f'
|
||||
|
||||
# show username@host if root, with username in white
|
||||
[[ $UID -eq 0 ]] && prompt_pure_username='%F{white}%n%f%F{242}@%m%f'
|
||||
|
||||
# if a virtualenv is activated, display it in grey
|
||||
PROMPT='%(12V.%F{242}%12v%f .)'
|
||||
|
||||
# prompt turns red if the previous command didn't exit with 0
|
||||
PROMPT+='%(?.%F{magenta}.%F{red})${PURE_PROMPT_SYMBOL:-❯}%f '
|
||||
}
|
||||
|
||||
prompt_pure_setup "$@"
|
||||
1
.zprezto/modules/prompt/external/pure/pure.plugin.zsh
vendored
Symbolic link
1
.zprezto/modules/prompt/external/pure/pure.plugin.zsh
vendored
Symbolic link
@@ -0,0 +1 @@
|
||||
pure.zsh
|
||||
235
.zprezto/modules/prompt/external/pure/pure.zsh
vendored
235
.zprezto/modules/prompt/external/pure/pure.zsh
vendored
@@ -63,18 +63,22 @@ prompt_pure_set_title() {
|
||||
/dev/ttyS[0-9]*) return;;
|
||||
esac
|
||||
|
||||
# tell the terminal we are setting the title
|
||||
print -n '\e]0;'
|
||||
# show hostname if connected through ssh
|
||||
[[ -n $SSH_CONNECTION ]] && print -Pn '(%m) '
|
||||
# Show hostname if connected via ssh.
|
||||
local hostname=
|
||||
if [[ -n $prompt_pure_state[username] ]]; then
|
||||
# Expand in-place in case ignore-escape is used.
|
||||
hostname="${(%):-(%m) }"
|
||||
fi
|
||||
|
||||
local -a opts
|
||||
case $1 in
|
||||
expand-prompt)
|
||||
print -Pn $2;;
|
||||
ignore-escape)
|
||||
print -rn $2;;
|
||||
expand-prompt) opts=(-P);;
|
||||
ignore-escape) opts=(-r);;
|
||||
esac
|
||||
# end set title
|
||||
print -n '\a'
|
||||
|
||||
# Set title atomically in one print statement so that it works
|
||||
# when XTRACE is enabled.
|
||||
print -n $opts $'\e]0;'${hostname}${2}$'\a'
|
||||
}
|
||||
|
||||
prompt_pure_preexec() {
|
||||
@@ -99,16 +103,6 @@ prompt_pure_preexec() {
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=${VIRTUAL_ENV_DISABLE_PROMPT:-12}
|
||||
}
|
||||
|
||||
# string length ignoring ansi escapes
|
||||
prompt_pure_string_length_to_var() {
|
||||
local str=$1 var=$2 length
|
||||
# perform expansion on str and check length
|
||||
length=$(( ${#${(S%%)str//(\%([KF1]|)\{*\}|\%[Bbkf])}} ))
|
||||
|
||||
# store string length in variable as specified by caller
|
||||
typeset -g "${var}"="${length}"
|
||||
}
|
||||
|
||||
prompt_pure_preprompt_render() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
@@ -134,25 +128,22 @@ prompt_pure_preprompt_render() {
|
||||
fi
|
||||
|
||||
# Username and machine, if applicable.
|
||||
[[ -n $prompt_pure_username ]] && preprompt_parts+=('$prompt_pure_username')
|
||||
[[ -n $prompt_pure_state[username] ]] && preprompt_parts+=('${prompt_pure_state[username]}')
|
||||
# Execution time.
|
||||
[[ -n $prompt_pure_cmd_exec_time ]] && preprompt_parts+=('%F{yellow}${prompt_pure_cmd_exec_time}%f')
|
||||
|
||||
local cleaned_ps1=$PROMPT
|
||||
local -H MATCH MBEGIN MEND
|
||||
if [[ $PROMPT = *$prompt_newline* ]]; then
|
||||
# When the prompt contains newlines, we keep everything before the first
|
||||
# and after the last newline, leaving us with everything except the
|
||||
# preprompt. This is needed because some software prefixes the prompt
|
||||
# (e.g. virtualenv).
|
||||
cleaned_ps1=${PROMPT%%${prompt_newline}*}${PROMPT##*${prompt_newline}}
|
||||
# Remove everything from the prompt until the newline. This
|
||||
# removes the preprompt and only the original PROMPT remains.
|
||||
cleaned_ps1=${PROMPT##*${prompt_newline}}
|
||||
fi
|
||||
unset MATCH MBEGIN MEND
|
||||
|
||||
# Construct the new prompt with a clean preprompt.
|
||||
local -ah ps1
|
||||
ps1=(
|
||||
$prompt_newline # Initial newline, for spaciousness.
|
||||
${(j. .)preprompt_parts} # Join parts, space separated.
|
||||
$prompt_newline # Separate preprompt and prompt.
|
||||
$cleaned_ps1
|
||||
@@ -164,7 +155,10 @@ prompt_pure_preprompt_render() {
|
||||
local expanded_prompt
|
||||
expanded_prompt="${(S%%)PROMPT}"
|
||||
|
||||
if [[ $1 != precmd ]] && [[ $prompt_pure_last_prompt != $expanded_prompt ]]; then
|
||||
if [[ $1 == precmd ]]; then
|
||||
# Initial newline, for spaciousness.
|
||||
print
|
||||
elif [[ $prompt_pure_last_prompt != $expanded_prompt ]]; then
|
||||
# Redraw the prompt.
|
||||
zle && zle .reset-prompt
|
||||
fi
|
||||
@@ -193,8 +187,17 @@ prompt_pure_precmd() {
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=12
|
||||
fi
|
||||
|
||||
# Make sure VIM prompt is reset.
|
||||
prompt_pure_reset_vim_prompt
|
||||
|
||||
# print the preprompt
|
||||
prompt_pure_preprompt_render "precmd"
|
||||
|
||||
if [[ -n $ZSH_THEME ]]; then
|
||||
print "WARNING: Oh My Zsh themes are enabled (ZSH_THEME='${ZSH_THEME}'). Pure might not be working correctly."
|
||||
print "For more information, see: https://github.com/sindresorhus/pure#oh-my-zsh"
|
||||
unset ZSH_THEME # Only show this warning once.
|
||||
fi
|
||||
}
|
||||
|
||||
prompt_pure_async_git_aliases() {
|
||||
@@ -269,9 +272,37 @@ prompt_pure_async_git_fetch() {
|
||||
# set GIT_TERMINAL_PROMPT=0 to disable auth prompting for git fetch (git 2.3+)
|
||||
export GIT_TERMINAL_PROMPT=0
|
||||
# set ssh BachMode to disable all interactive ssh password prompting
|
||||
export GIT_SSH_COMMAND=${GIT_SSH_COMMAND:-"ssh -o BatchMode=yes"}
|
||||
export GIT_SSH_COMMAND="${GIT_SSH_COMMAND:-"ssh"} -o BatchMode=yes"
|
||||
|
||||
command git -c gc.auto=0 fetch &>/dev/null || return 99
|
||||
# Default return code, indicates Git fetch failure.
|
||||
local fail_code=99
|
||||
|
||||
# Guard against all forms of password prompts. By setting the shell into
|
||||
# MONITOR mode we can notice when a child process prompts for user input
|
||||
# because it will be suspended. Since we are inside an async worker, we
|
||||
# have no way of transmitting the password and the only option is to
|
||||
# kill it. If we don't do it this way, the process will corrupt with the
|
||||
# async worker.
|
||||
setopt localtraps monitor
|
||||
|
||||
# Make sure local HUP trap is unset to allow for signal propagation when
|
||||
# the async worker is flushed.
|
||||
trap - HUP
|
||||
|
||||
trap '
|
||||
# Unset trap to prevent infinite loop
|
||||
trap - CHLD
|
||||
if [[ $jobstates = suspended* ]]; then
|
||||
# Set fail code to password prompt and kill the fetch.
|
||||
fail_code=98
|
||||
kill %%
|
||||
fi
|
||||
' CHLD
|
||||
|
||||
command git -c gc.auto=0 fetch >/dev/null &
|
||||
wait $! || return $fail_code
|
||||
|
||||
unsetopt monitor
|
||||
|
||||
# check arrow status after a successful git fetch
|
||||
prompt_pure_async_git_arrows $1
|
||||
@@ -416,22 +447,27 @@ prompt_pure_async_callback() {
|
||||
prompt_pure_async_git_fetch|prompt_pure_async_git_arrows)
|
||||
# prompt_pure_async_git_fetch executes prompt_pure_async_git_arrows
|
||||
# after a successful fetch.
|
||||
if (( code == 0 )); then
|
||||
local REPLY
|
||||
prompt_pure_check_git_arrows ${(ps:\t:)output}
|
||||
if [[ $prompt_pure_git_arrows != $REPLY ]]; then
|
||||
typeset -g prompt_pure_git_arrows=$REPLY
|
||||
do_render=1
|
||||
fi
|
||||
elif (( code != 99 )); then
|
||||
# Unless the exit code is 99, prompt_pure_async_git_arrows
|
||||
# failed with a non-zero exit status, meaning there is no
|
||||
# upstream configured.
|
||||
if [[ -n $prompt_pure_git_arrows ]]; then
|
||||
unset prompt_pure_git_arrows
|
||||
do_render=1
|
||||
fi
|
||||
fi
|
||||
case $code in
|
||||
0)
|
||||
local REPLY
|
||||
prompt_pure_check_git_arrows ${(ps:\t:)output}
|
||||
if [[ $prompt_pure_git_arrows != $REPLY ]]; then
|
||||
typeset -g prompt_pure_git_arrows=$REPLY
|
||||
do_render=1
|
||||
fi
|
||||
;;
|
||||
99|98)
|
||||
# Git fetch failed.
|
||||
;;
|
||||
*)
|
||||
# Non-zero exit status from prompt_pure_async_git_arrows,
|
||||
# indicating that there is no upstream configured.
|
||||
if [[ -n $prompt_pure_git_arrows ]]; then
|
||||
unset prompt_pure_git_arrows
|
||||
do_render=1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -444,6 +480,67 @@ prompt_pure_async_callback() {
|
||||
unset prompt_pure_async_render_requested
|
||||
}
|
||||
|
||||
prompt_pure_update_vim_prompt() {
|
||||
setopt localoptions noshwordsplit
|
||||
prompt_pure_state[prompt]=${${KEYMAP/vicmd/${PURE_PROMPT_VICMD_SYMBOL:-❮}}/(main|viins)/${PURE_PROMPT_SYMBOL:-❯}}
|
||||
zle && zle .reset-prompt
|
||||
}
|
||||
|
||||
prompt_pure_reset_vim_prompt() {
|
||||
setopt localoptions noshwordsplit
|
||||
prompt_pure_state[prompt]=${PURE_PROMPT_SYMBOL:-❯}
|
||||
zle && zle .reset-prompt
|
||||
}
|
||||
|
||||
prompt_pure_state_setup() {
|
||||
setopt localoptions noshwordsplit
|
||||
|
||||
# Check SSH_CONNECTION and the current state.
|
||||
local ssh_connection=${SSH_CONNECTION:-$PROMPT_PURE_SSH_CONNECTION}
|
||||
local username
|
||||
if [[ -z $ssh_connection ]] && (( $+commands[who] )); then
|
||||
# When changing user on a remote system, the $SSH_CONNECTION
|
||||
# environment variable can be lost, attempt detection via who.
|
||||
local who_out
|
||||
who_out=$(who -m 2>/dev/null)
|
||||
if (( $? )); then
|
||||
# Who am I not supported, fallback to plain who.
|
||||
who_out=$(who 2>/dev/null | grep ${TTY#/dev/})
|
||||
fi
|
||||
|
||||
local reIPv6='(([0-9a-fA-F]+:)|:){2,}[0-9a-fA-F]+' # Simplified, only checks partial pattern.
|
||||
local reIPv4='([0-9]{1,3}\.){3}[0-9]+' # Simplified, allows invalid ranges.
|
||||
# Here we assume two non-consecutive periods represents a
|
||||
# hostname. This matches foo.bar.baz, but not foo.bar.
|
||||
local reHostname='([.][^. ]+){2}'
|
||||
|
||||
# Usually the remote address is surrounded by parenthesis, but
|
||||
# not on all systems (e.g. busybox).
|
||||
local -H MATCH MBEGIN MEND
|
||||
if [[ $who_out =~ "\(?($reIPv4|$reIPv6|$reHostname)\)?\$" ]]; then
|
||||
ssh_connection=$MATCH
|
||||
|
||||
# Export variable to allow detection propagation inside
|
||||
# shells spawned by this one (e.g. tmux does not always
|
||||
# inherit the same tty, which breaks detection).
|
||||
export PROMPT_PURE_SSH_CONNECTION=$ssh_connection
|
||||
fi
|
||||
unset MATCH MBEGIN MEND
|
||||
fi
|
||||
|
||||
# show username@host if logged in through SSH
|
||||
[[ -n $ssh_connection ]] && username='%F{242}%n@%m%f'
|
||||
|
||||
# show username@host if root, with username in white
|
||||
[[ $UID -eq 0 ]] && username='%F{white}%n%f%F{242}@%m%f'
|
||||
|
||||
typeset -gA prompt_pure_state
|
||||
prompt_pure_state=(
|
||||
username "$username"
|
||||
prompt "${PURE_PROMPT_SYMBOL:-❯}"
|
||||
)
|
||||
}
|
||||
|
||||
prompt_pure_setup() {
|
||||
# Prevent percentage showing up if output doesn't end with a newline.
|
||||
export PROMPT_EOL_MARK=''
|
||||
@@ -467,20 +564,56 @@ prompt_pure_setup() {
|
||||
autoload -Uz vcs_info
|
||||
autoload -Uz async && async
|
||||
|
||||
# The add-zle-hook-widget function is not guaranteed
|
||||
# to be available, it was added in Zsh 5.3.
|
||||
autoload -Uz +X add-zle-hook-widget 2>/dev/null
|
||||
|
||||
add-zsh-hook precmd prompt_pure_precmd
|
||||
add-zsh-hook preexec prompt_pure_preexec
|
||||
|
||||
# show username@host if logged in through SSH
|
||||
[[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username='%F{242}%n@%m%f'
|
||||
prompt_pure_state_setup
|
||||
|
||||
# show username@host if root, with username in white
|
||||
[[ $UID -eq 0 ]] && prompt_pure_username='%F{white}%n%f%F{242}@%m%f'
|
||||
zle -N prompt_pure_update_vim_prompt
|
||||
zle -N prompt_pure_reset_vim_prompt
|
||||
if (( $+functions[add-zle-hook-widget] )); then
|
||||
add-zle-hook-widget zle-line-finish prompt_pure_reset_vim_prompt
|
||||
add-zle-hook-widget zle-keymap-select prompt_pure_update_vim_prompt
|
||||
fi
|
||||
|
||||
# if a virtualenv is activated, display it in grey
|
||||
PROMPT='%(12V.%F{242}%12v%f .)'
|
||||
|
||||
# prompt turns red if the previous command didn't exit with 0
|
||||
PROMPT+='%(?.%F{magenta}.%F{red})${PURE_PROMPT_SYMBOL:-❯}%f '
|
||||
PROMPT+='%(?.%F{magenta}.%F{red})${prompt_pure_state[prompt]}%f '
|
||||
|
||||
# Store prompt expansion symbols for in-place expansion via (%). For
|
||||
# some reason it does not work without storing them in a variable first.
|
||||
typeset -ga prompt_pure_debug_depth
|
||||
prompt_pure_debug_depth=('%e' '%N' '%x')
|
||||
|
||||
# Compare is used to check if %N equals %x. When they differ, the main
|
||||
# prompt is used to allow displaying both file name and function. When
|
||||
# they match, we use the secondary prompt to avoid displaying duplicate
|
||||
# information.
|
||||
local -A ps4_parts
|
||||
ps4_parts=(
|
||||
depth '%F{yellow}${(l:${(%)prompt_pure_debug_depth[1]}::+:)}%f'
|
||||
compare '${${(%)prompt_pure_debug_depth[2]}:#${(%)prompt_pure_debug_depth[3]}}'
|
||||
main '%F{blue}${${(%)prompt_pure_debug_depth[3]}:t}%f%F{242}:%I%f %F{242}@%f%F{blue}%N%f%F{242}:%i%f'
|
||||
secondary '%F{blue}%N%f%F{242}:%i'
|
||||
prompt '%F{242}>%f '
|
||||
)
|
||||
# Combine the parts with conditional logic. First the `:+` operator is
|
||||
# used to replace `compare` either with `main` or an ampty string. Then
|
||||
# the `:-` operator is used so that if `compare` becomes an empty
|
||||
# string, it is replaced with `secondary`.
|
||||
local ps4_symbols='${${'${ps4_parts[compare]}':+"'${ps4_parts[main]}'"}:-"'${ps4_parts[secondary]}'"}'
|
||||
|
||||
# Improve the debug prompt (PS4), show depth by repeating the +-sign and
|
||||
# add colors to highlight essential parts like file and function name.
|
||||
PROMPT4="${ps4_parts[depth]} ${ps4_symbols}${ps4_parts[prompt]}"
|
||||
|
||||
unset ZSH_THEME # Guard against Oh My Zsh themes overriding Pure.
|
||||
}
|
||||
|
||||
prompt_pure_setup "$@"
|
||||
|
||||
62
.zprezto/modules/prompt/external/pure/readme.md
vendored
62
.zprezto/modules/prompt/external/pure/readme.md
vendored
@@ -19,6 +19,7 @@ Most prompts are cluttered, ugly and slow. I wanted something visually pleasing
|
||||
- Command execution time will be displayed if it exceeds the set threshold.
|
||||
- Username and host only displayed when in an SSH session.
|
||||
- Shows the current path in the title and the [current folder & command](screenshot-title-cmd.png) when a process is running.
|
||||
- Support VI-mode indication by reverse prompt symbol (Zsh 5.3+).
|
||||
- Makes an excellent starting point for your own custom prompt.
|
||||
|
||||
|
||||
@@ -41,7 +42,7 @@ That's it. Skip to [Getting started](#getting-started).
|
||||
- add it as a submodule, or
|
||||
- just download [`pure.zsh`](pure.zsh) and [`async.zsh`](async.zsh)
|
||||
|
||||
2. Symlink `pure.zsh` to somewhere in [`$fpath`](http://www.refining-linux.org/archives/46/ZSH-Gem-12-Autoloading-functions/) with the name `prompt_pure_setup`.
|
||||
2. Symlink `pure.zsh` to somewhere in [`$fpath`](https://www.refining-linux.org/archives/46-ZSH-Gem-12-Autoloading-functions.html) with the name `prompt_pure_setup`.
|
||||
|
||||
3. Symlink `async.zsh` in `$fpath` with the name `async`.
|
||||
|
||||
@@ -81,33 +82,16 @@ prompt pure
|
||||
|
||||
## Options
|
||||
|
||||
### `PURE_CMD_MAX_EXEC_TIME`
|
||||
|
||||
The max execution time of a process before its run time is shown when it exits. Defaults to `5` seconds.
|
||||
|
||||
### `PURE_GIT_PULL`
|
||||
|
||||
Set `PURE_GIT_PULL=0` to prevent Pure from checking whether the current Git remote has been updated.
|
||||
|
||||
### `PURE_GIT_UNTRACKED_DIRTY`
|
||||
|
||||
Set `PURE_GIT_UNTRACKED_DIRTY=0` to not include untracked files in dirtiness check. Only really useful on extremely huge repos like the WebKit repo.
|
||||
|
||||
### `PURE_GIT_DELAY_DIRTY_CHECK`
|
||||
|
||||
Time in seconds to delay git dirty checking for large repositories (git status takes > 5 seconds). The check is performed asynchronously, this is to save CPU. Defaults to `1800` seconds.
|
||||
|
||||
### `PURE_PROMPT_SYMBOL`
|
||||
|
||||
Defines the prompt symbol. The default value is `❯`.
|
||||
|
||||
### `PURE_GIT_DOWN_ARROW`
|
||||
|
||||
Defines the git down arrow symbol. The default value is `⇣`.
|
||||
|
||||
### `PURE_GIT_UP_ARROW`
|
||||
|
||||
Defines the git up arrow symbol. The default value is `⇡`.
|
||||
| Option | Description | Default value |
|
||||
| :------------------------------- | :--------------------------------------------------------------------------------------------- | :------------- |
|
||||
| **`PURE_CMD_MAX_EXEC_TIME`** | The max execution time of a process before its run time is shown when it exits. | `5` seconds |
|
||||
| **`PURE_GIT_PULL=0`** | Prevents Pure from checking whether the current Git remote has been updated. | |
|
||||
| **`PURE_GIT_UNTRACKED_DIRTY=0`** | Do not include untracked files in dirtiness check. Mostly useful on large repos (like WebKit). | |
|
||||
| **`PURE_GIT_DELAY_DIRTY_CHECK`** | Time in seconds to delay git dirty checking when `git status` takes > 5 seconds. | `1800` seconds |
|
||||
| **`PURE_PROMPT_SYMBOL`** | Defines the prompt symbol. | `❯` |
|
||||
| **`PURE_PROMPT_VICMD_SYMBOL`** | Defines the prompt symbol used when the `vicmd` keymap is active (VI-mode). | `❮` |
|
||||
| **`PURE_GIT_DOWN_ARROW`** | Defines the git down arrow symbol. | `⇣` |
|
||||
| **`PURE_GIT_UP_ARROW`** | Defines the git up arrow symbol. | `⇡` |
|
||||
|
||||
## Example
|
||||
|
||||
@@ -139,6 +123,7 @@ To have commands colorized as seen in the screenshot, install [zsh-syntax-highli
|
||||
|
||||
1. Set `ZSH_THEME=""` in your `.zshrc` to disable oh-my-zsh themes.
|
||||
2. Follow the Pure [Install](#install) instructions.
|
||||
3. Do not enable the following (incompatible) plugins: `vi-mode`, `virtualenv`.
|
||||
|
||||
**NOTE:** `oh-my-zsh` overrides the prompt so Pure must be activated *after* `source $ZSH/oh-my-zsh.sh`.
|
||||
|
||||
@@ -192,26 +177,9 @@ zplugin light sindresorhus/pure
|
||||
|
||||
## FAQ
|
||||
|
||||
### I am stuck in a shell loop in my terminal that asks me to authenticate. What should I do?
|
||||
|
||||
[This is a known issue](https://github.com/sindresorhus/pure/issues/76).
|
||||
Using `git pull` when you get the username prompt should help you to break the loop by giving you a real prompt for this. **[This has been fixed in git 2.3](https://github.com/sindresorhus/pure/commit/f43ab97e1cf4a276b7a6e33eac055ee16610be15)**
|
||||
|
||||
### I am seeing the error `zpty: can't open pseudo terminal: bad file descriptor`.
|
||||
|
||||
[This is a known issue](https://github.com/sindresorhus/pure/issues/117). `zsh/zpty` requires either legacy bsd ptys or access to `/dev/ptmx`. Here are some known solutions.
|
||||
|
||||
#### Gentoo
|
||||
|
||||
```console
|
||||
$ sudo sh -c "echo 'SANDBOX_WRITE=\"/dev/ptmx\"' > /etc/sandbox.d/10zsh"
|
||||
$ sudo emerge -1 zsh
|
||||
```
|
||||
|
||||
#### FreeBSD 10.1
|
||||
|
||||
On a default setup, running the command `kldload pty` should do the trick. If you have a custom kernel, you might need to add `device pty` to the configuration file ([example](https://github.com/nbari/freebsd/blob/58646a9c3c4aaabf6f6467ff505f27f09e29dc75/kernels/xen.kernel#L188)).
|
||||
There are currently no FAQs.
|
||||
|
||||
See [FAQ Archive](https://github.com/sindresorhus/pure/wiki/FAQ-Archive) for previous FAQs.
|
||||
|
||||
## Ports
|
||||
|
||||
|
||||
Reference in New Issue
Block a user