From 1a53a4ba1d9581271adb09841baee5423df55ad9 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Thu, 20 Mar 2008 09:42:36 +0100 Subject: Colors defs moved from Prompts.zsh to Colors.zsh --- 11_Colors.zsh | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 11_Colors.zsh (limited to '11_Colors.zsh') diff --git a/11_Colors.zsh b/11_Colors.zsh new file mode 100644 index 0000000..fa1522c --- /dev/null +++ b/11_Colors.zsh @@ -0,0 +1,82 @@ +## +## Part of configuration files for Zsh 4 +## by Hugues Hiegel +## +## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS +## +## You are encouraged to use, modify, and redistribute +## these files with or without this notice. +## + +c_=[ +_c=m +C_="%{$c_" +_C="$_c%}" + +typeset -A prompt_colors git_colors mail_colors + +# I hate kik00l0l colorized prompts, so I'm using a way to +# give a dominant color for each part of the prompt, each of +# these remain still configurable one by one. +# Take a look to set_prompt_colors for these colorizations. +# +# To set the dominant color I'm using this : +# +# - PS1_ROOT when we are root +# - PS1_USER for normal usage +# - PS1_USER_SSH when we are connected through SSH +# +# I'm storing the resulting dominant color in $prompt_colors[generic] + +PS1_ROOT=${PS1_ROOT:-$color[red]} +PS1_USER=${PS1_USER:-$color[blue]} +PS1_USER_SSH=${PS1_USER_SSH:-$color[magenta]} +prompt_colors[generic]=`print -Pn "%(! $PS1_ROOT $PS1_USER)"` + +normal_user && if ( [ "$SSH_TTY" != "" ] ) +then + # This allows us to easily distinguish shells + # which really are on the local machine or not. + # That's so good, use it ! :-) + prompt_colors[generic]=${PS1_USER_SSH:-$prompt_colors[generic]} +fi + +# +# This func is intended to give a quick way to set the colors for the +# prompt inside a running zsh-session +# +set_prompt_colors () +{ + prompt_colors[generic]=${1:-$prompt_colors[generic]} + + prompt_colors[path]="$color[none];$prompt_colors[generic];$color[bold]" # pwd + #prompt_colors[term]="$color[none];$prompt_colors[generic]" # tty + prompt_colors[user]="$color[none];$prompt_colors[generic]" # login + prompt_colors[host]="$color[none];$prompt_colors[generic]" # hostname + #prompt_colors[hist]="$color[none]" # history number + prompt_colors[arob]="$color[none];$color[bold];$prompt_colors[generic]" # @ + prompt_colors[dies]="$color[none];$prompt_colors[generic]" # the bottom-end of the prompt + prompt_colors[doubledot]="$color[none];" # separates pwd from git-branch + #prompt_colors[paren]="$color[none];$color[cyan]" # parenthesis (around tty) + prompt_colors[bar]="$color[none];$prompt_colors[generic];$color[bold]" # horizontal bar + prompt_colors[braces]=$prompt_colors[bar] # braces (around date) + prompt_colors[error]="$color[bold];$color[yellow]" # error code + prompt_colors[date]="$color[none];$prompt_colors[generic]" # full date + + prompt_colors[cmd]="$color[none]" # command prompt + prompt_colors[exec]="$color[none]" # command output + + mail_colors[unread]="$color[none];$color[yellow];$color[bold]" # mail received + mail_colors[listes]="$color[none];$color[red];$color[bold]" # less important mail received + + prompt_colors[up_to_date]="$color[none];$prompt_colors[generic]" # up-to-date + prompt_colors[not_up_to_date]="$color[none];$color[green];$color[bold]" # not up to date + prompt_colors[to_be_commited]="$color[none];$color[yellow];$color[bold]" # changes in cache + + git_colors[managment_folder]="$color[none];$color[red];$color[bold]" # .git/... folder browsing + git_colors[cached]="$prompt_colors[to_be_commited]" # git changes in cache + git_colors[not_up_to_date]="$prompt_colors[not_up_to_date]" # git changes in working tree + git_colors[up_to_date]="$prompt_colors[up_to_date]" # git up-to-date +} + +set_prompt_colors -- cgit v1.2.3 From 80d397d87b336fa0dcb573dc41459fc7b5c72977 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Tue, 18 Mar 2008 10:27:20 +0100 Subject: Use of color[none] inside $c_ instead of each named-part. --- 11_Colors.zsh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to '11_Colors.zsh') diff --git a/11_Colors.zsh b/11_Colors.zsh index fa1522c..bd5ba71 100644 --- a/11_Colors.zsh +++ b/11_Colors.zsh @@ -8,7 +8,7 @@ ## these files with or without this notice. ## -c_=[ +c_='['$color[none]";" _c=m C_="%{$c_" _C="$_c%}" @@ -49,31 +49,31 @@ set_prompt_colors () { prompt_colors[generic]=${1:-$prompt_colors[generic]} - prompt_colors[path]="$color[none];$prompt_colors[generic];$color[bold]" # pwd - #prompt_colors[term]="$color[none];$prompt_colors[generic]" # tty - prompt_colors[user]="$color[none];$prompt_colors[generic]" # login - prompt_colors[host]="$color[none];$prompt_colors[generic]" # hostname + prompt_colors[path]="$prompt_colors[generic];$color[bold]" # pwd + #prompt_colors[term]="$prompt_colors[generic]" # tty + prompt_colors[user]="$prompt_colors[generic]" # login + prompt_colors[host]="$prompt_colors[generic]" # hostname #prompt_colors[hist]="$color[none]" # history number - prompt_colors[arob]="$color[none];$color[bold];$prompt_colors[generic]" # @ - prompt_colors[dies]="$color[none];$prompt_colors[generic]" # the bottom-end of the prompt + prompt_colors[arob]="$color[bold];$prompt_colors[generic]" # @ + prompt_colors[dies]="$prompt_colors[generic]" # the bottom-end of the prompt prompt_colors[doubledot]="$color[none];" # separates pwd from git-branch - #prompt_colors[paren]="$color[none];$color[cyan]" # parenthesis (around tty) - prompt_colors[bar]="$color[none];$prompt_colors[generic];$color[bold]" # horizontal bar - prompt_colors[braces]=$prompt_colors[bar] # braces (around date) + #prompt_colors[paren]="$color[cyan]" # parenthesis (around tty) + prompt_colors[bar]="$prompt_colors[generic];$color[bold]" # horizontal bar + prompt_colors[braces]="$prompt_colors[bar]" # braces (around date) prompt_colors[error]="$color[bold];$color[yellow]" # error code - prompt_colors[date]="$color[none];$prompt_colors[generic]" # full date + prompt_colors[date]="$prompt_colors[generic]" # full date prompt_colors[cmd]="$color[none]" # command prompt prompt_colors[exec]="$color[none]" # command output - mail_colors[unread]="$color[none];$color[yellow];$color[bold]" # mail received - mail_colors[listes]="$color[none];$color[red];$color[bold]" # less important mail received + mail_colors[unread]="$color[yellow];$color[bold]" # mail received + mail_colors[listes]="$color[red];$color[bold]" # less important mail received - prompt_colors[up_to_date]="$color[none];$prompt_colors[generic]" # up-to-date - prompt_colors[not_up_to_date]="$color[none];$color[green];$color[bold]" # not up to date - prompt_colors[to_be_commited]="$color[none];$color[yellow];$color[bold]" # changes in cache + prompt_colors[up_to_date]="$prompt_colors[generic]" # up-to-date + prompt_colors[not_up_to_date]="$color[green];$color[bold]" # not up to date + prompt_colors[to_be_commited]="$color[yellow];$color[bold]" # changes in cache - git_colors[managment_folder]="$color[none];$color[red];$color[bold]" # .git/... folder browsing + git_colors[managment_folder]="$color[red];$color[bold]" # .git/... folder browsing git_colors[cached]="$prompt_colors[to_be_commited]" # git changes in cache git_colors[not_up_to_date]="$prompt_colors[not_up_to_date]" # git changes in working tree git_colors[up_to_date]="$prompt_colors[up_to_date]" # git up-to-date -- cgit v1.2.3 From ff40c760ef2bb633804d1a66679846fcad9ea91a Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Tue, 18 Mar 2008 09:45:08 +0100 Subject: Don't override the 'generic' color. --- 11_Colors.zsh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to '11_Colors.zsh') diff --git a/11_Colors.zsh b/11_Colors.zsh index bd5ba71..c76fd95 100644 --- a/11_Colors.zsh +++ b/11_Colors.zsh @@ -47,21 +47,22 @@ fi # set_prompt_colors () { - prompt_colors[generic]=${1:-$prompt_colors[generic]} + local my_generic + my_generic=${1:-$prompt_colors[generic]} - prompt_colors[path]="$prompt_colors[generic];$color[bold]" # pwd - #prompt_colors[term]="$prompt_colors[generic]" # tty - prompt_colors[user]="$prompt_colors[generic]" # login - prompt_colors[host]="$prompt_colors[generic]" # hostname + prompt_colors[path]="$my_generic;$color[bold]" # pwd + #prompt_colors[term]="$my_generic" # tty + prompt_colors[user]="$my_generic" # login + prompt_colors[host]="$my_generic" # hostname #prompt_colors[hist]="$color[none]" # history number - prompt_colors[arob]="$color[bold];$prompt_colors[generic]" # @ - prompt_colors[dies]="$prompt_colors[generic]" # the bottom-end of the prompt + prompt_colors[arob]="$color[bold];$my_generic" # @ + prompt_colors[dies]="$my_generic" # the bottom-end of the prompt prompt_colors[doubledot]="$color[none];" # separates pwd from git-branch #prompt_colors[paren]="$color[cyan]" # parenthesis (around tty) - prompt_colors[bar]="$prompt_colors[generic];$color[bold]" # horizontal bar + prompt_colors[bar]="$my_generic;$color[bold]" # horizontal bar prompt_colors[braces]="$prompt_colors[bar]" # braces (around date) prompt_colors[error]="$color[bold];$color[yellow]" # error code - prompt_colors[date]="$prompt_colors[generic]" # full date + prompt_colors[date]="$my_generic" # full date prompt_colors[cmd]="$color[none]" # command prompt prompt_colors[exec]="$color[none]" # command output @@ -69,7 +70,7 @@ set_prompt_colors () mail_colors[unread]="$color[yellow];$color[bold]" # mail received mail_colors[listes]="$color[red];$color[bold]" # less important mail received - prompt_colors[up_to_date]="$prompt_colors[generic]" # up-to-date + prompt_colors[up_to_date]="$my_generic" # up-to-date prompt_colors[not_up_to_date]="$color[green];$color[bold]" # not up to date prompt_colors[to_be_commited]="$color[yellow];$color[bold]" # changes in cache -- cgit v1.2.3 From c268cfc267a71254881a85975504f0a3e0e69815 Mon Sep 17 00:00:00 2001 From: Hugues Date: Thu, 20 Mar 2008 12:10:42 +0100 Subject: Correction colors --- 11_Colors.zsh | 6 +++++- 12_Prompts.zsh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to '11_Colors.zsh') diff --git a/11_Colors.zsh b/11_Colors.zsh index c76fd95..db68bb1 100644 --- a/11_Colors.zsh +++ b/11_Colors.zsh @@ -13,7 +13,7 @@ _c=m C_="%{$c_" _C="$_c%}" -typeset -A prompt_colors git_colors mail_colors +typeset -A prompt_colors git_colors mail_colors correct_colors # I hate kik00l0l colorized prompts, so I'm using a way to # give a dominant color for each part of the prompt, each of @@ -81,3 +81,7 @@ set_prompt_colors () } set_prompt_colors + +correct_colors[error]="$color[red];$color[bold]" +correct_colors[suggest]="$color[blue];$color[bold]" + diff --git a/12_Prompts.zsh b/12_Prompts.zsh index d9ae9fa..a5b7348 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -172,5 +172,5 @@ PS4="+%N:%i> " #RPS1="%(?;;"$C_$prompt_colors[error]$_C"%?"$C_$color[none]$_C")" # Ultime : prompt de correction :-) -SPROMPT="zsh: $C_$color[blue]$_C%B'%R'%b$C_$color[none]$_C ? Vous ne vouliez pas plutôt $C_$color[magenta]$_C%B'%r'%b$C_$color[none]$_C ? [%BN%byae] " +SPROMPT="zsh: $C_$correct_colors[error]$_C'%R'$C_$color[none]$_C ? Vous ne vouliez pas plutôt $C_$correct_colors[suggest]$_C'%r'$C_$color[none]$_C ? [%BN%byae] " -- cgit v1.2.3 From b86da16524342d1da6bdef8f2bd30cffa7099c1f Mon Sep 17 00:00:00 2001 From: Hugues Date: Wed, 26 Mar 2008 14:35:34 +0100 Subject: Mail received other than important ones colorized in $generic instead of $red. --- 11_Colors.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '11_Colors.zsh') diff --git a/11_Colors.zsh b/11_Colors.zsh index db68bb1..ab455ca 100644 --- a/11_Colors.zsh +++ b/11_Colors.zsh @@ -68,7 +68,7 @@ set_prompt_colors () prompt_colors[exec]="$color[none]" # command output mail_colors[unread]="$color[yellow];$color[bold]" # mail received - mail_colors[listes]="$color[red];$color[bold]" # less important mail received + mail_colors[listes]="$my_generic;$color[bold]" # less important mail received prompt_colors[up_to_date]="$my_generic" # up-to-date prompt_colors[not_up_to_date]="$color[green];$color[bold]" # not up to date -- cgit v1.2.3