diff options
| author | Xavier Lacoste <xavier.lacoste@inria.fr> | 2012-09-13 08:43:20 +0200 |
|---|---|---|
| committer | Xavier Lacoste <xavier.lacoste@inria.fr> | 2012-09-13 08:43:20 +0200 |
| commit | ce74be1e1dfbccd45ced3314fd4a4c8869a49ec4 (patch) | |
| tree | d3d4a1e133cbe06e794e52cadf846fd09d06b46f /themes | |
| parent | 28d3b80db1d5d976a809bc01da191be5b1768fcb (diff) | |
| parent | 921d2f49ef01acce973980c0aa9c6ffbbd2fbd0b (diff) | |
| download | zsh-ce74be1e1dfbccd45ced3314fd4a4c8869a49ec4.tar.gz zsh-ce74be1e1dfbccd45ced3314fd4a4c8869a49ec4.tar.bz2 zsh-ce74be1e1dfbccd45ced3314fd4a4c8869a49ec4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/3den.zsh-theme | 7 | ||||
| -rw-r--r-- | themes/jnrowe.zsh-theme | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/themes/3den.zsh-theme b/themes/3den.zsh-theme new file mode 100644 index 000000000..1d2c7db7f --- /dev/null +++ b/themes/3den.zsh-theme @@ -0,0 +1,7 @@ +PROMPT=$'%{$fg[white]%}$(~/.rvm/bin/rvm-prompt) %{$fg_bold[cyan]%}%~%{$reset_color%}$(git_prompt_info) %{$fg[cyan]%}%D{[%I:%M:%S]}\ +%{$fg_bold[green]%}%n$%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="*" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme index 7c8a7082e..bae88f7ab 100644 --- a/themes/jnrowe.zsh-theme +++ b/themes/jnrowe.zsh-theme @@ -2,15 +2,14 @@ autoload -U add-zsh-hook autoload -Uz vcs_info zstyle ':vcs_info:*' actionformats \ - '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' -zstyle ':vcs_info:*' formats \ - '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f ' + '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' +zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f ' zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' zstyle ':vcs_info:*' enable git -add-zsh-hook precmd prompt_jnrowe_precmd +add-zsh-hook precmd prompt_vcs -prompt_jnrowe_precmd () { +prompt_vcs () { vcs_info if [ "${vcs_info_msg_0_}" = "" ]; then @@ -24,8 +23,16 @@ prompt_jnrowe_precmd () { fi } +function { + if [[ -n "$SSH_CLIENT" ]]; then + PROMPT_HOST=" ($HOST)" + else + PROMPT_HOST='' + fi +} + local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)" -PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} ' +PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} ' # vim: set ft=zsh ts=4 sw=4 et: |