# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1394290908 18000
# Node ID 4a5e1b201c1040df1a72967e3b9696851b777f00
# Parent  3f1ead4ba8b456922e44f11c452dda569b8363c7# Parent  2ef13dfead5fd34564c8be993321df2ca6b52690
Minor merge

diff -r 2ef13dfead5f -r 4a5e1b201c10 .bash_profile
--- a/.bash_profile	Mon Mar 03 13:20:31 2014 -0500
+++ b/.bash_profile	Sat Mar 08 10:01:48 2014 -0500
@@ -66,3 +66,23 @@
   echo Local repository contains updates. 
 fi
 hg status
+
+[[ $HOST == cake && "`tty`" == "/dev/tty1" ]] && {
+  # We're on the Raspberry Pi
+  export SDL_NOMOUSE=1
+  if [ ! -e /dev/input/js0 ] ; then
+    # PS3 controller isn't paired yet
+    dialog --infobox "WARNING: PS3 controller not detected.  Please press the PS button to pair.  Ctrl-C on keyboard to skip." 4 55
+    (
+      trap break INT
+      for C in {1..30} ; do
+        sleep 1
+          if [ -e /dev/input/js0 ] ; then
+            break
+          fi
+      done
+    )
+  fi
+  clear
+  /usr/bin/emulationstation
+}
diff -r 2ef13dfead5f -r 4a5e1b201c10 .ssh/config
--- a/.ssh/config	Mon Mar 03 13:20:31 2014 -0500
+++ b/.ssh/config	Sat Mar 08 10:01:48 2014 -0500
@@ -13,13 +13,22 @@
 
 # xanadu-vm and syrinx's keys change, let's try to avoid errors
 Host xanadu-vm syrinx xanadu-vm.astro.princeton.edu syrinx.astro.princeton.edu
+  User huston
   StrictHostKeyChecking no
   ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
 
+# Everything is fine for the Raspberry Pi, just need a different user
+Host cake cake.srhuston.net
+  User pi
+  ForwardAgent yes
+  ForwardX11 yes
+  ForwardX11Trusted yes
+
 # Allow everything for CSES, astro, and home hosts w/ FQDN
 Host cses*.princeton.edu *.astro.princeton.edu *.srhuston.net
+  User huston
   ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
@@ -33,6 +42,7 @@
 # Now allow for anything else - if we're typing a single hostname, it's likely
 # trusted.
 Host *
+  User huston
   ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes