From 440e1c7b0c9f48558be2a1efa6d75f325ad18a62 Mon Sep 17 00:00:00 2001 From: Prashan Dharmasena Date: Sun, 11 Aug 2013 17:09:48 -0400 Subject: [PATCH 1/2] Added theme: supson --- themes/supson.zsh-theme | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 themes/supson.zsh-theme diff --git a/themes/supson.zsh-theme b/themes/supson.zsh-theme new file mode 100644 index 000000000..ecc4229ea --- /dev/null +++ b/themes/supson.zsh-theme @@ -0,0 +1,27 @@ +function venv { + [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`')' +} + +function git_status { + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) + if [[ -n $ref ]]; then + echo "$(parse_git_dirty)" + else + echo "%{$fg_bold[cyan]%}¯\_(ツ)_/¯" + fi +} + +function git_branch { + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +PROMPT=' $(git_status) %{$fg_bold[green]%}%3~ » ' +RPROMPT='%{$fg_bold[magenta]%}$(venv)$(git_branch)%{$fg_bold[green]%}%D{%l:%M:%S}%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}(╯°□°)╯︵ ┻━┻" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}┬─┬ノ( ゜-゜ノ)" From 10f2f2fbe2b1370c39d17e9da91352d0133c4afe Mon Sep 17 00:00:00 2001 From: Prashan Dharmasena Date: Mon, 12 Aug 2013 00:25:51 -0400 Subject: [PATCH 2/2] simplified branch checking --- themes/supson.zsh-theme | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/themes/supson.zsh-theme b/themes/supson.zsh-theme index ecc4229ea..a4dd661c2 100644 --- a/themes/supson.zsh-theme +++ b/themes/supson.zsh-theme @@ -1,5 +1,5 @@ function venv { - [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`')' + [ $VIRTUAL_ENV ] && echo '['`basename $VIRTUAL_ENV`']' } function git_status { @@ -13,15 +13,13 @@ function git_status { } function git_branch { - ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ - ref=$(command git rev-parse --short HEAD 2> /dev/null) || return - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(command git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' )$ZSH_THEME_GIT_PROMPT_SUFFIX" } PROMPT=' $(git_status) %{$fg_bold[green]%}%3~ » ' RPROMPT='%{$fg_bold[magenta]%}$(venv)$(git_branch)%{$fg_bold[green]%}%D{%l:%M:%S}%{$reset_color%}' -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}(╯°□°)╯︵ ┻━┻" ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}┬─┬ノ( ゜-゜ノ)"