Mercurial > index.cgi > dotfiles
changeset 106:4a5e1b201c10
Minor merge
| author | Steve Huston <huston@astro.princeton.edu> |
|---|---|
| date | Sat, 08 Mar 2014 10:01:48 -0500 |
| parents | 3f1ead4ba8b4 (diff) 2ef13dfead5f (current diff) |
| children | b955aa106b9a |
| files | |
| diffstat | 2 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 +}
--- 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