X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshrc;h=b5a69ac9caed0bd59fdb8b392446eeaaa69f806b;hb=92dfa10e154132eae59ac213d644aa128e886287;hp=25a5ee636e85c39bbcc1afddc5ea483148b9f556;hpb=5641038a48121c118e0632132af50e268ef268c9;p=sugar.git

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 25a5ee6..b5a69ac 100644
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -52,7 +52,19 @@ setopt hist_ignore_space
 setopt inc_append_history
 setopt share_history
 
-PROMPT=$'%{\ek\e\\%}%{%(?.$fg[green].$fg[red])%}%B[%n@%m] %#%b %{$reset_color%}'
+function _we_are_in_gnu_screen () {
+    [ "$WINDOW" != "" ]
+}
+
+_prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
+if ( _we_are_in_gnu_screen ); then
+    # Magic escape sequence for GNU Screen to update their titles
+    # dynamically by grabbing prompt line.
+    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"
@@ -66,10 +78,6 @@ alias -g T="| tail"
 
 alias ..='cd ..'
 alias cd..='cd ..'
-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'
@@ -81,6 +89,7 @@ alias mwget="wget --user-agent='Mozilla/1.4b'"
 alias pstow="pushd /usr/local/stow"
 alias w3m="w3m -O UTF-8"
 alias w3mb="w3m -O UTF-8 -B"
+alias pkgsrc="pushd /usr/pkgsrc"
 
 if [ $(hostname) = "aria.cielonegro.org" ]; then
     alias safari="open -a Safari"
@@ -92,6 +101,16 @@ fi
 
 if [ $(uname) = "Darwin" ]; then
     alias ldd="otool -L"
+
+    alias ls='ls -Fw'
+    alias la='ls -aw'
+    alias l='ls -lw'
+    alias lls='ls -law'
+else
+    alias ls='ls -F'
+    alias la='ls -a'
+    alias l='ls -l'
+    alias lls='ls -la'
 fi
 
 # The following lines were added by compinstall