From 555e1380c98c6b07d84ae9030cc346ab537190a6 Mon Sep 17 00:00:00 2001 From: Nils Pascal Illenseer Date: Tue, 28 Jun 2011 01:53:51 +0200 Subject: [PATCH 1/5] Initial release of illenseer theme. --- themes/illenseer.zsh-theme | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 themes/illenseer.zsh-theme diff --git a/themes/illenseer.zsh-theme b/themes/illenseer.zsh-theme new file mode 100644 index 000000000..a618c3e5e --- /dev/null +++ b/themes/illenseer.zsh-theme @@ -0,0 +1,61 @@ +# ------------------------------------------------------------------------ +# Nils Pascal Illenseer oh-my-zsh theme (based on Juan G. Hurtado) +# (Needs Git plugin for current_branch method) +# ------------------------------------------------------------------------ + +# Color shortcuts +RED=$fg[red] +YELLOW=$fg[yellow] +GREEN=$fg[green] +WHITE=$fg[white] +BLUE=$fg[blue] +RED_BOLD=$fg_bold[red] +YELLOW_BOLD=$fg_bold[yellow] +GREEN_BOLD=$fg_bold[green] +WHITE_BOLD=$fg_bold[white] +BLUE_BOLD=$fg_bold[blue] +RESET_COLOR=$reset_color + +# Format for git_prompt_info() +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" + +# Format for parse_git_dirty() +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}✖" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}✔" + +# Format for git_prompt_status() +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" + +# Format for git_prompt_ahead() +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}!" + +# Format for git_prompt_long_sha() and git_prompt_short_sha() +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" + +# Checks if working tree is dirty +git_dirty_bit_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + if [[ -n $(git status -s 2> /dev/null) ]]; then + echo "$ZSH_THEME_GIT_PROMPT_DIRTY" + else + echo "$ZSH_THEME_GIT_PROMPT_CLEAN" + fi +} + +# Prompt format +if [[ `id -u` -eq 0 ]]; then +PROMPT='%{$RED_BOLD%}%n@%m %{$WHITE_BOLD%}%~%u$(git_dirty_bit_info)$(git_prompt_ahead)%{$RESET_COLOR%} +%{$WHITE_BOLD%}❯%{$RESET_COLOR%} ' +RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' +else +PROMPT='%{$GREEN_BOLD%}%n@%m %{$WHITE_BOLD%}%~%u$(git_dirty_bit_info)$(git_prompt_ahead)%{$RESET_COLOR%} +%{$WHITE_BOLD%}❯%{$RESET_COLOR%} ' +RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' +fi From b9a8dc3d9635696002c4d5663d67d2b69acf8e11 Mon Sep 17 00:00:00 2001 From: Nils Pascal Illenseer Date: Sat, 2 Jul 2011 23:35:26 +0200 Subject: [PATCH 2/5] Illenseer theme complete. --- themes/illenseer.zsh-theme | 80 +++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/themes/illenseer.zsh-theme b/themes/illenseer.zsh-theme index a618c3e5e..121a95c89 100644 --- a/themes/illenseer.zsh-theme +++ b/themes/illenseer.zsh-theme @@ -1,61 +1,53 @@ # ------------------------------------------------------------------------ -# Nils Pascal Illenseer oh-my-zsh theme (based on Juan G. Hurtado) -# (Needs Git plugin for current_branch method) +# FILE: illenseer.zsh-theme +# DESCRIPTION: oh-my-zsh theme file, based on themes by Juan G. Hurtado, +# Stephen Tudor, Dejan Ranisavljevic, jnrowe +# AUTHOR: Nils Pascal Illenseer +# VERSION: 1 +# SCREENSHOT: # ------------------------------------------------------------------------ -# Color shortcuts -RED=$fg[red] -YELLOW=$fg[yellow] -GREEN=$fg[green] -WHITE=$fg[white] -BLUE=$fg[blue] -RED_BOLD=$fg_bold[red] -YELLOW_BOLD=$fg_bold[yellow] -GREEN_BOLD=$fg_bold[green] -WHITE_BOLD=$fg_bold[white] -BLUE_BOLD=$fg_bold[blue] -RESET_COLOR=$reset_color - # Format for git_prompt_info() ZSH_THEME_GIT_PROMPT_PREFIX="" ZSH_THEME_GIT_PROMPT_SUFFIX="" # Format for parse_git_dirty() -ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}✖" -ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}✔" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✘" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔" # Format for git_prompt_status() -ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" -ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" -ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" -ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" -ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" -ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$fg_bold[magenta]%}➜" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$fg_bold[red]%}✖" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$fg_bold[yellow]%}➜" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$fg_bold[yellow]%}✹" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$fg_bold[green]%}✚" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$fg_bold[red]%}✚" # Format for git_prompt_ahead() -ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}!" +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$fg_bold[red]%}‼" # Format for git_prompt_long_sha() and git_prompt_short_sha() -ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" -ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[white]%}[%{$fg_bold[cyan]%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$fg[white]%}]" -# Checks if working tree is dirty -git_dirty_bit_info() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - if [[ -n $(git status -s 2> /dev/null) ]]; then - echo "$ZSH_THEME_GIT_PROMPT_DIRTY" - else - echo "$ZSH_THEME_GIT_PROMPT_CLEAN" - fi -} +# Return code +local ret_status="%(?:%{$fg_bold[green]%}✔:%{$fg_bold[red]%}✘ %s%?)" + +# root (red) vs. normal user (green) +if [[ `id -u` -eq 0 ]]; then + user="%{$fg_bold[red]%}%n" +else + user="%{$fg_bold[green]%}%n" +fi + +# local (green) vs. remote (yellow) +if [[ -n $SSH_CONNECTION ]]; then + loc="%{$fg_bold[yellow]%}%m" +else + loc="%{$fg_bold[green]%}%m" +fi # Prompt format -if [[ `id -u` -eq 0 ]]; then -PROMPT='%{$RED_BOLD%}%n@%m %{$WHITE_BOLD%}%~%u$(git_dirty_bit_info)$(git_prompt_ahead)%{$RESET_COLOR%} -%{$WHITE_BOLD%}❯%{$RESET_COLOR%} ' -RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' -else -PROMPT='%{$GREEN_BOLD%}%n@%m %{$WHITE_BOLD%}%~%u$(git_dirty_bit_info)$(git_prompt_ahead)%{$RESET_COLOR%} -%{$WHITE_BOLD%}❯%{$RESET_COLOR%} ' -RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' -fi +PROMPT='${ret_status} ${user}%{$fg_bold[white]%}@${loc} %{$fg_bold[white]%}%~%u +➜%{$reset_color%} ' +RPROMPT='$(git_prompt_ahead)%{$fg_bold[white]%}$(git_prompt_info)$(git_prompt_short_sha)$(git_prompt_status)%{$reset_color%}' From 6f25e832cad4627e045cbfc713a1aee7084fdbf1 Mon Sep 17 00:00:00 2001 From: Nils Pascal Illenseer Date: Sun, 3 Jul 2011 12:27:20 +0200 Subject: [PATCH 3/5] Small updates to Illenseer oh-my-zsh theme. --- themes/illenseer.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/illenseer.zsh-theme b/themes/illenseer.zsh-theme index 121a95c89..012477d8d 100644 --- a/themes/illenseer.zsh-theme +++ b/themes/illenseer.zsh-theme @@ -4,7 +4,7 @@ # Stephen Tudor, Dejan Ranisavljevic, jnrowe # AUTHOR: Nils Pascal Illenseer # VERSION: 1 -# SCREENSHOT: +# SCREENSHOT: http://www.flickr.com/photos/infion/5895644448 # ------------------------------------------------------------------------ # Format for git_prompt_info() @@ -24,7 +24,7 @@ ZSH_THEME_GIT_PROMPT_ADDED=" %{$fg_bold[green]%}✚" ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$fg_bold[red]%}✚" # Format for git_prompt_ahead() -ZSH_THEME_GIT_PROMPT_AHEAD=" %{$fg_bold[red]%}‼" +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$fg_bold[red]%}‼ " # Format for git_prompt_long_sha() and git_prompt_short_sha() ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[white]%}[%{$fg_bold[cyan]%}" From 953e9b3d1277ecafc456c38b23d4f24ae9bffe0d Mon Sep 17 00:00:00 2001 From: Nils Pascal Illenseer Date: Fri, 15 Jul 2011 20:34:42 +0200 Subject: [PATCH 4/5] Small changes to Illenseer oh-my-zsh theme. --- themes/illenseer.zsh-theme | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/illenseer.zsh-theme b/themes/illenseer.zsh-theme index 012477d8d..1bb792cf9 100644 --- a/themes/illenseer.zsh-theme +++ b/themes/illenseer.zsh-theme @@ -4,7 +4,7 @@ # Stephen Tudor, Dejan Ranisavljevic, jnrowe # AUTHOR: Nils Pascal Illenseer # VERSION: 1 -# SCREENSHOT: http://www.flickr.com/photos/infion/5895644448 +# SCREENSHOT: http://www.flickr.com/photos/infion/5902602288/lightbox # ------------------------------------------------------------------------ # Format for git_prompt_info() @@ -40,14 +40,14 @@ else user="%{$fg_bold[green]%}%n" fi -# local (green) vs. remote (yellow) +# local (white) vs. remote (yellow) if [[ -n $SSH_CONNECTION ]]; then loc="%{$fg_bold[yellow]%}%m" else - loc="%{$fg_bold[green]%}%m" + loc="%m" fi # Prompt format -PROMPT='${ret_status} ${user}%{$fg_bold[white]%}@${loc} %{$fg_bold[white]%}%~%u -➜%{$reset_color%} ' +PROMPT='${ret_status} ${user}%{$fg_bold[white]%}@${loc} %{$fg_bold[blue]%}%~%u +%{$fg_bold[white]%}❱%{$reset_color%} ' RPROMPT='$(git_prompt_ahead)%{$fg_bold[white]%}$(git_prompt_info)$(git_prompt_short_sha)$(git_prompt_status)%{$reset_color%}' From 197eac5617877b22737f297a4c5143a3e14a65e0 Mon Sep 17 00:00:00 2001 From: Nils Pascal Illenseer Date: Sun, 21 Aug 2011 11:41:22 +0200 Subject: [PATCH 5/5] Add a simple prompt for dumb terminals, which fixes problems with Emacs or Vim. --- themes/illenseer.zsh-theme | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/themes/illenseer.zsh-theme b/themes/illenseer.zsh-theme index 1bb792cf9..b5534e10d 100644 --- a/themes/illenseer.zsh-theme +++ b/themes/illenseer.zsh-theme @@ -3,7 +3,7 @@ # DESCRIPTION: oh-my-zsh theme file, based on themes by Juan G. Hurtado, # Stephen Tudor, Dejan Ranisavljevic, jnrowe # AUTHOR: Nils Pascal Illenseer -# VERSION: 1 +# VERSION: 2 # SCREENSHOT: http://www.flickr.com/photos/infion/5902602288/lightbox # ------------------------------------------------------------------------ @@ -36,8 +36,10 @@ local ret_status="%(?:%{$fg_bold[green]%}✔:%{$fg_bold[red]%}✘ %s%?)" # root (red) vs. normal user (green) if [[ `id -u` -eq 0 ]]; then user="%{$fg_bold[red]%}%n" + end="#" else user="%{$fg_bold[green]%}%n" + end="$" fi # local (white) vs. remote (yellow) @@ -48,6 +50,10 @@ else fi # Prompt format +if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then PROMPT='${ret_status} ${user}%{$fg_bold[white]%}@${loc} %{$fg_bold[blue]%}%~%u %{$fg_bold[white]%}❱%{$reset_color%} ' RPROMPT='$(git_prompt_ahead)%{$fg_bold[white]%}$(git_prompt_info)$(git_prompt_short_sha)$(git_prompt_status)%{$reset_color%}' +else +PROMPT='%n@%m: %~%u ${end} ' +fi