Merge branch 'master' of ssh://animus.robocracy.org/srv/git/dotfiles

Conflicts:
	.fluxbox/init
	.xinitrc
	todo

17 files changed, 299 insertions, 63 deletions

diff --git a/.addressbook b/.addressbook
deleted file mode 100644
index bf111b8..0000000
--- a/.addressbook
+++ /dev/null
@@ -1,14 +0,0 @@
-jane		jhnewbold@gmail.com
-cbis	Bisignani, Christopher T	Christopher T Bisignani <cbis@MIT.EDU>
-sari	Canelake, Sari A	Sari A Canelake <sarina@MIT.EDU>
-elliot	elliot t	elliotogozoto@gmail.com
-mom	Hunter, Maxine	Maxine Hunter <newbold_hunter@yahoo.com>
-jerry	jerry whiting	jerry@azalea.com
-elisabeth	lex, elisabeth rice	elisabeth rice lex <elex@MIT.EDU>
-lily	lillian mooney	limooney@vassar.edu
-	Mike Haimes	mhaimes@mit.edu
-dad	Newbold, Dave	Dave Newbold <dnewbold@us.ibm.com>
-rob	rob winikates	rwinikat@fas.harvard.edu
-pradeep	Sarin, Pradeep	Pradeep Sarin <sarin@MIT.EDU>
-sami	Shalabi, Sami	Sami Shalabi <shalabi@alum.mit.edu>
-tom	tom schilling	tom.schilling@gmail.com
diff --git a/.edwin b/.edwin
new file mode 100644
index 0000000..00e31c6
--- /dev/null
+++ b/.edwin
@@ -0,0 +1,3 @@
+
+;;; I have M-TAB set to change the active GUI window
+(define-key 'Scheme #\s-tab 'scheme-complete-variable)
diff --git a/.fluxbox/init b/.fluxbox/init
index 79c43fe..27ab56a 100644
--- a/.fluxbox/init
+++ b/.fluxbox/init
@@ -3,6 +3,16 @@ session.screen0.titlebar.left:	Stick
 session.screen0.titlebar.right:	Minimize Maximize Close 
 session.screen0.window.focus.alpha:	255
 session.screen0.window.unfocus.alpha:	255
+session.screen0.tab.alignment:	Left
+session.screen0.tab.rotatevertical:	true
+session.screen0.tab.placement:	TopLeft
+#session.screen0.tab.width:	64
+#session.screen0.tab.height:	10
+session.screen0.slit.onHead:	0
+session.screen0.slit.direction:	Vertical
+session.screen0.slit.alpha:	255
+session.screen0.slit.maxOver:	false
+session.screen0.slit.autoHide:	true
 session.screen0.slit.onhead:	0
 session.screen0.slit.placement:	BottomRight
 session.screen0.slit.onTop:	false
diff --git a/.fluxbox/styles/TheGreen b/.fluxbox/styles/TheGreen
new file mode 100644
index 0000000..74cd8a4
--- /dev/null
+++ b/.fluxbox/styles/TheGreen
@@ -0,0 +1,53 @@
+
+*focus:				flat gradient vertical
+*unfocus:			flat gradient vertical
+
+*colorTo:			rgb:70/70/70
+*color:				rgb:8A/8A/8A
+
+
+*focus.color:			rgb:5B/C8/5B
+*focus.colorTo:			rgb:36/A1/36
+
+*pressed:			Sunken gradient vertical
+
+borderWidth:			1
+borderColor:			black
+frameWidth:			0
+handleWidth:			0
+
+toolbar:                        flat gradient vertical
+toolbar.label:                  flat gradient vertical
+toolbar.button:                 flat gradient vertical
+toolbar.button.pressed:         sunken gradient vertical
+toolbar.clock:			flat gradient vertical
+toolbar.bevelWidth:		0
+toolbar.height: 11
+
+menu.title:			flat gradient vertical
+menu.title.color:		rgb:5B/C8/5B
+menu.title.colorTo:		rgb:36/A1/36
+
+menu.frame:			flat gradient vertical
+menu.hilite:			flat solid
+menu.hilite.color:		rgb:60/60/60
+menu.bullet:			triangle
+menu.bullet.position:		right
+menu.itemHeight:         0
+
+window.button.pressed:		sunken gradient vertical
+window.button.pressed.color:	rgb:5B/C8/5B
+window.button.pressed.colorTo:	rgb:36/A1/36
+window.button.focus.picColor:	black
+window.button.unfocus.picColor: black
+
+
+window.justify:			center
+window.bevelWidth:		2
+window.title.height:    15
+
+background: solid
+background.color: rgb:54/54/54
+
+*textColor:			black
+*Font:				-*-lucidatypewriter-medium-r-*-*-10-*-*-*-*-*-*-*
diff --git a/.ipython/ipythonrc-scipy-bnewbold b/.ipython/ipythonrc-scipy-bnewbold
deleted file mode 100644
index cff8f4a..0000000
--- a/.ipython/ipythonrc-scipy-bnewbold
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: Shell-Script -*-  Not really, but shows comments correctly
-#***************************************************************************
-#
-# Configuration file for ipython -- ipythonrc format
-#
-# The format of this file is one of 'key value' lines.
-# Lines containing only whitespace at the beginning and then a # are ignored
-# as comments. But comments can NOT be put on lines with data.
-#***************************************************************************
-
-# This is an example of a 'profile' file which includes a base file and adds
-# some customizaton for a particular purpose.
-
-# If this file is found in the user's ~/.ipython directory as ipythonrc-scipy,
-# it can be loaded by calling passing the '-profile scipy' (or '-p scipy')
-# option to IPython.
-
-# This example is meant to load several modules to turn ipython into a very
-# capable environment for high-end numerical work, similar to IDL or MatLab
-# but with the beauty of the Python language.
-
-# load our basic configuration with generic options
-include ipythonrc
-
-# import ...
-# Load SciPy by itself so that 'help scipy' works
-import_mod scipy pylab
-
-# from ... import ...
-import_some
-
-# Now we load all of SciPy
-# from ... import *
-import_all scipy IPython.numutils pylab
-
-# code 
-# execute print 'Welcome to the SciPy Scientific Computing Environment.'
-
-######## CHANGED -bnewbold
-#execute scipy.alter_numeric()
-
-
-
-# File with alternate printer system for Numeric Arrays.
-# Files in the 'Extensions' directory will be found by IPython automatically
-# (otherwise give the explicit path):
-execfile Extensions/numeric_formats.py jlab/stats.py jlab/importdata.py jlab/plotting.py
diff --git a/.ispell_american b/.ispell_american
new file mode 100644
index 0000000..9729758
--- /dev/null
+++ b/.ispell_american
@@ -0,0 +1,5 @@
+commutator
+foundational
+Newbold
+screenshot
+Weyl
diff --git a/.ispell_default b/.ispell_default
new file mode 100644
index 0000000..38e83a0
--- /dev/null
+++ b/.ispell_default
@@ -0,0 +1,63 @@
+al
+Azcarraga
+bnewbold
+Breitenbach
+Buzek
+ccc
+cgs
+cohomology
+commutator
+diagonalized
+documentclass
+DOI
+Drummond
+eds
+eigenspace
+Elsevier
+Engel
+Eq
+esu
+Europhysics
+eV
+Ficek
+Fock
+Franken
+Glauber's
+gm
+hbar
+Hirota
+Hollber
+iconography
+Izquierdo
+Jaekel
+Jaffe
+Jaffe's
+JN
+Katz
+keepaspectratio
+Konstanz
+Leonhardt
+LIGO
+MUS
+Newbold
+Noam
+nonclassical
+Num
+observable's
+observables
+opto
+Phd
+Phys
+Reynaud
+sec
+sech
+Slusher
+SNR
+SQL
+Styer
+Universitat
+unsqueezed
+Von
+Weyl
+WH
+Yuen
diff --git a/.profile b/.profile
index deae019..0aaa8df 100644
--- a/.profile
+++ b/.profile
@@ -32,3 +32,4 @@ esac
 
 alias ls="ls -G"
 alias xterm_="xterm -rv +sb -ls"
+alias scipy = "ipython -pylab"
diff --git a/.screenrc b/.screenrc
new file mode 100644
index 0000000..3337674
--- /dev/null
+++ b/.screenrc
@@ -0,0 +1 @@
+startup_message off
diff --git a/.vim/ftdetect/fortress.vim b/.vim/ftdetect/fortress.vim
new file mode 100644
index 0000000..cbb6329
--- /dev/null
+++ b/.vim/ftdetect/fortress.vim
@@ -0,0 +1,4 @@
+au BufNewFile,BufRead *.fsi,*.fss set ft=fortress
+au BufNewFile,BufRead *.fsi,*.fss set expandtab
+au BufNewFile,BufRead *.fsi,*.fss set softtabstop=4
+au BufNewFile,BufRead *.fsi,*.fss set shiftwidth=4
diff --git a/.vim/syntax/fortress.vim b/.vim/syntax/fortress.vim
new file mode 100644
index 0000000..13aacbb
--- /dev/null
+++ b/.vim/syntax/fortress.vim
@@ -0,0 +1,90 @@
+" Vim syntax file
+" Language:     Fortress
+" Filenames:    *.fsi *.fss
+" Maintainers:  Jon Rafkind <rafkind@cs.utah.edu>
+" URL:          http://www.cs.utah.edu/~rafkind
+" Last Change:  2008 May 20 - Initial version
+
+" Some stuff stolen from ocaml.vim
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax") && b:current_syntax == "fortress"
+  finish
+endif
+
+" syn region   fortressComment start="(\*)" end="\\$" end="$"
+syn region   fortressComment start="(\*" end="\*)" contains=fortressComment
+syn match    fortressLineComment "(\*).*"
+syn match    fortressEnd    "\<end\>"
+
+" syn match    fortressKeyword "\<getter\>"
+syn keyword  fortressKeyword getter else var test
+syn keyword  fortressExternal import export
+
+syn region   fortressString       start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match    fortressChar         "'.'"
+syn match    fortressNumber       "\<-\=\d\(_\|\d\)*"
+
+syn keyword  fortressType  api object trait value
+syn keyword  fortressType  extends abstract comprises
+syn keyword  fortressType  grammar component
+syn keyword  fortressType  Any Boolean String self
+syn keyword  fortressType  Char
+syn keyword  fortressType  ZZ32 ZZ64 RR32 RR64 ZZ
+
+syn keyword  fortressOperator println
+
+syn keyword  fortressKeyword opr for private asif throw
+
+syn match    fortressThenErr    "\<then\>"
+syn match    fortressCaseErr    "\<case\>"
+syn match    fortressCatchErr    "\<catch\>"
+syn match    fortressTypecaseErr    "\<of\>"
+
+syn region   fortressNone matchgroup=fortressKeyword start="\<if\>" matchgroup=fortressKeyword end="\<then\>" contains=ALLBUT,fortressThenErr nextgroup=fortressIf
+syn region   fortressIf matchgroup=fortressKeyword start="\<elif\>" matchgroup=fortressKeyword end="\<then\>" contains=ALLBUT,fortressThenErr nextgroup=fortressIf
+syn region   fortressIf matchgroup=fortressKeyword start="\<then\>" matchgroup=fortressKeyword end="\<end\>" contains=ALLBUT,fortressThenErr
+
+syn region   fortressNone matchgroup=fortressKeyword start="\<case\>" matchgroup=fortressKeyword end="\<of\>" contains=ALLBUT,fortressCaseErr nextgroup=fortressCase
+syn region   fortressCase matchgroup=fortressKeyword start="\<in\>" matchgroup=fortressKeyword end="\<end\>" contains=ALLBUT,fortressCaseErr
+
+syn region   fortressNone matchgroup=fortressKeyword start="\<typecase\>" matchgroup=fortressKeyword end="\<of\>" contains=ALLBUT,fortressTypecaseErr nextgroup=fortressTypecase
+syn region   fortressTypecase matchgroup=fortressKeyword start="\<of\>" matchgroup=fortressKeyword end="\<end\>" contains=ALLBUT,fortressEndErr
+
+syn region   fortressNone matchgroup=fortressKeyword start="\<try\>" matchgroup=fortressKeyword end="\<catch\>" contains=ALLBUT,fortressCatchErr nextgroup=fortressCatch
+syn region   fortressCatch matchgroup=fortressKeyword start="\<catch\>" matchgroup=fortressKeyword end="\<end\>" contains=ALLBUT,fortressEndErr
+
+syn region   fortressNone matchgroup=fortressKeyword start="\<do\>" matchgroup=fortressKeyword end="\<end\>" contains=ALLBUT,fortressEndErr
+
+syn region   fortressApi matchgroup=fortressModule start="\<api\>" matchgroup=fortressModule end="\<end\>" contains=ALLBUT,fortressEndErr
+syn region   fortressObject matchgroup=fortressModule start="\<object\>" matchgroup=fortressModule end="\<end\>" contains=ALLBUT,fortressEndErr
+syn region   fortressTrait matchgroup=fortressModule start="\<trait\>" matchgroup=fortressModule end="\<end\>" contains=ALLBUT,fortressEndErr
+syn region   fortressComponent matchgroup=fortressModule start="\<component\>" matchgroup=fortressModule end="\<end\>" contains=ALLBUT,fortressEndErr
+
+if version >= 508 || !exists("did_fortress_syntax_inits")
+  if version < 508
+    let did_fortress_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink fortressComment	   Comment
+  HiLink fortressLineComment	   Comment
+  HiLink fortressKeyword	   Keyword
+  HiLink fortressExternal          Include
+  HiLink fortressType		   Type
+  HiLink fortressOperator	   Operator
+  HiLink fortressEnd               Statement
+
+  HiLink fortressString	           String
+  HiLink fortressChar	           String
+  HiLink fortressNumber	           Number
+  
+  HiLink fortressThenErr	   Error
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "fortress"
diff --git a/.vimrc b/.vimrc
index 6913c2f..a87b141 100644
--- a/.vimrc
+++ b/.vimrc
@@ -17,3 +17,6 @@ set expandtab
 set autoindent
 
 autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class
+
+" for Project Fortress
+au BufNewFile,BufRead *.fsi,*.fss set ft=fortress
diff --git a/bin/getwifi b/bin/getwifi
new file mode 100755
index 0000000..04a7778
--- /dev/null
+++ b/bin/getwifi
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+ifconfig eth0 down
+ifconfig eth1 down
+iwconfig eth1 txpower on
+dhclient eth1
diff --git a/bin/killwifi b/bin/killwifi
new file mode 100755
index 0000000..c10607c
--- /dev/null
+++ b/bin/killwifi
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ifconfig eth1 down
+iwconfig eth1 txpower off
diff --git a/bin/startsynergy b/bin/startsynergy
new file mode 100755
index 0000000..cb831fd
--- /dev/null
+++ b/bin/startsynergy
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ssh -L 24800:snark:24800 snark &
+synergyc localhost
diff --git a/src/.stub b/src/.stub
new file mode 100644
index 0000000..84df427
--- /dev/null
+++ b/src/.stub
@@ -0,0 +1,2 @@
+This directory is for (mostly) unedited third party source code.
+This stub file is so that git will recognize the directory.
diff --git a/todo b/todo
index 0454a6d..2c19785 100644
--- a/todo
+++ b/todo
@@ -1,5 +1,53 @@
-the international
-choke
+http://dsc.discovery.com/videos/prototype-this-couch-mobile-ride.html
+http://dsc.discovery.com/videos/prototype-this-six-legged-atv.html
+http://dsc.discovery.com/videos/prototype-this-traffic-busting-truck.html
+
+
+projections:
+ color photo finder
+ fix natural unit number finder
+ real time photo of visitor -> database photo? style?
+
+solid state density?
+email sahughes
+
+SICP readings for 6.945: get from okie?
+
+i no longer hear the music (the kinks?)
+
+notes from 4.602 on 2/9/9:
+development of urban grids from roman garrison towns (paris, britain)
+------------------
+only show appropriate entries/artifacts on journal (eg authentication)
+
+hole up somewhere plan:
+$$$ flights to morocco, iceland, paris, zurick, sf, seattle, etc?
+christine, seo, lily, mike, 
+
+install docutils
+
+look up ref 11:
+Foundations of Applied Superconductivity (1991, Orlando and Delin)
+50 nH vs 1 nH
+
+Reduced Complexity Decoding of Coded Pulse-Position Modulation Using Partial Statistics
+The Interplanetary Network Progress Report (2005)
+
+---------------------------------------
+
+sage math olpc
+
+blog concept: write emails to dead or fictional figures in character, eg
+    asking questions, and see if the account owner responds
+
+need tools to tinker with human brain, nervous system
+
+video-pedia: allow collaborative editing of informative video. multiple
+    lengths, versions for each topic? what would everything2 version
+    look like?
+
+-------
+
 last tango in paris, bande a part, showgirls, the lovers, day for night
 
 check on CMU transfer credit status