diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-03-06 15:28:17 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-03-06 15:28:17 +0100 |
| commit | 83effd6c347244c05be63b59749b92904dea67da (patch) | |
| tree | c8fc4ab9aadf23d70d8740f97416e4b1ddfd9b85 | |
| parent | 393ec88f6cdaa55f663fe22225257d79ed191981 (diff) | |
| parent | c279bd73eefcffca0bc032d28142f05050f40396 (diff) | |
Merge branch 'master' of /work/repos/zdotdir
| l--------- | net:eurodec/Prompts.zsh | 1 | ||||
| -rw-r--r-- | net:osn.sagem/Prompts.zsh | 13 | ||||
| -rw-r--r-- | net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh | 10 | ||||
| -rw-r--r-- | user:hugues/Aliases.zsh | 4 | ||||
| -rw-r--r-- | user:hugues/Environment.zsh | 2 |
5 files changed, 25 insertions, 5 deletions
diff --git a/net:eurodec/Prompts.zsh b/net:eurodec/Prompts.zsh new file mode 120000 index 0000000..3cf29e6 --- /dev/null +++ b/net:eurodec/Prompts.zsh @@ -0,0 +1 @@ +../net:osn.sagem/Prompts.zsh
\ No newline at end of file diff --git a/net:osn.sagem/Prompts.zsh b/net:osn.sagem/Prompts.zsh new file mode 100644 index 0000000..eae5bfa --- /dev/null +++ b/net:osn.sagem/Prompts.zsh @@ -0,0 +1,13 @@ + +redisplay_prompt () +{ + # Reprise du redisplay_prompt officiel + ajout du mode workset + + local KERNEL_MODE + [ -e ../../kernel_mode.txt ] && KERNEL_MODE="$C_$color[bg-black];$color[blue]$_C `cat ../../kernel_mode.txt` $C_$prompt_colors[generic]$_C " + + PS1="$AGENTS""$MAILSTAT""$ERROR""$BATTERY"$C_$prompt_colors[bar]$_C"$HBAR""$DATE +"$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m $CURDIR$SVNREV$GITBRANCH $KERNEL_MODE"$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" " +} + + diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh index 7c15a49..26ddb04 100644 --- a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh +++ b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh @@ -43,5 +43,11 @@ hash -d K:=/media/osn01001/Projets_STB hash -d J:=/media/osn02001/Echanges # proxy -export http_proxy="http://190.99.3.97:3128" -export ftp_proxy=$http_proxy +if cmd_exists tsocks +then + . tsocks -on +else + export http_proxy="http://190.99.3.97:3128" + export ftp_proxy=$http_proxy +fi + diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh index 14d70fb..2e696a4 100644 --- a/user:hugues/Aliases.zsh +++ b/user:hugues/Aliases.zsh @@ -27,9 +27,9 @@ then if ( vim --version | grep -E "+clientserver" >/dev/null ) then - if ( cmd_exists vimtab ) + if ( cmd_exists vims ) then - a vim='vimtab' + a vim='vim --servername `print -P "%l"`' fi fi fi diff --git a/user:hugues/Environment.zsh b/user:hugues/Environment.zsh index 2e4d302..8b5dc64 100644 --- a/user:hugues/Environment.zsh +++ b/user:hugues/Environment.zsh @@ -15,7 +15,7 @@ export BC_ENV_ARGS="-q" ## Editeur par défaut -export EDITOR=`which vim || which vi || which emacs` +export EDITOR=`which -p vim || which -p vi || which -p emacs` export VISUAL=$EDITOR export FCEDIT=$EDITOR |