Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace %{$fg[color]%} by %F{color} in themes #8487

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions themes/alanpeabody.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@

local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
local pwd='%{$fg[blue]%}%~%{$reset_color%}'
local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
local user='%F{magenta}%n@%F{magenta}%m%f'
local pwd='%F{blue}%~%f'
local return_code='%(?..%F{red}%? ↵%f)'
local git_branch='$(git_prompt_status)%f$(git_prompt_info)%f'

ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""

ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"

ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[green]%}‹"
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{green}‹"
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"

PROMPT="${user} ${pwd}$ "
RPROMPT="${return_code} ${git_branch} \$(ruby_prompt_info)"
4 changes: 2 additions & 2 deletions themes/arrow.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi

PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
RPROMPT='%{$fg[$NCOLOR]%} $(git_prompt_info)%{$reset_color%}'
PROMPT='%F{$NCOLOR}%c ➤ %f'
RPROMPT='%F{$NCOLOR} $(git_prompt_info)%f'

ZSH_THEME_GIT_PROMPT_PREFIX="git:"
ZSH_THEME_GIT_PROMPT_SUFFIX=""
Expand Down
20 changes: 10 additions & 10 deletions themes/crunch.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
# Colors are at the top so you can mess with those separately if you like.
# For the most part I stuck with Dallas's.

CRUNCH_BRACKET_COLOR="%{$fg[white]%}"
CRUNCH_TIME_COLOR="%{$fg[yellow]%}"
CRUNCH_RVM_COLOR="%{$fg[magenta]%}"
CRUNCH_DIR_COLOR="%{$fg[cyan]%}"
CRUNCH_GIT_BRANCH_COLOR="%{$fg[green]%}"
CRUNCH_GIT_CLEAN_COLOR="%{$fg[green]%}"
CRUNCH_GIT_DIRTY_COLOR="%{$fg[red]%}"
CRUNCH_BRACKET_COLOR="%F{white}"
CRUNCH_TIME_COLOR="%F{yellow}"
CRUNCH_RVM_COLOR="%F{magenta}"
CRUNCH_DIR_COLOR="%F{cyan}"
CRUNCH_GIT_BRANCH_COLOR="%F{green}"
CRUNCH_GIT_CLEAN_COLOR="%F{green}"
CRUNCH_GIT_DIRTY_COLOR="%F{red}"

# These Git variables are used by the oh-my-zsh git_prompt_info helper:
ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR"
Expand All @@ -28,12 +28,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN=" $CRUNCH_GIT_CLEAN_COLOR✓"
ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"

# Our elements:
CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%f"
ZSH_THEME_RUBY_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR"
ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
ZSH_THEME_RUBY_PROMPT_SUFFIX="$CRUNCH_BRACKET_COLOR"]"%f"
CRUNCH_RVM_='$(ruby_prompt_info)'
CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "

# Put it all together!
PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%{$reset_color%}"
PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%f"
20 changes: 10 additions & 10 deletions themes/dallas.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Personalized!

# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
DALLAS_CURRENT_TIME_="%F{white}{%F{yellow}%D %T%F{white}}%f"
# Grab the current machine name: muscato
DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
DALLAS_CURRENT_MACH_="%F{green}%m%F{white}:%f"
# Grab the current filepath, use shortcuts: ~/Desktop
# Append the current git branch, if in a git repository: ~aw@master
DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
DALLAS_CURRENT_LOCA_="%F{cyan}%~\$(git_prompt_info)%f\$(parse_git_dirty)"
# Grab the current username: dallas
DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
DALLAS_CURRENT_USER_="%F{red}%n%f"
# Use a % for normal users and a # for privileged (root) users.
DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
DALLAS_PROMPT_CHAR_="%F{white}%(!.#.%%)%f"
# For the git prompt, use a white @ and blue text for the branch name
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
ZSH_THEME_GIT_PROMPT_PREFIX="%F{white}@%F{blue}"
# Close it all off by resetting the color and styles.
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
# Do nothing if the branch is clean (no changes).
ZSH_THEME_GIT_PROMPT_CLEAN=""
# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗"
ZSH_THEME_GIT_PROMPT_DIRTY="%F{cyan}✗✗✗"

ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[white]%}[%{$fg[magenta]%}"
ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$fg[white]%}]%{$reset_color%}"
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{white}[%F{magenta}"
ZSH_THEME_RUBY_PROMPT_SUFFIX="%F{white}]%f"

# Put it all together!
PROMPT="$DALLAS_CURRENT_TIME_\$(ruby_prompt_info)$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "
6 changes: 3 additions & 3 deletions themes/daveverwer.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copied and modified from the oh-my-zsh theme from geoffgarside
# Red server name, green cwd, blue git status

PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
PROMPT='%F{red}%m%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '

ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{blue}("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
18 changes: 9 additions & 9 deletions themes/dpoggi.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
local return_code="%(?..%F{red}%? ↵%f)"

PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
%{$reset_color%}:%{$fg[magenta]%}%~\
PROMPT='%F{$NCOLOR}%n%f@%F{cyan}%m\
%f:%F{magenta}%~\
$(git_prompt_info) \
%{$fg[red]%}%(!.#.»)%{$reset_color%} '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
%F{red}%(!.#.»)%f '
PROMPT2='%F{red}\ %f'
RPS1='${return_code}'

ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}("
ZSH_THEME_GIT_PROMPT_CLEAN="%F{green}○%f"
ZSH_THEME_GIT_PROMPT_DIRTY="%F{red}⚡%f"
ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow})%f"
6 changes: 3 additions & 3 deletions themes/funky.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Taken from Tassilo's Blog
# https://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/

local blue_op="%{$fg[blue]%}[%{$reset_color%}"
local blue_cp="%{$fg[blue]%}]%{$reset_color%}"
local blue_op="%F{blue}[%f"
local blue_cp="%F{blue}]%f"
local path_p="${blue_op}%~${blue_cp}"
local user_host="${blue_op}%n@%m${blue_cp}"
local ret_status="${blue_op}%?${blue_cp}"
local hist_no="${blue_op}%h${blue_cp}"
local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})"
local smiley="%(?,%F{green}:%)%f,%F{red}:(%f)"
PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
╰─${blue_op}${smiley}${blue_cp} %# "
local cur_cmd="${blue_op}%_${blue_cp}"
Expand Down
6 changes: 3 additions & 3 deletions themes/geoffgarside.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) "
PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
PROMPT='[%*] %F{cyan}%n%f:%F{green}%c%f$(git_prompt_info) %(!.#.$) '

ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}git:("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{yellow}git:("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
6 changes: 3 additions & 3 deletions themes/humza.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ else
suffix="Gb"
fi

PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ '
PROMPT='%f%n %F{green}{%f%~%F{green}}%f$(git_prompt_info) greetings, earthling %F{green}[%f%{$TotalSize%}%{$suffix%}%F{green}]%F{red}$%f ☞ '

ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±("
ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX="%F{red}±("
ZSH_THEME_GIT_PROMPT_SUFFIX=");%f"
2 changes: 1 addition & 1 deletion themes/imajes.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# http://zshwiki.org/home/config/prompt
#

PROMPT="%{$fg[red]%}%%%{$reset_color%} "
PROMPT="%F{red}%%%f "
14 changes: 7 additions & 7 deletions themes/itchy.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
local smiley="%(?,%F{green}☺%f,%F{red}☹%f)"

local user="%{$fg[cyan]%}%n%{$reset_color%}"
local host="%{$fg[cyan]%}@%m%{$reset_color%}"
local pwd="%{$fg[yellow]%}%~%{$reset_color%}"
local user="%F{cyan}%n%f"
local host="%F{cyan}@%m%f"
local pwd="%F{yellow}%~%f"

PROMPT='${user}${host} ${pwd}
${smiley} '

RPROMPT='$(ruby_prompt_info) %{$fg[white]%}$(git_prompt_info)%{$reset_color%}'
RPROMPT='$(ruby_prompt_info) %F{white}$(git_prompt_info)%f'

ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%F{red} ✗%f"
ZSH_THEME_GIT_PROMPT_CLEAN="%F{green} ✔%f"

ZSH_THEME_RUBY_PROMPT_PREFIX=""
ZSH_THEME_RUBY_PROMPT_SUFFIX=""
4 changes: 2 additions & 2 deletions themes/kardan.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ function get_host {
PROMPT='> '
RPROMPT='%~$(git_prompt_info)$(get_host)'

ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}✗%f"
ZSH_THEME_GIT_PROMPT_PREFIX="("
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
22 changes: 11 additions & 11 deletions themes/kphoen.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# kphoen.zsh-theme

if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
PROMPT='[%F{red}%n%f@%F{magenta}%m%f:%F{blue}%~%f$(git_prompt_info)]
%# '

ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" on %F{green}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""

# display exitcode on the right when >0
return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
return_code="%(?..%F{red}%? ↵%f)"

RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
RPROMPT='${return_code}$(git_prompt_status)%f'

ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
ZSH_THEME_GIT_PROMPT_ADDED="%F{green} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan} ✭"
else
PROMPT='[%n@%m:%~$(git_prompt_info)]
%# '
Expand Down
6 changes: 3 additions & 3 deletions themes/lambda.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
PROMPT='λ %~/ $(git_prompt_info)%f'

ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
ZSH_THEME_GIT_PROMPT_PREFIX="%F{green}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
6 changes: 3 additions & 3 deletions themes/maran.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Theme with full path names and hostname
# Handy if you work on different servers all the time;
PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%}$(git_prompt_info) %(!.#.$) '
PROMPT='%F{cyan}%n%f@%F{yellow}%M:%F{green}%/%f$(git_prompt_info) %(!.#.$) '

ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" %F{cyan}git:("
ZSH_THEME_GIT_PROMPT_SUFFIX=")%f"
8 changes: 4 additions & 4 deletions themes/miloshadzic.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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_PREFIX="%f%F{green}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
ZSH_THEME_GIT_PROMPT_CLEAN=""

PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} '
PROMPT='%F{cyan}%1~%f%F{red}|%f$(git_prompt_info)%F{cyan}⇒%f '
10 changes: 5 additions & 5 deletions themes/norm.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROMPT='%{$fg[yellow]%}λ %m %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)$(hg_prompt_info)%{$reset_color%}'
PROMPT='%F{yellow}λ %m %F{green}%c %F{yellow}→ $(git_prompt_info)$(hg_prompt_info)%f'

ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
ZSH_THEME_HG_PROMPT_PREFIX="λ %{$fg[blue]%}hg %{$fg[red]%}"
ZSH_THEME_HG_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX="λ %F{blue}git %F{red}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%F{yellow} → %f"
ZSH_THEME_HG_PROMPT_PREFIX="λ %F{blue}hg %F{red}"
ZSH_THEME_HG_PROMPT_SUFFIX="%F{yellow} → %f"

12 changes: 6 additions & 6 deletions themes/pygmalion-virtualenv.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function _virtualenv_prompt_info {
if [[ -n "$(whence virtualenv_prompt_info)" ]]; then
if [ -n "$(whence pyenv_prompt_info)" ]; then
if [ "$1" = "inline" ]; then
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%{$fg[blue]%}"::%{$fg[red]%}"
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=%F{blue}"::%F{red}"
ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX=""
virtualenv_prompt_info
fi
Expand All @@ -19,13 +19,13 @@ function _virtualenv_prompt_info {
prompt_setup_pygmalion(){
setopt localoptions extendedglob

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_PREFIX="%f%F{green}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%f "
ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
ZSH_THEME_GIT_PROMPT_CLEAN=""

base_prompt='$(_virtualenv_prompt_info)%{$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='$(_virtualenv_prompt_info)%F{magenta}%n%f%F{cyan}@%f%F{yellow}%m%f%F{red}:%f%F{cyan}%0~%f%F{red}|%f'
post_prompt='%F{cyan}⇒%f '

base_prompt_nocolor=${base_prompt//\%\{[^\}]##\}}
post_prompt_nocolor=${post_prompt//\%\{[^\}]##\}}
Expand Down
2 changes: 1 addition & 1 deletion themes/sammy.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROMPT='%{$fg[white]%}%c$(git_prompt_info)$ % %{$reset_color%}'
PROMPT='%F{white}%c$(git_prompt_info)$ % %f'

ZSH_THEME_GIT_PROMPT_PREFIX="("
ZSH_THEME_GIT_PROMPT_SUFFIX=""
Expand Down
16 changes: 8 additions & 8 deletions themes/theunraveler.zsh-theme
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Comment

PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
PROMPT='%F{magenta}[%c] %f'

RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
RPROMPT='%F{magenta}$(git_prompt_info)%f $(git_prompt_status)%f'

ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY=""
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
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_UNTRACKED="%{$fg[grey]%} ✱"
ZSH_THEME_GIT_PROMPT_ADDED="%F{cyan} ✈"
ZSH_THEME_GIT_PROMPT_MODIFIED="%F{yellow} ✭"
ZSH_THEME_GIT_PROMPT_DELETED="%F{red} ✗"
ZSH_THEME_GIT_PROMPT_RENAMED="%F{blue} ➦"
ZSH_THEME_GIT_PROMPT_UNMERGED="%F{magenta} ✂"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{grey} ✱"