zsh updates

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/zsh/20_environment b/config/zsh/20_environment
index 1d96c55..30be9fd 100644 (file)
--- a/config/zsh/20_environment
+++ b/config/zsh/20_environment
@@ -17,6 +17,16 @@ export CCACHE_NOCOMPRESS=NoThanks
 export RLWRAP_HOME="$HOME/.cache/rlwrap/"
 export GTK_IM_MODULE=xim
 
+export BROWSER=chromium-browser
+
 export LC_MESSAGES=C
 unset  LC_ALL
 unset  VERBOSE
+
+if [ $UID -eq 0 ]; then
+    PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
+else
+    PATH="${HOME}/local/bin:/usr/lib/ccache:${HOME}/bin:${PATH}"
+    LD_LIBRARY_PATH="${HOME}/local/lib"
+fi
+

diff --git a/config/zsh/50_aliases b/config/zsh/50_aliases
index e2ee5c2..d1f0416 100644 (file)
--- a/config/zsh/50_aliases
+++ b/config/zsh/50_aliases
@@ -3,8 +3,12 @@
 autoload zmv
 alias mmv='noglob zmv -W'
 
-alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
-alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+if test -n "$XAUTHORITY"; then
+    alias su='sudo -E -s'
+else
+    alias su='export XAUTHORITY=${HOME}/.Xauthority ; sudo -s'
+    alias sudo='export XAUTHORITY=${HOME}/.Xauthority ; sudo'
+fi
 
 alias du="du -hcs"
 alias df="df -h"

diff --git a/config/zsh/60_prompt b/config/zsh/60_prompt
index c9a2bde..86dd596 100644 (file)
--- a/config/zsh/60_prompt
+++ b/config/zsh/60_prompt
@@ -56,11 +56,9 @@ $pcc[1]└[$pcc[2]%{%(?..%S)%}%m%s$pcc[1]] $rst"
 }
 
 if [ $UID -eq 0 ]; then
-    PATH=~root/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
     PROMPT="%{$reset_color$fg_bold[yellow]%}[%{$fg_bold[red]%}%n %m%{$fg_bold[yellow]%}]%{$reset_color%} "
     RPROMPT="%{$reset_color$fg_no_bold[red]%}(%{$fg_bold[red]%}%~%{$fg_no_bold[red]%})%{$reset_color%} "
 else
-    PATH="/usr/lib/ccache:${HOME}/bin:${PATH}"
     _mad_prompt_setup
 fi