auditing. Little cleanup, minor fixes etc.

7 files changed, 17 insertions, 9 deletions

diff --git a/etc/alias/default b/etc/alias/default
index 96dae78..e13d102 100644
--- a/etc/alias/default
+++ b/etc/alias/default
@@ -41,7 +41,7 @@ alias man='man -a'
 
 # Useful on sshfs or similar
 # FIXME: this sucks for streams
-alias mplayer='mplayer -cache 6000 -cache-min 50'
+#alias mplayer='mplayer -cache 6000 -cache-min 50'
 
 alias mv='mv -i'
 
diff --git a/etc/alias/suffix b/etc/alias/suffix
index 30c96c8..e5c2b74 100644
--- a/etc/alias/suffix
+++ b/etc/alias/suffix
@@ -5,7 +5,7 @@
 # List of filetypes covered by aliases
 filetypes=(archive audio midi video image document raw office emul)
 
-# Formats
+# File extensions
 archive_formats=(tar.bz2 tar.gz tar bz2 gz zip rar)
 audio_formats=(flac mp3 ogg wav wma)
 midi_formats=(mid s3m)
diff --git a/etc/directories b/etc/directories
index 7f2411c..634af2c 100644
--- a/etc/directories
+++ b/etc/directories
@@ -9,7 +9,7 @@ case `hostname` in
 		export vcs=/data/derf/svn
 	;;
 	saviour)
-		music=$HOME/audio
+		music=$HOME/lib/audio
 		www=/var/www
 		cgi=/usr/lib/cgi-bin
 		export lyrics=$HOME/packages/lyrics
@@ -17,6 +17,6 @@ case `hostname` in
 	;;
 	nemesis)
 		export vcs=$HOME/var/svn
-		export lyrics=$vcs/lyrics
+		export lyrics=$HOME/packages/lyrics
 esac
 svn=$vcs
diff --git a/etc/options b/etc/options
index 977e993..28b3654 100644
--- a/etc/options
+++ b/etc/options
@@ -1,19 +1,27 @@
 ## Some useful options, see zshoptions(1)
 ## vim:ft=zsh
+
 # Automatically use 'pushd' when cd'ing into a directory 
 # so I can use popd or 'cd -1' to get back where I came from.
 # And don't print the stack everytime using popd.
 setopt auto_pushd pushd_ignore_dups pushd_minus pushd_silent
-# enter "foobar/" to cd foobar, and "derf" to cd ~derf
+
+# enter "foobar" to cd foobar, and "derf" to cd ~derf
 setopt auto_cd cdable_vars
+
 # Try to correct typos in command names
 setopt correct
+
 # echo 'foo''bar''' will become foo'bar'
 setopt rc_quotes
+
 # Alert me in case of non-zero exit status
 setopt print_exit_value
+
 # Accidently hitting ^s sucks (alternative: `stty -ixon`)
 unsetopt flow_control
-# And having to escape "!" everytime does, too
+
+# And having to escape "!" everytime does, too (plus, I like ^r more)
 unsetopt bang_hist
+
 unsetopt beep
diff --git a/etc/prompt b/etc/prompt
index 5c98e16..b45b35f 100644
--- a/etc/prompt
+++ b/etc/prompt
@@ -1,6 +1,6 @@
 ## Prompt
 ## vim:ft=zsh
 # RPS1 is on the right side of the terminal
-# The \ek\e\\ is for screens 'shelltitle' command
+# The \ek\e\\ is for screen's 'shelltitle'
 export PS1="${ps_yellow}%n@%m${ps_reset} %c %(!.${ps_red}#.${ps_green}>)${ps_reset} "$'%{\ek\e\\%}'
 export RPS1="${ps_yellow}[${ps_info}${pstags}${ps_yellow}%T]${ps_reset}"
diff --git a/etc/rc b/etc/rc
index 1f86911..1736295 100644
--- a/etc/rc
+++ b/etc/rc
@@ -26,7 +26,7 @@ source $ZDIR/alias/short
 source $ZDIR/completion
 
 ## misc
-bindkey -e # EMACS bindings
+bindkey -e
 ls-colors: eval $(dircolors -b $HOME/packages/zsh/etc/dircolors)
 [ -r /tmp/envstore-raw-$UID ] && . /tmp/envstore-raw-$UID
 mesg n
diff --git a/etc/variables b/etc/variables
index 733d1c3..205318d 100644
--- a/etc/variables
+++ b/etc/variables
@@ -6,9 +6,9 @@ HISTSIZE=50000
 SAVEHIST=$HISTSIZE
 DIRSTACKSIZE=20
 LISTMAX=0
-fpath=($ZDIR/functions $ZDIR/completions $fpath)
 
 # Paths
+fpath=($ZDIR/functions $ZDIR/completions $fpath)
 [ "$path[1]" = "$HOME/bin" ] || export PATH=$HOME/bin:$PATH
 linux: [ -z "$MANPATH" ] && export MANPATH=$(manpath):$HOME/packages/.collected/man