|
|
@ -19,6 +19,20 @@ colors
|
|
|
|
autoload -U add-zsh-hook
|
|
|
|
autoload -U add-zsh-hook
|
|
|
|
autoload -Uz vcs_info
|
|
|
|
autoload -Uz vcs_info
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#use extended color pallete if available
|
|
|
|
|
|
|
|
if [ $TERM = "xterm-256color" ]; 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
|
|
|
|
# enable VCS systems you use
|
|
|
|
zstyle ':vcs_info:*' enable git svn
|
|
|
|
zstyle ':vcs_info:*' enable git svn
|
|
|
@ -35,10 +49,10 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
|
|
|
|
# %R - repository path
|
|
|
|
# %R - repository path
|
|
|
|
# %S - path in the repository
|
|
|
|
# %S - path in the repository
|
|
|
|
PR_RST="%{${reset_color}%}"
|
|
|
|
PR_RST="%{${reset_color}%}"
|
|
|
|
FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
|
|
|
|
FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
|
|
|
|
FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
|
|
|
|
FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
|
|
|
|
FMT_UNSTAGED="%{$fg[yellow]%}●"
|
|
|
|
FMT_UNSTAGED="%{$orange%}●"
|
|
|
|
FMT_STAGED="%{$fg[green]%}●"
|
|
|
|
FMT_STAGED="%{$limegreen%}●"
|
|
|
|
|
|
|
|
|
|
|
|
zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}"
|
|
|
@ -68,9 +82,9 @@ function steeef_precmd {
|
|
|
|
# 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 [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
|
|
|
if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
|
|
|
PR_GIT_UPDATE=1
|
|
|
|
PR_GIT_UPDATE=1
|
|
|
|
FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
|
|
|
|
FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
|
|
|
|
FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}"
|
|
|
|
zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}"
|
|
|
|
|
|
|
|
|
|
|
@ -82,5 +96,5 @@ function steeef_precmd {
|
|
|
|
add-zsh-hook precmd steeef_precmd
|
|
|
|
add-zsh-hook precmd steeef_precmd
|
|
|
|
|
|
|
|
|
|
|
|
PROMPT=$'
|
|
|
|
PROMPT=$'
|
|
|
|
%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}%~%{$reset_color%} $vcs_info_msg_0_
|
|
|
|
%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_
|
|
|
|
$(virtualenv_info)$ '
|
|
|
|
$(virtualenv_info)$ '
|
|
|
|