--- a/.bash_aliases	Thu Mar 11 18:31:31 2010 +0000
+++ b/.bash_aliases	Thu Jun 17 16:29:11 2010 +0000
@@ -18,22 +18,32 @@
     # the commands to be evaulated, not the output - you're storing how to get
     # the answer, not the answer itself.
 
-    DFSTAT="stat -f %m -t %s $HOME/.dotfilets"
-    MDATE="date -v -1m +%s"
-    TDSTAT="stat -f %m -t %s $HOME/.todo"
-    HDATE="date -v -1H +%s"
+    # Also note, the full paths are stored since GNU coreutils might be
+    # installed; while that would tend to make things "easier" since the GNU
+    # one is the same as the Linux ones below, it can't be guaranteed.
+    # Instead of checking for the presence of /opt/local/bin/ls (or gls) it's
+    # easier to point directly to the one you know *is* installed.
 
-    alias ls='ls -FG'
+    DFSTAT="/usr/bin/stat -f %m -t %s $HOME/.dotfilets"
+    MDATE="/bin/date -v -1m +%s"
+    TDSTAT="/usr/bin/stat -f %m -t %s $HOME/.todo"
+    HDATE="/bin/date -v -1H +%s"
+
+    alias ls='/bin/ls -FG'
+
+    VNCVIEWER="open vnc://"
     ;;
 
   Linux)
     # See above for a description of these four
-    DFSTAT="stat -c %Y $HOME/.dotfilets"
-    MDATE="date -d \"1 month ago\" +%s"
-    TDSTAT="stat -c %Y $HOME/.todo"
-    HDATE="date -d \"1 hour ago\" +%s"
+    DFSTAT="/usr/bin/stat -c %Y $HOME/.dotfilets"
+    MDATE="/bin/date -d \"1 month ago\" +%s"
+    TDSTAT="/usr/bin/stat -c %Y $HOME/.todo"
+    HDATE="/bin/date -d \"1 hour ago\" +%s"
 
-    alias ls='ls --color=auto -F'
+    alias ls='/bin/ls --color=auto -F'
+
+    VNCVIEWER="vncviewer Shared=1 Fullcolor=1 "
     ;;
 esac
 
@@ -42,19 +52,19 @@
 
 # SSH aliases
 alias dh='ssh srhuston.net'
-alias dvra='ssh dvra@w2zq.com'
 alias j='ssh joshua.srhuston.net'
 alias keys='ssh-add $HOME/.ssh/*.pvt'
 alias r='ssh -l root'
 alias roc='ssh zenoss@rocinante'
 alias s=ssh
+alias sy='ssh syrinx.astro.princeton.edu'
 alias x='ssh xanadu.astro.princeton.edu'
 
 # Remote desktop/VNC
 alias bynarr='rdesktop -a 16 bynarr.astro.princeton.edu -g 1593x1109'
-alias demeter='ssh -L9909:demeter:3389 -f joshua.srhuston.net "/sbin/ether-wake 00:0c:f1:a4:b6:c7 ; sleep 30"; sleep 10; rdesktop -a 16 localhost:9909 -g 1593x1109 &'
-alias harmonic='ssh -L9910:harmonic:5900 -f joshua.srhuston.net "/sbin/ether-wake 00:11:24:3c:3a:e8 ; sleep 30"; sleep 10; vncviewer Shared=1 FullColour=1 localhost:9910 &'
-alias milton='ssh -L9930:milton:5900 -f joshua.srhuston.net "/sbin/ether-wake 00:17:f2:01:d2:3c ; sleep 30"; sleep 10; vncviewer Shared=1 FullColour=1 localhost:9930 &'
+alias harmonic='ssh -L9910:harmonic:5900 -f joshua.srhuston.net "/sbin/ether-wake 00:11:24:3c:3a:e8 ; sleep 30"; sleep 10; ${VNCVIEWER}localhost:9910 &'
+alias milton='ssh -L9930:milton:5900 -f joshua.srhuston.net "/sbin/ether-wake 00:17:f2:01:d2:3c ; sleep 30"; sleep 10; ${VNCVIEWER}localhost:9930 &'
+alias xanadu='ssh -L9920:localhost:5900 -f xanadu.astro.princeton.edu "sleep 300"; ${VNCVIEWER}localhost:9920 &'
 
 # Programs
 alias atari='atari800 -height 800 -width 600'
@@ -72,6 +82,7 @@
 alias sharm="sshfs -oreconnect${DARWIN:+,volname=Harmonic} harmonic.srhuston.net: $HOME/harmonic"
 alias sj="sshfs -oreconnect${DARWIN:+,volname=Joshua} joshua.srhuston.net: $HOME/joshua"
 alias sdh="sshfs -oreconnect${DARWIN:+,volname=srhuston.net} srhuston.net: $HOME/srhuston.net"
+alias ssy="sshfs -oreconnect${DARWIN:+,volname=Syrinx} syrinx.astro.princeton.edu: $HOME/syrinx"
 alias sx="sshfs -oreconnect${DARWIN:+,volname=Xanadu} xanadu.astro.princeton.edu: $HOME/xanadu"
 
 # Other
@@ -80,7 +91,7 @@
 # Functions
 update_toodledo() {
   case `hostname -s` in
-   xanadu|rapture)
+   xanadu|rapture|syrinx)
      TOODLEDO_CMDS="toodledo tasks *Work; toodledo tasks *Personal"
      ;;