From 1f2471641d2311ac015b1760b4a309a361135b4d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 7 May 2015 15:14:58 -0400 Subject: [PATCH] New zsh prompt --- zsh/config | 1 + zsh/preztorc | 2 +- zsh/prompts/prompt_pure_setup | 138 ++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 zsh/prompts/prompt_pure_setup diff --git a/zsh/config b/zsh/config index 60a8ec54..a385495d 100644 --- a/zsh/config +++ b/zsh/config @@ -1,4 +1,5 @@ export GIT_MERGE_AUTOEDIT=no +unsetopt CORRECT_ALL ################# diff --git a/zsh/preztorc b/zsh/preztorc index ca52ea55..36e30724 100644 --- a/zsh/preztorc +++ b/zsh/preztorc @@ -5,7 +5,7 @@ source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" # General -zstyle ':prezto:module:prompt' theme 'v0' +zstyle ':prezto:module:prompt' theme 'pure' # Set case-sensitivity for completion, history lookup, etc. # zstyle ':prezto:*:*' case-sensitive 'yes' diff --git a/zsh/prompts/prompt_pure_setup b/zsh/prompts/prompt_pure_setup new file mode 100644 index 00000000..ba1ad2bb --- /dev/null +++ b/zsh/prompts/prompt_pure_setup @@ -0,0 +1,138 @@ +# 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) + + +# turns seconds into human readable time +# 165392 => 1d 21h 56m 32s +prompt_pure_human_time() { + echo -n " " + local tmp=$1 + local days=$(( tmp / 60 / 60 / 24 )) + local hours=$(( tmp / 60 / 60 % 24 )) + local minutes=$(( tmp / 60 % 60 )) + local seconds=$(( tmp % 60 )) + (( $days > 0 )) && echo -n "${days}d " + (( $hours > 0 )) && echo -n "${hours}h " + (( $minutes > 0 )) && echo -n "${minutes}m " + echo "${seconds}s" +} + +# fastest possible way to check if repo is dirty +prompt_pure_git_dirty() { + # check if we're in a git repo + [[ "$(command git rev-parse --is-inside-work-tree 2>/dev/null)" == "true" ]] || return + # check if it's dirty + [[ "$PURE_GIT_UNTRACKED_DIRTY" == 0 ]] && local umode="-uno" || local umode="-unormal" + command test -n "$(git status --porcelain --ignore-submodules ${umode})" + + (($? == 0)) && echo '*' +} + +# displays the exec time of the last command if set threshold was exceeded +prompt_pure_cmd_exec_time() { + local stop=$EPOCHSECONDS + local start=${cmd_timestamp:-$stop} + integer elapsed=$stop-$start + (($elapsed > ${PURE_CMD_MAX_EXEC_TIME:=5})) && prompt_pure_human_time $elapsed +} + +prompt_pure_preexec() { + cmd_timestamp=$EPOCHSECONDS + + # shows the current dir and executed command in the title when a process is active + print -Pn "\e]0;" + echo -nE "$PWD:t: $2" + print -Pn "\a" +} + +# string length ignoring ansi escapes +prompt_pure_string_length() { + # Subtract one since newline is counted as two characters + echo $(( ${#${(S%%)1//(\%([KF1]|)\{*\}|\%[Bbkf])}} - 1 )) +} + +prompt_pure_precmd() { + # shows the full path in the title + print -Pn '\e]0;%~\a' + + # git info + vcs_info + + local prompt_pure_preprompt="%F{blue}%~%F{242}$vcs_info_msg_0_`prompt_pure_git_dirty`$prompt_pure_username%f%F{yellow}`prompt_pure_cmd_exec_time`%f" + # print -P $prompt_pure_preprompt + RPROMPT=$prompt_pure_preprompt + + # check async if there is anything to pull + (( ${PURE_GIT_PULL:-1} )) && { + # check if we're in a git repo + [[ "$(command git rev-parse --is-inside-work-tree 2>/dev/null)" == "true" ]] && + # make sure working tree is not $HOME + [[ "$(command git rev-parse --show-toplevel)" != "$HOME" ]] && + # check check if there is anything to pull + command git -c gc.auto=0 fetch &>/dev/null && + # check if there is an upstream configured for this branch + command git rev-parse --abbrev-ref @'{u}' &>/dev/null && { + local arrows='' + (( $(command git rev-list --right-only --count HEAD...@'{u}' 2>/dev/null) > 0 )) && arrows='⇣' + (( $(command git rev-list --left-only --count HEAD...@'{u}' 2>/dev/null) > 0 )) && arrows+='⇡' + print -Pn "\e7\e[A\e[1G\e[`prompt_pure_string_length $prompt_pure_preprompt`C%F{cyan}${arrows}%f\e8" + } + } &! + + # reset value since `preexec` isn't always triggered + unset cmd_timestamp +} + + +prompt_pure_setup() { + # prevent percentage showing up + # if output doesn't end with a newline + export PROMPT_EOL_MARK='' + + # disable auth prompting on git 2.3+ + export GIT_TERMINAL_PROMPT=0 + + prompt_opts=(cr subst percent) + + zmodload zsh/datetime + autoload -Uz add-zsh-hook + autoload -Uz vcs_info + + add-zsh-hook precmd prompt_pure_precmd + add-zsh-hook preexec prompt_pure_preexec + + zstyle ':vcs_info:*' enable git + zstyle ':vcs_info:*' use-simple true + zstyle ':vcs_info:git*' formats ' %b' + zstyle ':vcs_info:git*' actionformats ' %b|%a' + + # show username@host if logged in through SSH + [[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username=' %n@%m' + + # show username@host if root, with username in white + [[ $UID -eq 0 ]] && prompt_pure_username=' %F{white}%n%F{242}@%m' + + zstyle ':prezto:module:editor:info:keymap:primary' format "❯%f" + zstyle ':prezto:module:editor:info:keymap:alternate' format "#%f" + + # prompt turns red if the previous command didn't exit with 0 + PROMPT=' +%(?.%F{green}.%F{red}❯%F{green})${editor_info[keymap]} ' +} + +prompt_pure_setup "$@"