From 6a2e04fefbd794f050d45e7a717d009e39204431 Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Mon, 16 Jul 2012 02:59:30 +0300
Subject: [PATCH 1/3] =?UTF-8?q?modify=20themes/jnrowe.zsh-theme,=20add=20h?=
=?UTF-8?q?ost=20directive=20"=CE=9E=20(mbsd)=20~=20=E2=86=92"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
themes/jnrowe.zsh-theme | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 7c8a7082e..0ade9cc60 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,3 +1,4 @@
+autoload -U colors && colors
autoload -U add-zsh-hook
autoload -Uz vcs_info
@@ -8,9 +9,10 @@ zstyle ':vcs_info:*' formats \
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
+add-zsh-hook precmd prompt_host
-prompt_jnrowe_precmd () {
+prompt_vcs () {
vcs_info
if [ "${vcs_info_msg_0_}" = "" ]; then
@@ -24,8 +26,17 @@ prompt_jnrowe_precmd () {
fi
}
+prompt_host () {
+ if [[ -n "$SSH_CLIENT" ]]; then
+ host=" ($HOST)"
+ else
+ 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]%}${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:
From d5bfbf05d16634fa3c2834c7097edb1cf2487d96 Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Tue, 24 Jul 2012 05:36:18 +0300
Subject: [PATCH 2/3] improvement: define PROMPT_HOST once on startup
---
themes/jnrowe.zsh-theme | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 0ade9cc60..a1478be31 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,16 +1,14 @@
-autoload -U colors && colors
autoload -U add-zsh-hook
autoload -Uz vcs_info
+zstyle ':vcs_info:*' disable-patterns "/usr/(ports|src)(|/*)"
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_vcs
-add-zsh-hook precmd prompt_host
prompt_vcs () {
vcs_info
@@ -26,17 +24,16 @@ prompt_vcs () {
fi
}
-prompt_host () {
+function {
if [[ -n "$SSH_CLIENT" ]]; then
- host=" ($HOST)"
+ PROMPT_HOST=" ($HOST)"
else
- host=''
+ PROMPT_HOST=''
fi
}
-
local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
-PROMPT='${ret_status}%{$fg[blue]%}${host}%{$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:
From decb9c82b5392d66e157ceef9c3b41466bdcbafd Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Tue, 24 Jul 2012 14:16:03 +0300
Subject: [PATCH 3/3] delete os specific disable-patterns
---
themes/jnrowe.zsh-theme | 1 -
1 file changed, 1 deletion(-)
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index a1478be31..bae88f7ab 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,7 +1,6 @@
autoload -U add-zsh-hook
autoload -Uz vcs_info
-zstyle ':vcs_info:*' disable-patterns "/usr/(ports|src)(|/*)"
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 '