mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-13 17:30:08 +00:00
style(jonathan): fix code style in jonathan theme
This commit is contained in:
Marc Cornellà
parent
1b01496c21
commit
065e8ebdd0
2 changed files with 178 additions and 211 deletions
|
|
@ -1,76 +1,62 @@
|
||||||
functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){}
|
|
||||||
|
|
||||||
function theme_precmd {
|
function theme_precmd {
|
||||||
local TERMWIDTH
|
local -i TERMWIDTH=$COLUMNS
|
||||||
(( TERMWIDTH = ${COLUMNS} - 1 ))
|
|
||||||
|
|
||||||
|
|
||||||
###
|
|
||||||
# Truncate the path if it's too long.
|
|
||||||
|
|
||||||
PR_FILLBAR=""
|
PR_FILLBAR=""
|
||||||
PR_PWDLEN=""
|
PR_PWDLEN=""
|
||||||
|
|
||||||
local promptsize=${#${(%):---(%n@%m:%l)---()--}}
|
local promptsize=${#${(%):---(%n@%m:%l)---()--}}
|
||||||
local rubyprompt=`rvm_prompt_info || rbenv_prompt_info`
|
local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
|
||||||
local rubypromptsize=${#${rubyprompt}}
|
|
||||||
local pwdsize=${#${(%):-%~}}
|
local pwdsize=${#${(%):-%~}}
|
||||||
|
|
||||||
if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
|
# Truncate the path if it's too long.
|
||||||
((PR_PWDLEN=$TERMWIDTH - $promptsize))
|
if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
|
||||||
|
(( PR_PWDLEN = TERMWIDTH - promptsize ))
|
||||||
else
|
else
|
||||||
PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
|
PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function theme_preexec {
|
||||||
setopt extended_glob
|
setopt local_options extended_glob
|
||||||
theme_preexec () {
|
if [[ "$TERM" = "screen" ]]; then
|
||||||
if [[ "$TERM" == "screen" ]]; then
|
|
||||||
local CMD=${1[(wr)^(*=*|sudo|-*)]}
|
local CMD=${1[(wr)^(*=*|sudo|-*)]}
|
||||||
echo -n "\ek$CMD\e\\"
|
echo -n "\ek$CMD\e\\"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
autoload -U add-zsh-hook
|
||||||
setprompt () {
|
add-zsh-hook precmd theme_precmd
|
||||||
###
|
add-zsh-hook preexec theme_preexec
|
||||||
# Need this so the prompt will work.
|
|
||||||
|
|
||||||
setopt prompt_subst
|
|
||||||
|
|
||||||
|
|
||||||
###
|
# Set the prompt
|
||||||
# See if we can use colors.
|
|
||||||
|
|
||||||
autoload zsh/terminfo
|
# Need this so the prompt will work.
|
||||||
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
|
setopt prompt_subst
|
||||||
eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
|
|
||||||
eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
|
|
||||||
(( count = $count + 1 ))
|
|
||||||
done
|
|
||||||
PR_NO_COLOUR="%{$terminfo[sgr0]%}"
|
|
||||||
|
|
||||||
###
|
# See if we can use colors.
|
||||||
# Modify Git prompt
|
autoload zsh/terminfo
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
|
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
done
|
||||||
|
PR_NO_COLOUR="%{$terminfo[sgr0]%}"
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
|
# Modify Git prompt
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
|
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
|
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
|
|
||||||
|
|
||||||
###
|
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
|
||||||
# See if we can use extended characters to look nicer.
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
|
||||||
# UTF-8 Fixed
|
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
|
||||||
|
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
|
||||||
|
|
||||||
if [[ $(locale charmap) == "UTF-8" ]]; then
|
# Use extended characters to look nicer if supported.
|
||||||
|
if [[ "${langinfo[CODESET]}" = "UTF-8" ]]; then
|
||||||
PR_SET_CHARSET=""
|
PR_SET_CHARSET=""
|
||||||
PR_SHIFT_IN=""
|
PR_SHIFT_IN=""
|
||||||
PR_SHIFT_OUT=""
|
PR_SHIFT_OUT=""
|
||||||
|
|
@ -79,7 +65,7 @@ setprompt () {
|
||||||
PR_LLCORNER="└"
|
PR_LLCORNER="└"
|
||||||
PR_LRCORNER="┘"
|
PR_LRCORNER="┘"
|
||||||
PR_URCORNER="┐"
|
PR_URCORNER="┐"
|
||||||
else
|
else
|
||||||
typeset -A altchar
|
typeset -A altchar
|
||||||
set -A altchar ${(s..)terminfo[acsc]}
|
set -A altchar ${(s..)terminfo[acsc]}
|
||||||
# Some stuff to help us draw nice lines
|
# Some stuff to help us draw nice lines
|
||||||
|
|
@ -93,11 +79,8 @@ setprompt () {
|
||||||
PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
|
PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Decide if we need to set titlebar text.
|
||||||
###
|
case $TERM in
|
||||||
# Decide if we need to set titlebar text.
|
|
||||||
|
|
||||||
case $TERM in
|
|
||||||
xterm*)
|
xterm*)
|
||||||
PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
|
PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
|
||||||
;;
|
;;
|
||||||
|
|
@ -105,49 +88,37 @@ setprompt () {
|
||||||
PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
|
PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PR_TITLEBAR=''
|
PR_TITLEBAR=""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Decide whether to set a screen title
|
||||||
###
|
if [[ "$TERM" = "screen" ]]; then
|
||||||
# Decide whether to set a screen title
|
|
||||||
if [[ "$TERM" == "screen" ]]; then
|
|
||||||
PR_STITLE=$'%{\ekzsh\e\\%}'
|
PR_STITLE=$'%{\ekzsh\e\\%}'
|
||||||
else
|
else
|
||||||
PR_STITLE=''
|
PR_STITLE=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Finally, the prompt.
|
||||||
|
PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
|
||||||
|
${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
|
||||||
|
${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
|
||||||
|
${PR_GREY})$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
|
||||||
|
${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
|
||||||
|
${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
|
||||||
|
|
||||||
###
|
${PR_CYAN}${PR_LLCORNER}${PR_BLUE}${PR_HBAR}(\
|
||||||
# Finally, the prompt.
|
${PR_YELLOW}%D{%H:%M:%S}\
|
||||||
|
${PR_LIGHT_BLUE}%{$reset_color%}$(git_prompt_info)$(git_prompt_status)${PR_BLUE})${PR_CYAN}${PR_HBAR}\
|
||||||
|
${PR_HBAR}\
|
||||||
|
>${PR_NO_COLOUR} '
|
||||||
|
|
||||||
PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
|
# display exitcode on the right when > 0
|
||||||
$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
|
return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
|
||||||
$PR_GREEN%$PR_PWDLEN<...<%~%<<\
|
RPROMPT=' $return_code${PR_CYAN}${PR_HBAR}${PR_BLUE}${PR_HBAR}\
|
||||||
$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
|
(${PR_YELLOW}%D{%a,%b%d}${PR_BLUE})${PR_HBAR}${PR_CYAN}${PR_LRCORNER}${PR_NO_COLOUR}'
|
||||||
$PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
|
|
||||||
$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
|
|
||||||
|
|
||||||
$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
|
PS2='${PR_CYAN}${PR_HBAR}\
|
||||||
$PR_YELLOW%D{%H:%M:%S}\
|
${PR_BLUE}${PR_HBAR}(\
|
||||||
$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
|
${PR_LIGHT_GREEN}%_${PR_BLUE})${PR_HBAR}\
|
||||||
$PR_HBAR\
|
${PR_CYAN}${PR_HBAR}${PR_NO_COLOUR} '
|
||||||
>$PR_NO_COLOUR '
|
|
||||||
|
|
||||||
# display exitcode on the right when >0
|
|
||||||
return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
|
|
||||||
RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
|
|
||||||
($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
|
|
||||||
|
|
||||||
PS2='$PR_CYAN$PR_HBAR\
|
|
||||||
$PR_BLUE$PR_HBAR(\
|
|
||||||
$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
|
|
||||||
$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
|
|
||||||
}
|
|
||||||
|
|
||||||
setprompt
|
|
||||||
|
|
||||||
autoload -U add-zsh-hook
|
|
||||||
add-zsh-hook precmd theme_precmd
|
|
||||||
add-zsh-hook preexec theme_preexec
|
|
||||||
|
|
|
||||||
|
|
@ -74,10 +74,6 @@ setprompt () {
|
||||||
|
|
||||||
###
|
###
|
||||||
# See if we can use extended characters to look nicer.
|
# See if we can use extended characters to look nicer.
|
||||||
|
|
||||||
typeset -A altchar
|
|
||||||
# set -A altchar "${(s..)terminfo[acsc]}"
|
|
||||||
PR_SET_CHARSET="%{$terminfo[enacs]%}"
|
|
||||||
PR_HBAR=${altchar[q]:--}
|
PR_HBAR=${altchar[q]:--}
|
||||||
PR_ULCORNER=${altchar[l]:--}
|
PR_ULCORNER=${altchar[l]:--}
|
||||||
PR_LLCORNER=${altchar[m]:--}
|
PR_LLCORNER=${altchar[m]:--}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue