[prompt] add setup function to themes

proper setup and preview of themes with 'prompt' function

closes #12, closes #15
This commit is contained in:
caedus75 2016-01-06 17:06:06 -02:00 committed by Matt Hamilton
parent 5f68411637
commit b46edd43a8
5 changed files with 149 additions and 115 deletions

View File

@ -0,0 +1 @@
../external-themes/liquidprompt/liquidprompt

View File

@ -1 +0,0 @@
../external-themes/liquidprompt/liquidprompt

View File

@ -0,0 +1,15 @@
function prompt_liquidprompt_setup() {
autoload -Uz ex-liquidprompt
ext-liquidprompt
prompt_opts=(cr subst percent)
}
function prompt_liquidprompt_preview() {
_lp_set_prompt
prompt_preview_theme liquidprompt
}
prompt_liquidprompt_setup "$@"
# vim:filetype=zsh

View File

@ -3,12 +3,11 @@
# https://github.com/shashankmehta/dotfiles/blob/master/thesetup/zsh/.oh-my-zsh/custom/themes/gitster.zsh-theme # https://github.com/shashankmehta/dotfiles/blob/master/thesetup/zsh/.oh-my-zsh/custom/themes/gitster.zsh-theme
# #
autoload -Uz colors && colors function gst_get_status(){
prompt_opts=( cr subst percent ) print "%(?:%F{10}➜ :%F{9}➜ %s)"
}
local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" function gst_get_pwd(){
function get_pwd(){
git_root=$PWD git_root=$PWD
while [[ $git_root != / && ! -e $git_root/.git ]]; do while [[ $git_root != / && ! -e $git_root/.git ]]; do
git_root=$git_root:h git_root=$git_root:h
@ -23,9 +22,20 @@ function get_pwd(){
print $prompt_short_dir print $prompt_short_dir
} }
PROMPT='$ret_status %{$fg[white]%}$(get_pwd) $(git_prompt_info)%{$reset_color%}%{$reset_color%} ' function prompt_gitster_precmd(){
PROMPT='$(gst_get_status) %F{white}$(gst_get_pwd) $(git_prompt_info)%f '
}
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}" function prompt_gitster_setup(){
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_PREFIX="%F{cyan}"
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[yellow]%}✗%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✓%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY=" %F{yellow}✗%f"
ZSH_THEME_GIT_PROMPT_CLEAN=" %F{green}✓%f"
autoload -Uz add-zsh-hook
add-zsh-hook precmd prompt_gitster_precmd
prompt_opts=(cr subst percent)
}
prompt_gitster_setup "$@"

View File

@ -3,26 +3,33 @@
# https://github.com/S1cK94/minimal # https://github.com/S1cK94/minimal
# #
autoload -Uz colors && colors function minimal_user() {
echo "%(!.$on_color.$off_color)$prompt_char%f"
prompt_opts=( cr subst percent )
PROMPT_CHAR=""
ON_COLOR="%{$fg[green]%}"
OFF_COLOR="%{$reset_color%}"
ERR_COLOR="%{$fg[red]%}"
function prompt_user() {
echo "%(!.$ON_COLOR.$OFF_COLOR)$PROMPT_CHAR%{$reset_color%}"
} }
function prompt_jobs() { function minimal_jobs() {
echo "%(1j.$ON_COLOR.$OFF_COLOR)$PROMPT_CHAR%{$reset_color%}" echo "%(1j.$on_color.$off_color)$prompt_char%f"
} }
function prompt_status() { function minimal_vimode(){
echo "%(0?.$ON_COLOR.$ERR_COLOR)$PROMPT_CHAR%{$reset_color%}" local ret=""
case $KEYMAP in
main|viins)
ret+="$on_color"
;;
vicmd)
ret+="$off_color"
;;
esac
ret+="$prompt_char%f"
echo "$ret"
}
function minimal_status() {
echo "%(0?.$on_color.$err_color)$prompt_char%f"
} }
function -prompt_ellipse(){ function -prompt_ellipse(){
@ -35,12 +42,12 @@ function -prompt_ellipse(){
fi fi
} }
function prompt_path() { function minimal_path() {
local path_color="%{%}%}" local path_color="%F{244}"
local rsc="%{$reset_color%}" local rsc="%f"
local sep="$rsc/$path_color" local sep="$rsc/$path_color"
echo "$path_color$(print -P %2~ | sed s_/_${sep}_g)$rsc" echo "$path_color$(sed s_/_${sep}_g <<< $(short_pwd))$rsc"
} }
function git_branch_name() { function git_branch_name() {
@ -52,52 +59,50 @@ function git_repo_status(){
local rs="$(git status --porcelain -b)" local rs="$(git status --porcelain -b)"
if $(echo "$rs" | grep -v '^##' &> /dev/null); then # is dirty if $(echo "$rs" | grep -v '^##' &> /dev/null); then # is dirty
echo "%{$fg[red]%}" echo "%F{red}"
elif $(echo "$rs" | grep '^## .*diverged' &> /dev/null); then # has diverged elif $(echo "$rs" | grep '^## .*diverged' &> /dev/null); then # has diverged
echo "%{$fg[red]%}" echo "%F{red}"
elif $(echo "$rs" | grep '^## .*behind' &> /dev/null); then # is behind elif $(echo "$rs" | grep '^## .*behind' &> /dev/null); then # is behind
echo "%{%}%}" echo "%F{11}"
elif $(echo "$rs" | grep '^## .*ahead' &> /dev/null); then # is ahead elif $(echo "$rs" | grep '^## .*ahead' &> /dev/null); then # is ahead
echo "%{$reset_color%}" echo "%f"
else # is clean else # is clean
echo "%{$fg[green]%}" echo "%F{green}"
fi fi
} }
function prompt_git() { function minimal_git() {
local bname=$(git_branch_name) local bname=$(git_branch_name)
if [[ -n $bname ]]; then if [[ -n $bname ]]; then
local infos="$(git_repo_status)$bname%{$reset_color%}" local infos="$(git_repo_status)$bname%f"
echo " $infos" echo " $infos"
fi fi
} }
function prompt_vimode(){
local ret=""
case $KEYMAP in
main|viins)
ret+="$ON_COLOR"
;;
vicmd)
ret+="$OFF_COLOR"
;;
esac
ret+="$PROMPT_CHAR%{$reset_color%}"
echo "$ret"
}
function zle-line-init zle-line-finish zle-keymap-select { function zle-line-init zle-line-finish zle-keymap-select {
zle reset-prompt zle reset-prompt
zle -R zle -R
} }
zle -N zle-line-init function prompt_minimal_precmd() {
zle -N zle-keymap-select zle -N zle-line-init
zle -N zle-line-finish zle -N zle-keymap-select
zle -N zle-line-finish
PROMPT='$(prompt_user)$(prompt_jobs)$(prompt_vimode)$(prompt_status) ' PROMPT='$(minimal_user)$(minimal_jobs)$(minimal_vimode)$(minimal_status) '
RPROMPT='$(prompt_path)$(prompt_git)' RPROMPT='$(minimal_path)$(minimal_git)'
}
function prompt_minimal_setup() {
prompt_char=""
on_color="%F{green}"
off_color="%f"
err_color="%F{red}"
autoload -Uz add-zsh-hook
add-zsh-hook precmd prompt_minimal_precmd
prompt_opts=(cr subst percent)
}
prompt_minimal_setup "$@"

View File

@ -12,55 +12,6 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1
function virtualenv_info { function virtualenv_info {
[ $VIRTUAL_ENV ] && print '('${fg[blue]}`basename $VIRTUAL_ENV`%{${reset_color}%}') ' [ $VIRTUAL_ENV ] && print '('${fg[blue]}`basename $VIRTUAL_ENV`%{${reset_color}%}') '
} }
PR_GIT_UPDATE=1
prompt_opts=( cr subst percent )
autoload -Uz add-zsh-hook
autoload -Uz vcs_info
autoload -Uz colors && colors
#use extended color pallete if available
if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
turquoise="%F{81}"
orange="%F{166}"
purple="%F{135}"
hotpink="%F{161}"
limegreen="%F{118}"
else
turquoise="$fg[cyan]"
orange="$fg[yellow]"
purple="$fg[magenta]"
hotpink="$fg[red]"
limegreen="$fg[green]"
fi
# enable VCS systems you use
zstyle ':vcs_info:*' enable git svn
# check-for-changes can be really slow.
# you should disable it, if you work with large repositories
zstyle ':vcs_info:*:prompt:*' check-for-changes true
# set formats
# %b - branchname
# %u - unstagedstr (see below)
# %c - stagedstr (see below)
# %a - action (e.g. rebase-i)
# %R - repository path
# %S - path in the repository
PR_RST="%{${reset_color}%}"
FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
FMT_UNSTAGED="%{$orange%}●"
FMT_STAGED="%{$limegreen%}●"
zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}"
zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}"
zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}"
zstyle ':vcs_info:*:prompt:*' nvcsformats ""
function steeef_preexec { function steeef_preexec {
case "$(history $HISTCMD)" in case "$(history $HISTCMD)" in
@ -72,14 +23,12 @@ function steeef_preexec {
;; ;;
esac esac
} }
add-zsh-hook preexec steeef_preexec
function steeef_chpwd { function steeef_chpwd {
PR_GIT_UPDATE=1 PR_GIT_UPDATE=1
} }
add-zsh-hook chpwd steeef_chpwd
function steeef_precmd { function prompt_steeef_precmd {
if [[ -n "$PR_GIT_UPDATE" ]] ; then if [[ -n "$PR_GIT_UPDATE" ]] ; then
# check for untracked files or updated submodules, since vcs_info doesn't # check for untracked files or updated submodules, since vcs_info doesn't
if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
@ -93,9 +42,64 @@ function steeef_precmd {
vcs_info 'prompt' vcs_info 'prompt'
PR_GIT_UPDATE= PR_GIT_UPDATE=
fi fi
}
add-zsh-hook precmd steeef_precmd
PROMPT=' PROMPT='
%{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%} %{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%}
$ ' $ '
}
function prompt_steeef_setup {
#use extended color pallete if available
if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
turquoise="%F{81}"
orange="%F{166}"
purple="%F{135}"
hotpink="%F{161}"
limegreen="%F{118}"
else
turquoise="%F{cyan}"
orange="%F{yellow}"
purple="%F{magenta}"
hotpink="%F{red}"
limegreen="%F{green}"
fi
# enable VCS systems you use
zstyle ':vcs_info:*' enable git svn
# check-for-changes can be really slow.
# you should disable it, if you work with large repositories
zstyle ':vcs_info:*:prompt:*' check-for-changes true
# set formats
# %b - branchname
# %u - unstagedstr (see below)
# %c - stagedstr (see below)
# %a - action (e.g. rebase-i)
# %R - repository path
# %S - path in the repository
PR_RST="%f"
FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
FMT_UNSTAGED="%{$orange%}●"
FMT_STAGED="%{$limegreen%}●"
zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}"
zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}"
zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}"
zstyle ':vcs_info:*:prompt:*' nvcsformats ""
PR_GIT_UPDATE=1
autoload -Uz add-zsh-hook
autoload -Uz vcs_info
autoload -Uz colors && colors
add-zsh-hook preexec steeef_preexec
add-zsh-hook chpwd steeef_chpwd
add-zsh-hook precmd prompt_steeef_precmd
prompt_opts=(cr subst percent)
}
prompt_steeef_setup "$@"