diff options
author | hugues <hugues@a0e5b806-a6f9-0310-978d-cbce73f8a913> | 2006-03-25 18:34:38 +0000 |
---|---|---|
committer | Hugues Hiegel <hugues@hiegel.fr> | 2008-03-07 14:15:06 +0100 |
commit | e4e8c8796df24f8139f708ea160c46947116d9db (patch) | |
tree | 77eb8e0e881161a18df7c35a040dbfb8f2ff78b9 | |
parent | 8324d996a93cdc42cf9a97a3794c414b93c3c8fd (diff) |
Mise à jour de la conf Zsh multi-hosts
git-svn-id: svn+ssh://hugues@maison/opt/svn/private/hugues@175 a0e5b806-a6f9-0310-978d-cbce73f8a913
-rw-r--r-- | .zshrc | 8 | ||||
-rw-r--r-- | 00_Exports.prunelle (renamed from 00_Darwin.zsh) | 7 | ||||
-rw-r--r-- | 01_Aliases.prunelle | 3 | ||||
-rw-r--r-- | 01_Aliases.zsh | 5 | ||||
-rw-r--r-- | 02_Zsh.zsh | 10 |
5 files changed, 22 insertions, 11 deletions
@@ -1,9 +1,15 @@ ZDOTDIR=~/.zsh if [ -d $ZDOTDIR ]; then - for script in $ZDOTDIR/*.zsh + for script in $ZDOTDIR/??_*.zsh do source $script + local_script="${script:r}.`hostname -s`" + + if ( [ -f $local_script ] ) + then + source $local_script + fi done fi diff --git a/00_Darwin.zsh b/00_Exports.prunelle index 7a89f1f..7459b82 100644 --- a/00_Darwin.zsh +++ b/00_Exports.prunelle @@ -1,6 +1,8 @@ if ( [ "`uname -s`" = "Darwin" ] ) then + export DISPLAY=:0 + ## Fink / DarwinPorts PATH=/bin:/usr/bin:/sbin:/usr/sbin @@ -13,4 +15,9 @@ then export INFOPATH=$INFOPATH:/$i/share/info done + alias aless='open -a /Applications/DarwinPorts/AquaLess.app' fi + +PS1_USER="1" +PS1_USER_SSH="$PS1_USER" +PS1_ROOT="31;1" diff --git a/01_Aliases.prunelle b/01_Aliases.prunelle new file mode 100644 index 0000000..2e2c2e9 --- /dev/null +++ b/01_Aliases.prunelle @@ -0,0 +1,3 @@ +a emacs='emacs21' +a port='sudo port' +a ls='ls -FG' diff --git a/01_Aliases.zsh b/01_Aliases.zsh index 5b08337..1ec93a0 100644 --- a/01_Aliases.zsh +++ b/01_Aliases.zsh @@ -41,8 +41,3 @@ a dosbox='dosbox -c "mount c \"`pwd`\"" -c "mount d /cdrom -t cdrom" -c "c:" ' a gnus='emacs -f gnus' #a make='make -j' - -for local_aliases in $(find $ZDOTDIR -name "*_Aliases.`hostname`") -do - source $local_aliases -done @@ -56,17 +56,17 @@ SAVEHIST=42000 # For more info on PROMPT expansion, see 'man zshmisc' ## -C_ROOT="31" +PS1_ROOT=${PS1_ROOT:-31} if ( [ "$SSH_TTY" = "" ] ) then - C_USER="34" + PS1_USER=${PS1_USER:-34} else - C_USER="35" + PS1_USER=${PS1_USER_SSH:-35} fi -PS1="%{[%(!."$C_ROOT"."$C_USER")m%}%n%{[1;%(!."$C_ROOT"."$C_USER")m%}@%{[0;%(!."$C_ROOT"."$C_USER")m%}%m%{[0m%} (%{[36m%}%y%{[0m%}) [%(!.%{["$C_ROOT"m%}%d%{[0m%}.%{["$C_USER"m%}%(5~:../:)%4~%{[0m%})]"${LD_PRELOAD:t:s/lib//:r}" %h%{[%(!."$C_ROOT";1."$C_USER")m%}#%{[0m%} " +PS1="%{[%(!."$PS1_ROOT"."$PS1_USER")m%}%n%{[1;%(!."$PS1_ROOT"."$PS1_USER")m%}@%{[0;%(!."$PS1_ROOT"."$PS1_USER")m%}%m%{[0m%} (%{[36m%}%y%{[0m%}) [%(!.%{["$PS1_ROOT"m%}%d%{[0m%}.%{["$PS1_USER"m%}%(5~:../:)%4~%{[0m%})]"${LD_PRELOAD:t:s/lib//:r}" %h%{[%(!."$PS1_ROOT";1."$PS1_USER")m%}#%{[0m%} " -RPS1="%(?;;%{[1;32m%}%?%{[0m%}) %{[0;%(!."$C_ROOT"."$C_USER")m%}%D{%a%d%b|%H:%M'%S}%{[0m%}" +RPS1="%(?;;%{[1;32m%}%?%{[0m%}) %{[0;%(!."$PS1_ROOT"."$PS1_USER")m%}%D{%a%d%b|%H:%M'%S}%{[0m%}" PS2="%{[33m%}%B%_%b%{[36m%}%B>%b%{[0m%} " |