From 14a1ce80bbf7362ab2856cdd050714f02649fe3f Mon Sep 17 00:00:00 2001 From: James Adam Date: Tue, 20 Oct 2009 06:24:21 +0800 Subject: Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed). --- themes/lazyatom.zsh-theme | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 themes/lazyatom.zsh-theme (limited to 'themes') diff --git a/themes/lazyatom.zsh-theme b/themes/lazyatom.zsh-theme new file mode 100644 index 000000000..6263bc2b7 --- /dev/null +++ b/themes/lazyatom.zsh-theme @@ -0,0 +1,40 @@ +git_prompt_info() { + branch=$(git symbolic-ref HEAD 2> /dev/null) || return + git_status="$(git status 2> /dev/null)" + state="" + case $git_status in + *Changed\ but\ not\ updated*) + state="%{$fg[red]%}⚡" + ;;; + *Untracked\ files*) + state="%{$fg[red]%}⚡" + ;;; + esac + + remote="" + case $git_status in + *Your\ branch\ is\ ahead*) + remote="%{$fg[yellow]%}↑" + ;;; + + *Your\ branch\ is\ behind*) + remote="%{$fg[yellow]%}↓" + ;;; + + "Your branch and") + remote="%{$fg[yellow]%}" + ;;; + esac + echo " %{$fg[yellow]%}(${branch#refs/heads/})${remote}${state}" +} + +function oh_my_zsh_theme_precmd() { + local previous_return_value=$?; + prompt="%{$fg[light_gray]%}%c%{$fg[yellow]%}$(git_prompt_info)%{$fg[white]%}" + if test $previous_return_value -eq 0 + then + export PROMPT="%{$fg[green]%}➜ %{$fg[white]%}${prompt}%{$fg[green]%} $%{$fg[white]%} " + else + export PROMPT="%{$fg[red]%}➜ %{$fg[white]%}${prompt}%{$fg[red]%} $%{$fg[white]%} " + fi +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From e24709a2b80c8f829c8ceb66130a4b3a6cb86261 Mon Sep 17 00:00:00 2001 From: meh Date: Sun, 1 Nov 2009 06:16:24 +0800 Subject: Fixed darkblood theme as in issue #23. --- themes/darkblood.zsh-theme | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'themes') diff --git a/themes/darkblood.zsh-theme b/themes/darkblood.zsh-theme index 8a00c3459..33508fbd2 100644 --- a/themes/darkblood.zsh-theme +++ b/themes/darkblood.zsh-theme @@ -1,9 +1,9 @@ # meh. Dark Blood Rewind, a new beginning. -PROMPT=$'${fg[red]}┌[${fg_bold[white]}%n${reset_color}${fg[red]}@${fg_bold[white]}%m${reset_color}${fg[red]}] [${fg_bold[white]}/dev/%y${reset_color}${fg[red]}] $(git_prompt_info)%(?,,${fg[red]}[${fg_bold[white]}%?${reset_color}${fg[red]}]) -${fg[red]}└[${fg_bold[white]}%~${reset_color}${fg[red]}]>${reset_color} ' -PS2=$' ${fg[red]}|>${reset_color} ' +PROMPT=$'%{$fg[red]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[red]%}@%{$fg_bold[white]%}%m%{$reset_color%}%{$fg[red]%}] [%{$fg_bold[white]%}/dev/%y%{$reset_color%}%{$fg[red]%}] %{$(git_prompt_info)%}%(?,,%{$fg[red]%}[%{$fg_bold[white]%}%?%{$reset_color%}%{$fg[red]%}]) +%{$fg[red]%}└[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[red]%}]>%{$reset_color%} ' +PS2=$' %{$fg[red]%}|>%{$reset_color%} ' -ZSH_THEME_GIT_PROMPT_PREFIX="${fg[red]}[${fg_bold[white]}" -ZSH_THEME_GIT_PROMPT_SUFFIX="${reset_color}${fg[red]}] " -ZSH_THEME_GIT_PROMPT_DIRTY=" ${fg[red]}⚡${reset_color}" +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}[%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[red]%}] " +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡%{$reset_color%}" -- cgit v1.2.3-70-g09d2 From 97c66649485e227aba86b6006a6058a981da5092 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Fri, 16 Oct 2009 12:07:02 +0800 Subject: Added initial jnrowe theme. --- themes/jnrowe.zsh-theme | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 themes/jnrowe.zsh-theme (limited to 'themes') diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme new file mode 100644 index 000000000..7c8a7082e --- /dev/null +++ b/themes/jnrowe.zsh-theme @@ -0,0 +1,31 @@ +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 ' +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 + +prompt_jnrowe_precmd () { + vcs_info + + if [ "${vcs_info_msg_0_}" = "" ]; then + dir_status="%F{2}→%f" + elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then + dir_status="%F{1}▶%f" + elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then + dir_status="%F{3}▶%f" + else + dir_status="%F{2}▶%f" + 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%} ' + +# vim: set ft=zsh ts=4 sw=4 et: -- cgit v1.2.3-70-g09d2 From c620408962dd93fe920414eedd8e8e38b241eb08 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 9 Nov 2009 07:33:51 -0800 Subject: Revert "Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed)." This reverts commit 14a1ce80bbf7362ab2856cdd050714f02649fe3f. --- lib/termsupport.zsh | 2 -- themes/lazyatom.zsh-theme | 40 ---------------------------------------- 2 files changed, 42 deletions(-) delete mode 100644 themes/lazyatom.zsh-theme (limited to 'themes') diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index ec828c287..fef978748 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -4,7 +4,6 @@ case "$TERM" in print -Pn "\e]0;%n@%m: $1\a" # xterm } precmd () { - oh_my_zsh_theme_precmd print -Pn "\e]0;%n@%m: %~\a" # xterm } ;; @@ -15,7 +14,6 @@ case "$TERM" in print -Pn "\e]0;%n@%m: $1\a" # xterm } precmd () { - oh_my_zsh_theme_precmd echo -ne "\ekzsh\e\\" print -Pn "\e]0;%n@%m: %~\a" # xterm } diff --git a/themes/lazyatom.zsh-theme b/themes/lazyatom.zsh-theme deleted file mode 100644 index 6263bc2b7..000000000 --- a/themes/lazyatom.zsh-theme +++ /dev/null @@ -1,40 +0,0 @@ -git_prompt_info() { - branch=$(git symbolic-ref HEAD 2> /dev/null) || return - git_status="$(git status 2> /dev/null)" - state="" - case $git_status in - *Changed\ but\ not\ updated*) - state="%{$fg[red]%}⚡" - ;;; - *Untracked\ files*) - state="%{$fg[red]%}⚡" - ;;; - esac - - remote="" - case $git_status in - *Your\ branch\ is\ ahead*) - remote="%{$fg[yellow]%}↑" - ;;; - - *Your\ branch\ is\ behind*) - remote="%{$fg[yellow]%}↓" - ;;; - - "Your branch and") - remote="%{$fg[yellow]%}" - ;;; - esac - echo " %{$fg[yellow]%}(${branch#refs/heads/})${remote}${state}" -} - -function oh_my_zsh_theme_precmd() { - local previous_return_value=$?; - prompt="%{$fg[light_gray]%}%c%{$fg[yellow]%}$(git_prompt_info)%{$fg[white]%}" - if test $previous_return_value -eq 0 - then - export PROMPT="%{$fg[green]%}➜ %{$fg[white]%}${prompt}%{$fg[green]%} $%{$fg[white]%} " - else - export PROMPT="%{$fg[red]%}➜ %{$fg[white]%}${prompt}%{$fg[red]%} $%{$fg[white]%} " - fi -} \ No newline at end of file -- cgit v1.2.3-70-g09d2