Merge branch 'master' of ssh://www@nem.cielonegro.org/home/www/git.cielonegro.org...

diff --git a/IGNORE b/IGNORE
index 6a1545a6d75efd6875f4d6481bca4abf39b7bcec..181a7262366bc761a5b08c21b629a71ced490bca 100644 (file)
--- a/IGNORE
+++ b/IGNORE
@@ -94,6 +94,7 @@
 .skk-*
 .snes*
 .ssh
+.texmf-var
 .thumbnails
 .thunderbird
 .tome

diff --git a/dot-files/_nethackrc b/dot-files/_nethackrc
index dcd742bdac09d4c7d64d1de6ce6e8c8aeca0cc82..51bf67335239477cb69aa439b6a1be38b72e23a5 100644 (file)
--- a/dot-files/_nethackrc
+++ b/dot-files/_nethackrc
@@ -2,7 +2,7 @@ OPTIONS=autodig
 OPTIONS=!cmdassist
 OPTIONS=color
 OPTIONS=DECgraphics
-OPTIONS=extmenu
+#OPTIONS=extmenu
 OPTIONS=fruit:mango
 OPTIONS=gender:female
 OPTIONS=hilite_pet

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index dd762ec5079f9c75255bffe01b8cbc1f86ff5851..8b95b52ba3bf87513e9ed35f14a15c5b3937c082 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,17 @@ 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='%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"
 HISTSIZE=6000000
 SAVEHIST=6000000
@@ -66,10 +78,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'