hand merge to resolve _zshrc conflict

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index dd762ec5079f9c75255bffe01b8cbc1f86ff5851..fc238a3f8a656a67b3c739a3ce1d4264855544fe 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -22,6 +22,9 @@ if [ -f "$HOME/.ssh/known_hosts" ]; then
     _cache_hosts=(`perl -ne  'if (/^([a-zA-Z0-9.-]+)/) { print "$1\n";}' ~/.ssh/known_hosts`)
 fi
 
+autoload -U colors
+colors
+
 setopt no_beep
 setopt auto_cd
 setopt auto_list
@@ -53,8 +56,15 @@ function _we_are_in_gnu_screen () {
     [ "$WINDOW" != "" ]
 }
 
-PROMPT=$'%{\ek\e\\%}%B[%n@%m] %#%b '
-RPROMPT='%U%?%u %U%D{%m/%d}%u %U%D{%T}%u %U%~%u'
+_prompt_base='%{%(?.$fg[green].$fg[red])%}%B[%n@%m] %#%b %{$reset_color%}'
+if ( _we_are_in_gnu_screen ); then
+    PROMPT=$'%{\ek\e\\%}'$_prompt_base
+else
+    PROMPT=$_prompt_base
+fi
+
+RPROMPT='%U%D{%m/%d}%u %U%D{%T}%u %U%~%u'
+
 HISTFILE="$HOME/.zhistory"
 HISTSIZE=6000000
 SAVEHIST=6000000
@@ -66,10 +76,10 @@ alias -g T="| tail"
 
 alias ..='cd ..'
 alias cd..='cd ..'
-alias ls='ls -wF'
-alias la='ls -wa'
-alias l='ls -wl'
-alias lls='ls -wla'
+alias ls='ls -F'
+alias la='ls -a'
+alias l='ls -l'
+alias lls='ls -la'
 alias p='pushd'
 alias o='popd'
 alias d='dirs'