diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/agnoster.zsh-theme | 68 | ||||
| -rw-r--r-- | themes/amuse.zsh-theme | 21 | ||||
| -rw-r--r-- | themes/bureau.zsh-theme | 113 | ||||
| -rw-r--r-- | themes/fino.zsh-theme | 22 | ||||
| -rw-r--r-- | themes/frisk.zsh-theme | 10 | ||||
| -rw-r--r-- | themes/gallois.zsh-theme | 4 | ||||
| -rw-r--r-- | themes/josh.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/linuxonly.zsh-theme (renamed from themes/linuxonly) | 0 | ||||
| -rw-r--r-- | themes/peepcode.zsh-theme | 44 | ||||
| -rw-r--r-- | themes/pygmalion.zsh-theme | 35 | ||||
| -rw-r--r-- | themes/robbyrussell.zsh-theme | 3 | ||||
| -rw-r--r-- | themes/sonicradish.zsh-theme | 37 | ||||
| -rw-r--r-- | themes/wedisagree.zsh-theme | 5 | 
13 files changed, 297 insertions, 67 deletions
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index c7a59ad0d..01cdc80e5 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -90,43 +90,43 @@ prompt_git() {      zstyle ':vcs_info:*' formats ' %u%c'      zstyle ':vcs_info:*' actionformats '%u%c'      vcs_info -    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}" +    echo -n "${ref/refs\/heads\//± }${vcs_info_msg_0_}"    fi  }  prompt_hg() { -	local rev status -	if $(hg id >/dev/null 2>&1); then -		if $(hg prompt >/dev/null 2>&1); then -			if [[ $(hg prompt "{status|unknown}") = "?" ]]; then -				# if files are not added -				prompt_segment red white -				st='±' -			elif [[ -n $(hg prompt "{status|modified}") ]]; then -				# if any modification -				prompt_segment yellow black -				st='±' -			else -				# if working copy is clean -				prompt_segment green black -			fi -			echo -n $(hg prompt " {rev}@{branch}") $st -		else -			st="" -			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') -			branch=$(hg id -b 2>/dev/null) -			if `hg st | grep -Eq "^\?"`; then -				prompt_segment red black -				st='±' -			elif `hg st | grep -Eq "^(M|A)"`; then -				prompt_segment yellow black -				st='±' -			else -				prompt_segment green black -			fi -			echo -n " $rev@$branch" $st -		fi -	fi +  local rev status +  if $(hg id >/dev/null 2>&1); then +    if $(hg prompt >/dev/null 2>&1); then +      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then +        # if files are not added +        prompt_segment red white +        st='±' +      elif [[ -n $(hg prompt "{status|modified}") ]]; then +        # if any modification +        prompt_segment yellow black +        st='±' +      else +        # if working copy is clean +        prompt_segment green black +      fi +      echo -n $(hg prompt "☿ {rev}@{branch}") $st +    else +      st="" +      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') +      branch=$(hg id -b 2>/dev/null) +      if `hg st | grep -Eq "^\?"`; then +        prompt_segment red black +        st='±' +      elif `hg st | grep -Eq "^(M|A)"`; then +        prompt_segment yellow black +        st='±' +      else +        prompt_segment green black +      fi +      echo -n "☿ $rev@$branch" $st +    fi +  fi  }  # Dir: current working directory @@ -137,7 +137,7 @@ prompt_dir() {  # Virtualenv: current working virtualenv  prompt_virtualenv() {    local virtualenv_path="$VIRTUAL_ENV" -  if [[ -n $virtualenv_path ]]; then +  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then      prompt_segment blue black "(`basename $virtualenv_path`)"    fi  } diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme new file mode 100644 index 000000000..548f6d39d --- /dev/null +++ b/themes/amuse.zsh-theme @@ -0,0 +1,21 @@ +# vim:ft=zsh ts=2 sw=2 sts=2 + +rvm_current() { +  rvm current 2>/dev/null +} + +rbenv_version() { +  rbenv version 2>/dev/null | awk '{print $1}' +} + +PROMPT=' +%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%} +$ ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}' diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme new file mode 100644 index 000000000..1d88f54d0 --- /dev/null +++ b/themes/bureau.zsh-theme @@ -0,0 +1,113 @@ +# oh-my-zsh Bureau Theme + +### NVM + +ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b " +ZSH_THEME_NVM_PROMPT_SUFFIX="" + +### Git [±master ▾●] + +ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[green]%}±%{$reset_color%}%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}]" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[cyan]%}▴%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[magenta]%}▾%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" + +bureau_git_branch () { +  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ +  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return +  echo "${ref#refs/heads/}" +} + +bureau_git_status () { +  _INDEX=$(command git status --porcelain -b 2> /dev/null) +  _STATUS="" +  if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED" +  fi +  if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED" +  fi +  if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED" +  fi +  if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" +  fi +  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED" +  fi +  if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" +  fi +  if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND" +  fi +  if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then +    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED" +  fi + +  echo $_STATUS +} + +bureau_git_prompt () { +  local _branch=$(bureau_git_branch) +  local _status=$(bureau_git_status) +  local _result="" +  if [[ "${_branch}x" != "x" ]]; then +    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch" +    if [[ "${_status}x" != "x" ]]; then +      _result="$_result $_status" +    fi +    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX" +  fi +  echo $_result +} + + +_PATH="%{$fg_bold[white]%}%~%{$reset_color%}" + +if [[ "%#" == "#" ]]; then +  _USERNAME="%{$fg_bold[red]%}%n" +  _LIBERTY="%{$fg[red]%}#" +else +  _USERNAME="%{$fg_bold[white]%}%n" +  _LIBERTY="%{$fg[green]%}$" +fi +_USERNAME="$_USERNAME%{$reset_color%}@%m" +_LIBERTY="$_LIBERTY%{$reset_color%}" + + +get_space () { +  local STR=$1$2 +  local zero='%([BSUbfksu]|([FB]|){*})' +  local LENGTH=${#${(S%%)STR//$~zero/}}  +  local SPACES="" +  (( LENGTH = ${COLUMNS} - $LENGTH - 1)) +   +  for i in {0..$LENGTH} +    do +      SPACES="$SPACES " +    done + +  echo $SPACES +} + +_1LEFT="$_USERNAME $_PATH" +_1RIGHT="[%*] " + +bureau_precmd () { +  _1SPACES=`get_space $_1LEFT $_1RIGHT` +  echo +} + +setopt prompt_subst +PROMPT='$_1LEFT$_1SPACES$_1RIGHT +> $_LIBERTY ' +RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)' + +autoload -U add-zsh-hook +add-zsh-hook precmd bureau_precmd diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme index 26e547176..4c7aabcff 100644 --- a/themes/fino.zsh-theme +++ b/themes/fino.zsh-theme @@ -1,7 +1,7 @@  # Fino theme by Max Masnick (http://max.masnick.me)  # Use with a dark background and 256-color terminal! -# Meant for people with RVM and git. Tested only on OS X 10.7. +# Meant for people with rbenv and git. Tested only on OS X 10.7.  # You can set your computer name in the ~/.box-name file if you want. @@ -11,34 +11,32 @@  #  # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ -function virtualenv_info { -    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' -}  function prompt_char { -    git branch >/dev/null 2>/dev/null && echo '±' && return -    echo '○' +  git branch >/dev/null 2>/dev/null && echo "±" && return +  echo '○'  }  function box_name {      [ -f ~/.box-name ] && cat ~/.box-name || hostname -s  } - -local rvm_ruby='' +local ruby_env=''  if which rvm-prompt &> /dev/null; then -  rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}' +  ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}'  else    if which rbenv &> /dev/null; then -    rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' +    ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}'    fi  fi +  local current_dir='${PWD/#$HOME/~}'  local git_info='$(git_prompt_info)' +local prompt_char='$(prompt_char)' -PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} -╰─$(virtualenv_info)$(prompt_char) " +PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env} +╰─${prompt_char} "  ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme index 2c999a6a6..653c7461f 100644 --- a/themes/frisk.zsh-theme +++ b/themes/frisk.zsh-theme @@ -10,13 +10,3 @@ ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB  ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "  ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"  ZSH_THEME_GIT_PROMPT_CLEAN="" - -## Bazaar integration -bzr_prompt_info() { -	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'` -	if [ -n "$BZR_CB" ]; then -		BZR_DIRTY="" -		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}" -		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX" -	fi -} diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index 3eac14867..d624e3afc 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -7,12 +7,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""  git_custom_status() {    local cb=$(current_branch)    if [ -n "$cb" ]; then -    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" +    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"    fi  }  #RVM and git settings -if [[ -s ~/.rvm/scripts/rvm ]] ; then  +if [[ -s ~/.rvm/scripts/rvm ]] ; then    RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'  else    if which rbenv &> /dev/null; then diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme index 142e76838..12dfe4069 100644 --- a/themes/josh.zsh-theme +++ b/themes/josh.zsh-theme @@ -31,7 +31,7 @@ function josh_prompt {      prompt=" $prompt"    done -  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)" +  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(current_branch)"    echo $prompt  } diff --git a/themes/linuxonly b/themes/linuxonly.zsh-theme index a11b80d7f..a11b80d7f 100644 --- a/themes/linuxonly +++ b/themes/linuxonly.zsh-theme diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme new file mode 100644 index 000000000..ca2a8862f --- /dev/null +++ b/themes/peepcode.zsh-theme @@ -0,0 +1,44 @@ +# +# Based on Geoffrey Grosenbach's peepcode zsh theme from +# https://github.com/topfunky/zsh-simple +# + +git_repo_path() { +  git rev-parse --git-dir 2>/dev/null +} + +git_commit_id() { +  git rev-parse --short HEAD 2>/dev/null +} + +git_mode() { +  if [[ -e "$repo_path/BISECT_LOG" ]]; then +    echo "+bisect" +  elif [[ -e "$repo_path/MERGE_HEAD" ]]; then +    echo "+merge" +  elif [[ -e "$repo_path/rebase" || -e "$repo_path/rebase-apply" || -e "$repo_path/rebase-merge" || -e "$repo_path/../.dotest" ]]; then +    echo "+rebase" +  fi +} + +git_dirty() { +  if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then +    echo " %{$fg_bold[grey]%}✗%{$reset_color%}" +  fi +} + +git_prompt() { +  local cb=$(current_branch) +  if [ -n "$cb" ]; then +    local repo_path=$(git_repo_path) +    echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)" +  fi +} + +local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})" + +PROMPT=' +%~ +${smiley}  %{$reset_color%}' + +RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}' diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme index cf3bb908f..654e0fc37 100644 --- a/themes/pygmalion.zsh-theme +++ b/themes/pygmalion.zsh-theme @@ -1,9 +1,34 @@  # Yay! High voltage and arrows! -ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="" +prompt_setup_pygmalion(){ +  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}" +  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}" +  ZSH_THEME_GIT_PROMPT_CLEAN="" + +  base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}' +  post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  ' + +  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g") +  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g") + +  add-zsh-hook precmd prompt_pygmalion_precmd +} + +prompt_pygmalion_precmd(){ +  local gitinfo=$(git_prompt_info) +  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g") +  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")" +  local prompt_length=${#exp_nocolor} + +  local nl="" + +  if [[ $prompt_length -gt 40 ]]; then +    nl=$'\n%{\r%}'; +  fi +  PROMPT="$base_prompt$gitinfo$nl$post_prompt" +} + +prompt_setup_pygmalion -PROMPT='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%}  ' diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme index 7b524e82d..24e1e8c52 100644 --- a/themes/robbyrussell.zsh-theme +++ b/themes/robbyrussell.zsh-theme @@ -1,4 +1,5 @@ -PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" +PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'  ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme new file mode 100644 index 000000000..508611830 --- /dev/null +++ b/themes/sonicradish.zsh-theme @@ -0,0 +1,37 @@ +#!/usr/bin/env zsh  +#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +setopt promptsubst + +autoload -U add-zsh-hook +ROOT_ICON_COLOR=$FG[111] +MACHINE_NAME_COLOR=$FG[208] +PROMPT_SUCCESS_COLOR=$FG[103] +PROMPT_FAILURE_COLOR=$FG[124] +PROMPT_VCS_INFO_COLOR=$FG[242] +PROMPT_PROMPT=$FG[208] +GIT_DIRTY_COLOR=$FG[124] +GIT_CLEAN_COLOR=$FG[148] +GIT_PROMPT_INFO=$FG[148] + +# Hash +ROOT_ICON="# " +if [[ $EUID -ne 0 ]] ; then +	ROOT_ICON="" +fi + +PROMPT='%{$ROOT_ICON_COLOR%}$ROOT_ICON%{$reset_color%}%{$MACHINE_NAME_COLOR%}%m➜  %{$reset_color%}%{$PROMPT_SUCCESS_COLOR%}%c%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ %{$reset_color%} ' + +#RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX=": " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%} :" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$rset_color%}" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[103]%}✹%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}" diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme index 7cb27934d..9bdbce40d 100644 --- a/themes/wedisagree.zsh-theme +++ b/themes/wedisagree.zsh-theme @@ -25,7 +25,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'  # The right-hand prompt -RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}' +RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'  # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name  # %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%}  @@ -46,6 +46,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡"  # ⓜ ⑁  ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂  ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄  ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊ +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"  # More symbols to choose from:  # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷ @@ -104,4 +105,4 @@ function git_time_since_commit() {              echo "($(rvm_gemset)$COLOR~|"          fi      fi -}
\ No newline at end of file +}  | 
