--- a/.bash_aliases	Fri Apr 10 21:26:50 2009 +0000
+++ b/.bash_aliases	Sat Apr 11 05:58:03 2009 +0000
@@ -8,6 +8,7 @@
 alias x='ssh xanadu.astro.princeton.edu'
 
 # Programs
+alias atari='atari800 -height 800 -width 600'
 alias base64='openssl enc -a'
 alias bsr='bigscreen -raAx'
 alias irssi-test='irssi --home=~/irssi-test/'
@@ -16,6 +17,18 @@
 alias vi='vim'
 
 # SSHFS mounts
-alias sharm='sshfs -oreconnect harmonic: ~/harmonic'
+alias junkpile='sshfs -oreconnect,volname=Junkpile srhuston.net:junkpile ~/junkpile'
+alias sharm='sshfs -oreconnect harmonic.srhuston.net: ~/harmonic'
+alias sj='sshfs -oreconnect,volname=Joshua joshua.srhuston.net: ~/joshua'
 alias ssrh='sshfs -oreconnect srhuston.net: ~/srhuston.net'
 alias sx='sshfs -oreconnect xanadu.astro.princeton.edu: ~/xanadu'
+
+# Mac OS X specific
+[[ `uname` == "Darwin" ]] && {
+   alias ls='ls -FG'
+}
+
+# Linux specific
+[[ `uname` == "Linux" ]] && {
+   alias ls='ls --color=auto -F'
+}

--- a/.bashrc	Fri Apr 10 21:26:50 2009 +0000
+++ b/.bashrc	Sat Apr 11 05:58:03 2009 +0000
@@ -15,19 +15,29 @@
    . $HOME/.bash_aliases
 fi
 
+#
 # Environment variables
+#
 export PS1='\h:\w\$ '
+export PAGER=less
 export EDITOR=vim
 
+#
 # Paths
-
+#
 # Standard-ish paths; some of these may be in place already, but if
 # they're not they should probably go near the front of the pack.
-for P in /sbin /usr/sbin /usr/local/sbin /usr/local/bin ; do
+for P in /sbin /usr/sbin /usr/local/bin /usr/local/sbin \
+    /opt/local/bin /opt/local/sbin ; do
    [[ "$PATH" =~ $P ]] || \
    export PATH=${P}${PATH:+:$PATH}
 done
 
+for M in /usr/local/share/man /usr/local/man /opt/local/share/man ; do
+   [[ "$MANPATH" =~ $M ]] || \
+   export MANPATH=${M}${MANPATH:+:$MANPATH}
+done
+
 # Local Perl install
 if [ -d ~/perl ]; then
    [[ "$PERL5LIB" =~ ~/perl ]] || \