linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge ea1490c11f into 362927003b

Browse source
This commit is contained in:
GitHub Merge Button 2012-02-11 16:24:32 -08:00
commit 0840c5b7ee
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/git.zsh
View file

@ -49,7 +49,7 @@ git_prompt_status() {
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
fi
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
if $(echo "$INDEX" | grep '^RM ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
fi
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
@ -61,4 +61,4 @@ git_prompt_status() {
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
fi
echo $STATUS
}
}

34
themes/tolkien.zsh-theme Normal file
View file

@ -0,0 +1,34 @@
ZSH_THEME_GIT_PROMPT_PREFIX="on %F{008}git%f:%{$fg[magenta]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{011}?%f"
ZSH_THEME_GIT_PROMPT_ADDED="%F{012}+%f"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[green]%}±%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_RENAMED="%F{081}➤%f"
ZSH_THEME_GIT_PROMPT_DELETED="%F{001}-%f"
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{001}✖%f"
function git_branch {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
}
function git_ahead {
GITSTATUS=$(git status 2> /dev/null)
AHEAD=$(echo "$GITSTATUS" | grep '^# Your branch is ahead of' 2> /dev/null)
if [[ -n $AHEAD ]]; then
AHEAD=${AHEAD##\# Your branch is ahead of * by }
AHEAD=${AHEAD%% commits.}
AHEAD=${AHEAD%% commit.}
echo "^%{$fg[magenta]%}"$AHEAD"%{$reset_color%}"
fi
}
function virtualenv_info {
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`')'
}
PROMPT='
╭─ %{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%M%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%} $(git_branch)$(git_ahead) $(git_prompt_status)
╰─$(virtualenv_info) '