diff options
| -rw-r--r-- | 01_Internal.zsh | 12 | ||||
| -rw-r--r-- | 02_Functions.zsh | 8 | ||||
| -rw-r--r-- | 12_Prompts.zsh | 2 | ||||
| -rw-r--r-- | 13_ZshHighlight.zsh | 5 | ||||
| -rw-r--r-- | 99_Exec.zsh | 4 | ||||
| l--------- | net:foret/user:hiegel | 1 | ||||
| -rw-r--r-- | net:sweethome/Environment.zsh | 2 | ||||
| l--------- | user:hiegel | 1 | ||||
| -rw-r--r-- | user:hugues/KeyBindings.zsh | 2 | ||||
| -rw-r--r-- | user:hugues/net:foret/KeyBindings.zsh | 16 | ||||
| -rw-r--r-- | zshrc | 1 |
11 files changed, 39 insertions, 15 deletions
diff --git a/01_Internal.zsh b/01_Internal.zsh index 297f274..1e91763 100644 --- a/01_Internal.zsh +++ b/01_Internal.zsh @@ -77,7 +77,13 @@ __term_title() __preprint() { - local my_color i + local my_color i newline + if [ "$1" = "-n" ] + then + newline='n' + shift + fi + my_color=${2-"$_prompt_colors[generic]"} hbar=$T_ @@ -89,9 +95,9 @@ __preprint() if [ "$1" != "" ] then - print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_tj_$_T${C_}0;$my_color${_C} $1 ${C_}0;$my_color;1${_C}$T_$_tm_$_tq_$_T\r${C_}0${_C}" + print -P$newline "${C_}$my_color;1${_C}${hbar}$T_$_tj_$_T${C_}0;$my_color${_C} $1 ${C_}0;$my_color;1${_C}$T_$_tm_$_tq_$_T\r${C_}0${_C}" else - print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_tq_$_tq_$_tq_$_tq_$_tq_$_T${C_}0${_C}" + print -P$newline "${C_}$my_color;1${_C}${hbar}$T_$_tq_$_tq_$_tq_$_tq_$_tq_$_T${C_}0${_C}" fi } diff --git a/02_Functions.zsh b/02_Functions.zsh index 78bf7d3..567170a 100644 --- a/02_Functions.zsh +++ b/02_Functions.zsh @@ -41,9 +41,9 @@ when() if [ -s $TODAY_FILE ] then - __preprint "À ne pas manquer" $color[red] ; echo + __preprint "À ne pas manquer" $color[red] cat $TODAY_FILE - __preprint "" $color[red] ; echo + __preprint "" $color[red] echo fi | sed 's/^/ /' } @@ -54,9 +54,9 @@ todo() TODO=${=$(which -p todo | cut -d: -f2)} if [ $($TODO $@ | wc -l) -gt 0 ] then - __preprint "À faire" $color[yellow] && echo + __preprint "À faire" $color[yellow] $TODO $@ --force-colour - __preprint "" $color[yellow] && echo + __preprint "" $color[yellow] echo fi | sed 's/^/ /' } diff --git a/12_Prompts.zsh b/12_Prompts.zsh index f15f9be..248b627 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -369,5 +369,5 @@ PS4="+%N:%i> " #RPS1="%(?;;"$C_$_prompt_colors[error]$_C"%?"$C_$color[none]$_C")" # Ultime : prompt de correction :-) -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] " +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] " diff --git a/13_ZshHighlight.zsh b/13_ZshHighlight.zsh index 93f8e01..d2715f4 100644 --- a/13_ZshHighlight.zsh +++ b/13_ZshHighlight.zsh @@ -44,8 +44,9 @@ ZSH_HIGHLIGHT_STYLES[commandseparator]="none" ZSH_HIGHLIGHT_STYLES[cursor]="bold" -ZSH_HIGHLIGHT_STYLES[single-hyphen-option]="green" -ZSH_HIGHLIGHT_STYLES[double-hyphen-option]="yellow" +ZSH_HIGHLIGHT_STYLES[single-hyphen-option]="fg=blue" +ZSH_HIGHLIGHT_STYLES[double-hyphen-option]="fg=blue,bold" + ZSH_HIGHLIGHT_STYLES[single-quoted-argument]="fg=green,bold" ZSH_HIGHLIGHT_STYLES[double-quoted-argument]="fg=yellow,bold" ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]="fg=blue,bold" diff --git a/99_Exec.zsh b/99_Exec.zsh index 6e5cd07..e6e1db2 100644 --- a/99_Exec.zsh +++ b/99_Exec.zsh @@ -10,9 +10,9 @@ if __cmd_exists fortune then - __preprint "Pensée du jour" && echo + __preprint "Pensée du jour" fortune fr | fmt -s -w 74 - __preprint "" && echo + __preprint echo fi | sed 's/^/ /' diff --git a/net:foret/user:hiegel b/net:foret/user:hiegel deleted file mode 120000 index 1941e64..0000000 --- a/net:foret/user:hiegel +++ /dev/null @@ -1 +0,0 @@ -../user:hugues/
\ No newline at end of file diff --git a/net:sweethome/Environment.zsh b/net:sweethome/Environment.zsh index df7e43c..e57ea11 100644 --- a/net:sweethome/Environment.zsh +++ b/net:sweethome/Environment.zsh @@ -8,7 +8,7 @@ ## these files with or without this notice. ## #export PRINTER=Gertrude -export PRINTER=Gertrude +export PRINTER=Bertha export NNTPSERVER=news.free.fr export MUSICPLAYER=musicplayer diff --git a/user:hiegel b/user:hiegel new file mode 120000 index 0000000..5adfc80 --- /dev/null +++ b/user:hiegel @@ -0,0 +1 @@ +user:hugues
\ No newline at end of file diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh index 6a50329..2863542 100644 --- a/user:hugues/KeyBindings.zsh +++ b/user:hugues/KeyBindings.zsh @@ -223,7 +223,7 @@ do bindkey -M $keymap -s ' ' '\\ ' bindkey -M $keymap -s 'g' 'Q git st .\n' - bindkey -M $keymap -s 'G' 'Q git remote -v update\n' + bindkey -M $keymap -s 'G' 'Q git fetchall\n' bindkey -M $keymap -s 'S' 'Q sudo !!' diff --git a/user:hugues/net:foret/KeyBindings.zsh b/user:hugues/net:foret/KeyBindings.zsh new file mode 100644 index 0000000..ad2d1a3 --- /dev/null +++ b/user:hugues/net:foret/KeyBindings.zsh @@ -0,0 +1,16 @@ +## +## Part of configuration files for Zsh 4 +## by Hugues Hiegel <hugues@hiegel.fr> +## +## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS +## +## You are encouraged to use, modify, and redistribute +## these files with or without this notice. +## + +for keymap in viins vicmd emacs +do + bindkey -M $keymap -s '+' 'Q for i in {1..$(__get_prompt_lines)} ; tput cuu1; export NPROC=$(($NPROC + 1))\n' + bindkey -M $keymap -s '-' 'Q for i in {1..$(__get_prompt_lines)} ; tput cuu1; [ "$NPROC" -gt 0 ] && export NPROC=$(($NPROC - 1)) || unset NPROC\n' +done + @@ -61,6 +61,7 @@ if [ -d $ZDOTDIR ]; then "host:$HOST"\ "sys:$OSNAME"\ "user:$USER"\ + "user:$USER/net:$DOMAIN"\ "user:$SUDO_USER"\ "net:$DOMAIN/host:$HOST"\ "net:$DOMAIN/sys:$OSNAME"\ |