5 files changed, 22 insertions, 11 deletions

diff --git a/.zshrc b/.zshrc
index 7de8480..3868a76 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,9 +1,15 @@
 ZDOTDIR=~/.zsh
 
 if [ -d $ZDOTDIR ]; then
-	for script in $ZDOTDIR/*.zsh
+	for script in $ZDOTDIR/??_*.zsh
 	do
 		source $script
+		local_script="${script:r}.`hostname -s`"
+
+		if ( [ -f $local_script ] )
+		then
+			source $local_script
+		fi
 	done
 fi
 
diff --git a/00_Darwin.zsh b/00_Exports.prunelle
index 7a89f1f..7459b82 100644
--- a/00_Darwin.zsh
+++ b/00_Exports.prunelle
@@ -1,6 +1,8 @@
 
 if ( [ "`uname -s`" = "Darwin" ] )
 then
+	export DISPLAY=:0
+
 	## Fink / DarwinPorts
 
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -13,4 +15,9 @@ then
 		export INFOPATH=$INFOPATH:/$i/share/info
 	done
 
+	alias aless='open -a /Applications/DarwinPorts/AquaLess.app'
 fi
+
+PS1_USER="1"
+PS1_USER_SSH="$PS1_USER"
+PS1_ROOT="31;1"
diff --git a/01_Aliases.prunelle b/01_Aliases.prunelle
new file mode 100644
index 0000000..2e2c2e9
--- /dev/null
+++ b/01_Aliases.prunelle
@@ -0,0 +1,3 @@
+a emacs='emacs21'
+a port='sudo port'
+a ls='ls -FG'
diff --git a/01_Aliases.zsh b/01_Aliases.zsh
index 5b08337..1ec93a0 100644
--- a/01_Aliases.zsh
+++ b/01_Aliases.zsh
@@ -41,8 +41,3 @@ a dosbox='dosbox -c "mount c \"`pwd`\"" -c "mount d /cdrom -t cdrom" -c "c:" '
 a gnus='emacs -f gnus'
 
 #a make='make -j'
-
-for local_aliases in $(find $ZDOTDIR -name "*_Aliases.`hostname`")
-do
-	source $local_aliases
-done
diff --git a/02_Zsh.zsh b/02_Zsh.zsh
index 4dac990..54f4561 100644
--- a/02_Zsh.zsh
+++ b/02_Zsh.zsh
@@ -56,17 +56,17 @@ SAVEHIST=42000
 #  For more info on PROMPT expansion, see 'man zshmisc'
 ##
 
-C_ROOT="31"
+PS1_ROOT=${PS1_ROOT:-31}
 if ( [ "$SSH_TTY" = "" ] )
 then
-	C_USER="34"
+	PS1_USER=${PS1_USER:-34}
 else
-	C_USER="35"
+	PS1_USER=${PS1_USER_SSH:-35}
 fi
 
-PS1="%{[%(!."$C_ROOT"."$C_USER")m%}%n%{[1;%(!."$C_ROOT"."$C_USER")m%}@%{[0;%(!."$C_ROOT"."$C_USER")m%}%m%{%} (%{%}%y%{%}) [%(!.%{["$C_ROOT"m%}%d%{%}.%{["$C_USER"m%}%(5~:../:)%4~%{%})]"${LD_PRELOAD:t:s/lib//:r}" %h%{[%(!."$C_ROOT";1."$C_USER")m%}#%{%} "
+PS1="%{[%(!."$PS1_ROOT"."$PS1_USER")m%}%n%{[1;%(!."$PS1_ROOT"."$PS1_USER")m%}@%{[0;%(!."$PS1_ROOT"."$PS1_USER")m%}%m%{%} (%{%}%y%{%}) [%(!.%{["$PS1_ROOT"m%}%d%{%}.%{["$PS1_USER"m%}%(5~:../:)%4~%{%})]"${LD_PRELOAD:t:s/lib//:r}" %h%{[%(!."$PS1_ROOT";1."$PS1_USER")m%}#%{%} "
 
-RPS1="%(?;;%{%}%?%{%}) %{[0;%(!."$C_ROOT"."$C_USER")m%}%D{%a%d%b|%H:%M'%S}%{%}"
+RPS1="%(?;;%{%}%?%{%}) %{[0;%(!."$PS1_ROOT"."$PS1_USER")m%}%D{%a%d%b|%H:%M'%S}%{%}"
 
 PS2="%{%}%B%_%b%{%}%B>%b%{%} "