From 9947abbf72c12bb943ffda73c23603ed6d586d89 Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Thu, 11 Oct 2012 11:39:45 +0800 Subject: [PATCH 1/4] no new line; git changed to right; --- make_a_link.sh | 1 + powerline.zsh-theme | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100755 make_a_link.sh diff --git a/make_a_link.sh b/make_a_link.sh new file mode 100755 index 0000000..ae89e19 --- /dev/null +++ b/make_a_link.sh @@ -0,0 +1 @@ +ln -f powerline.zsh-theme ~/.oh-my-zsh/themes/powerline.zsh-theme \ No newline at end of file diff --git a/powerline.zsh-theme b/powerline.zsh-theme index 6ebdd1a..d9e0adb 100644 --- a/powerline.zsh-theme +++ b/powerline.zsh-theme @@ -32,7 +32,7 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f" ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f" ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f" -PROMPT=" -%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %1~"$'$(git_prompt_info)'" %k%f%F{blue}"$'\u2b80'"%f " +PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %~ %k%f%F{blue}"$'\u2b80'"%f " +#"%k%f%F{black}%K{yellow}"$'$(git_prompt_info)'" %k%f%F{yellow}"$'\u2b80'"%f " -RPROMPT=$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k" +RPROMPT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k" From 72e7cb78d9d8d7b029a87d33933cefb7e587dcfb Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Thu, 11 Oct 2012 13:10:59 +0800 Subject: [PATCH 2/4] added POWERLINE_NO_BLANK_LINE variable --- powerline.zsh-theme | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/powerline.zsh-theme b/powerline.zsh-theme index d9e0adb..b188a65 100644 --- a/powerline.zsh-theme +++ b/powerline.zsh-theme @@ -35,4 +35,9 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f" PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %~ %k%f%F{blue}"$'\u2b80'"%f " #"%k%f%F{black}%K{yellow}"$'$(git_prompt_info)'" %k%f%F{yellow}"$'\u2b80'"%f " +if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then + PROMPT=" +"$PROMPT +fi + RPROMPT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k" From 408d80d91a4ec513d972f6f0ec28a3f595fd64d7 Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Thu, 11 Oct 2012 13:20:47 +0800 Subject: [PATCH 3/4] added POWERLINE_CURRENT_PATH variable. --- powerline.zsh-theme | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/powerline.zsh-theme b/powerline.zsh-theme index b188a65..da6400f 100644 --- a/powerline.zsh-theme +++ b/powerline.zsh-theme @@ -8,6 +8,10 @@ if [ "$POWERLINE_RIGHT_A" = "" ]; then POWERLINE_RIGHT_A=%D{%Y-%m-%d} fi +if [ "$POWERLINE_CURRENT_PATH" = "" ]; then + POWERLINE_CURRENT_PATH="%1~" +fi + POWERLINE_COLOR_BG_GRAY=%K{240} POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240} POWERLINE_COLOR_BG_WHITE=%K{255} @@ -32,7 +36,7 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f" ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f" ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f" -PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %~ %k%f%F{blue}"$'\u2b80'"%f " +PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH" %k%f%F{blue}"$'\u2b80'"%f " #"%k%f%F{black}%K{yellow}"$'$(git_prompt_info)'" %k%f%F{yellow}"$'\u2b80'"%f " if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then From 53c53bea64bf42ec1c5d4e750318f0f6b2778f48 Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Thu, 11 Oct 2012 13:29:44 +0800 Subject: [PATCH 4/4] added POWERLINE_SHOW_GIT_ON_RIGHT variable. --- powerline.zsh-theme | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/powerline.zsh-theme b/powerline.zsh-theme index da6400f..a65797f 100644 --- a/powerline.zsh-theme +++ b/powerline.zsh-theme @@ -12,6 +12,13 @@ if [ "$POWERLINE_CURRENT_PATH" = "" ]; then POWERLINE_CURRENT_PATH="%1~" fi +POWERLINE_GIT_INFO_LEFT="" +POWERLINE_GIT_INFO_RIGHT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f" +if [ "$POWERLINE_SHOW_GIT_ON_RIGHT" = "" ]; then + POWERLINE_GIT_INFO_LEFT=$'$(git_prompt_info)' + POWERLINE_GIT_INFO_RIGHT="" +fi + POWERLINE_COLOR_BG_GRAY=%K{240} POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240} POWERLINE_COLOR_BG_WHITE=%K{255} @@ -36,12 +43,11 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f" ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f" ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f" -PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH" %k%f%F{blue}"$'\u2b80'"%f " -#"%k%f%F{black}%K{yellow}"$'$(git_prompt_info)'" %k%f%F{yellow}"$'\u2b80'"%f " +PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH" "$POWERLINE_GIT_INFO_LEFT"%k%f%F{blue}"$'\u2b80'"%f " if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then PROMPT=" "$PROMPT fi -RPROMPT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k" +RPROMPT=$POWERLINE_GIT_INFO_RIGHT$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"