ssh config backup

14 files changed, 158 insertions, 424 deletions

diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 2a8dff8..1974527 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -11,5 +11,5 @@ XDG_TEMPLATES_DIR="$HOME/"
 XDG_PUBLICSHARE_DIR="$HOME/"
 XDG_DOCUMENTS_DIR="$HOME/"
 XDG_MUSIC_DIR="$HOME/"
-XDG_PICTURES_DIR="$HOME/media/photos"
+XDG_PICTURES_DIR="$HOME/"
 XDG_VIDEOS_DIR="$HOME/media"
diff --git a/.fluxbox/init b/.fluxbox/init
index 27ab56a..32e67fb 100644
--- a/.fluxbox/init
+++ b/.fluxbox/init
@@ -1,117 +1,10 @@
-session.screen0.menu.alpha:	255
-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
-session.screen0.slit.layer:	Dock
-session.screen0.slit.maxOver:	false
-session.screen0.slit.alpha:	242
-session.screen0.slit.autoHide:	true
-session.screen0.slit.onHead:	0
-session.screen0.slit.direction:	Horizontal
-session.screen0.tab.alignment:	Left
-session.screen0.tab.rotatevertical:	true
-session.screen0.tab.placement:	TopLeft
-session.screen0.tab.width:	64
-session.screen0.toolbar.height:	0
-session.screen0.toolbar.placement:	BottomCenter
-session.screen0.toolbar.onhead:	0
-session.screen0.toolbar.layer:	Dock
-session.screen0.toolbar.widthPercent:	66
-session.screen0.toolbar.onTop:	false
-session.screen0.toolbar.alpha:	255
-session.screen0.toolbar.visible:	true
-session.screen0.toolbar.autoHide:	false
-session.screen0.toolbar.maxOver:	false
-session.screen0.toolbar.tools:	workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
-session.screen0.iconbar.alignment:	Relative
-session.screen0.iconbar.iconTextPadding:	10l
-session.screen0.iconbar.iconWidth:	70
-session.screen0.iconbar.deiconifyMode:	Follow
-session.screen0.iconbar.usePixmap:	true
-session.screen0.iconbar.mode:	Workspace
-session.screen0.iconbar.wheelMode:	Screen
-session.screen0.tabs.maxOver:	false
-session.screen0.tabs.intitlebar:	true
-session.screen0.overlay.lineWidth:	1
-session.screen0.overlay.lineStyle:	LineSolid
-session.screen0.overlay.joinStyle:	JoinMiter
-session.screen0.overlay.capStyle:	CapNotLast
-session.screen0.strftimeFormat:	%k:%M
-session.screen0.workspaces:	6
-session.screen0.windowPlacement:	ColSmartPlacement
-session.screen0.decorateTransient:	true
-session.screen0.followModel:	Ignore
-session.screen0.tabFocusModel:	ClickToTabFocus
-session.screen0.clickRaises:	true
-session.screen0.antialias:	false
-session.screen0.imageDither:	false
-session.screen0.allowRemoteActions:	false
-session.screen0.demandsAttentionTimeout:	500
-session.screen0.rowPlacementDirection:	RightToLeft
-session.screen0.userFollowModel:	Follow
-session.screen0.windowScrollReverse:	false
-session.screen0.windowScrollAction:	
-session.screen0.rootCommand:	fbsetroot -solid rgb:54/54/54
-session.screen0.focusLastWindow:	true
-session.screen0.reversewheeling:	false
-session.screen0.desktopwheeling:	true
-session.screen0.menuDelayClose:	0
-session.screen0.colPlacementDirection:	TopToBottom
-session.screen0.maxOverSlit:	true
-session.screen0.menuMode:	Delay
-session.screen0.edgeSnapThreshold:	0
-session.screen0.defaultDeco:	NORMAL
-session.screen0.autoRaise:	true
-session.screen0.resizeMode:	Bottom
-session.screen0.menuDelay:	0
-session.screen0.windowMenu:	
-session.screen0.sloppywindowgrouping:	true
-session.screen0.showwindowposition:	true
-session.screen0.opaqueMove:	false
-session.screen0.workspaceNames:	space1,space2,space3,space4,space5,space6,
-session.screen0.focusModel:	ClickFocus
-session.screen0.focusNewWindows:	true
-session.screen0.workspacewarping:	true
-session.screen0.fullMaximization:	false
-session.titlebar.left:	Stick 
-session.titlebar.right:	Minimize Maximize Close 
-session.forcePseudoTransparency:	false
-session.tabPadding:	0
-session.slitlistFile:	~/.fluxbox/slitlist
-session.modKey:	Mod1
-session.autoRaiseDelay:	250
-session.iconbar:	true
-session.configVersion:	1
-session.tabsAttachArea:	Window
-session.imageDither:	True
-session.appsFile:	~/.fluxbox/apps
-session.focusTabMinWidth:	0
-session.styleFile:	~/.fluxbox/styles/TheOrange
-session.keyFile:	~/.fluxbox/keys
-session.cacheLife:	5l
-session.useMod1:	true
-session.ignoreBorder:	false
-session.opaqueMove:	false
-session.colorsPerChannel:	4
-session.numLayers:	13
-session.styleOverlay:	~/.fluxbox/overlay
-session.tabs:	false
+! If you're looking for settings to configure, they won't be saved here until
+! you change something in the fluxbox configuration menu.
+
 session.menuFile:	~/.fluxbox/menu
-session.doubleClickInterval:	250
-session.cacheMax:	200l
-session.groupFile:	~/.fluxbox/groups
-Area:	Window
+session.keyFile: ~/.fluxbox/keys
+session.styleFile: /usr/share/fluxbox/styles//Ubuntu-light
+session.configVersion:	13
+session.screen0.toolbar.widthPercent: 100
+session.screen0.strftimeFormat: %d %b, %a %02k:%M:%S
+session.screen0.toolbar.tools: prevworkspace, workspacename, nextworkspace, clock, prevwindow, nextwindow, iconbar, systemtray
\ No newline at end of file
diff --git a/.fluxbox/keys b/.fluxbox/keys
index 64c26b6..953d08b 100644
--- a/.fluxbox/keys
+++ b/.fluxbox/keys
@@ -1,12 +1,100 @@
-#None Mouse1top :HideMenus
-#None Mouse1top :HideMenu
-#None Mouse1top :HideMenu
-#None Mouse2top :WorkspaceMenu
-#None Mouse3top :RootMenu
-None Mouse4top :NextWorkspace
-None Mouse5top :PrevWorkspace
-Mod1 Tab :NextWindow
-Mod1 Shift Tab :PrevWindow
+# click on the desktop to get menus
+OnDesktop Mouse1 :HideMenus
+OnDesktop Mouse2 :WorkspaceMenu
+OnDesktop Mouse3 :RootMenu
+
+# scroll on the desktop to change workspaces
+OnDesktop Mouse4 :PrevWorkspace
+OnDesktop Mouse5 :NextWorkspace
+
+# scroll on the toolbar to change current window
+OnToolbar Mouse4 :PrevWindow {static groups} (iconhidden=no)
+OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no)
+
+# alt + left/right click to move/resize a window
+OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+OnWindowBorder Move1 :StartMoving
+
+OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
+OnLeftGrip Move1 :StartResizing bottomleft
+OnRightGrip Move1 :StartResizing bottomright
+
+# alt + middle click to lower the window
+OnWindow Mod1 Mouse2 :Lower
+
+# control-click a window's titlebar and drag to attach windows
+OnTitlebar Control Mouse1 :StartTabbing
+
+# double click on the titlebar to shade
+OnTitlebar Double Mouse1 :Shade
+
+# left click on the titlebar to move the window
+OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab}
+OnTitlebar Move1  :StartMoving
+
+# middle click on the titlebar to lower
+OnTitlebar Mouse2 :Lower
+
+# right click on the titlebar for a menu of options
+OnTitlebar Mouse3 :WindowMenu
+
+# alt-tab
+Mod1 Tab :NextWindow {groups} (workspace=[current])
+Mod1 Shift Tab :PrevWindow {groups} (workspace=[current])
+
+# cycle through tabs in the current window
+Mod4 Tab :NextTab
+Mod4 Shift Tab :PrevTab
+
+# go to a specific tab in the current window
+Mod4 1 :Tab 1
+Mod4 2 :Tab 2
+Mod4 3 :Tab 3
+Mod4 4 :Tab 4
+Mod4 5 :Tab 5
+Mod4 6 :Tab 6
+Mod4 7 :Tab 7
+Mod4 8 :Tab 8
+Mod4 9 :Tab 9
+
+# open a terminal
+Mod1 F1 :Exec x-terminal-emulator
+
+# open a dialog to run programs
+Mod1 F2 :Exec fbrun
+
+# volume settings, using common keycodes
+# if these don't work, use xev to find out your real keycodes
+176 :Exec amixer sset Master,0 1+
+174 :Exec amixer sset Master,0 1-
+160 :Exec amixer sset Master,0 toggle
+
+# current window commands
+Mod1 F4 :Close
+Mod1 F5 :Kill
+Mod1 F9 :Minimize
+Mod1 F10 :Maximize
+Mod1 F11 :Fullscreen
+
+# open the window menu
+Mod1 space :WindowMenu
+
+# exit fluxbox
+Control Mod1 Delete :Exit
+
+# change to previous/next workspace
+Control Mod1 Left :PrevWorkspace
+Control Mod1 Right :NextWorkspace
+
+# send the current window to previous/next workspace
+Mod4 Left :SendToPrevWorkspace
+Mod4 Right :SendToNextWorkspace
+
+# send the current window and follow it to previous/next workspace
+Control Mod4 Left :TakeToPrevWorkspace
+Control Mod4 Right :TakeToNextWorkspace
+
+# change to a specific workspace
 Control F1 :Workspace 1
 Control F2 :Workspace 2
 Control F3 :Workspace 3
@@ -19,26 +107,31 @@ Control F9 :Workspace 9
 Control F10 :Workspace 10
 Control F11 :Workspace 11
 Control F12 :Workspace 12
-Mod1 Mod4 Tab :NextWorkspace
-Mod1 Shift Mod4 Tab :PrevWorkspace
-Mod1 F4 :Close
-Mod4 space :ShadeWindow
-#None Meta_R :RootMenu
-Mod4 h :MoveLeft 10
-Mod4 j :MoveDown 10
-Mod4 k :MoveUp 10
-Mod4 l :MoveRight 10
-Shift Mod4 l :ResizeHorizontal +4
-Shift Mod4 h :ResizeHorizontal -4
-Shift Mod4 j :ResizeVertical +4
-Shift Mod4 k :ResizeVertical -4
-Mod4 t :ExecCommand xterm -rv +sb -ls
-Mod4 f :ExecCommand firefox
-Mod4 m :Minimize
-Mod4 F12 :ExecCommand xmms -m
-Mod4 p :ExecCommand xterm -rv +sb -e alpine
-Mod4 Prior :ExecCommand xmms -f
-Mod4 Next :ExecCommand xmms -f
-Mod4 Home :ExecCommand xmms -t
-Mod4 Insert :ExecCommand xmms -r
-Mod4 End :ExecCommand xmms -s
+
+# send the current window to a specific workspace
+Mod4 F1 :SendToWorkspace 1
+Mod4 F2 :SendToWorkspace 2
+Mod4 F3 :SendToWorkspace 3
+Mod4 F4 :SendToWorkspace 4
+Mod4 F5 :SendToWorkspace 5
+Mod4 F6 :SendToWorkspace 6
+Mod4 F7 :SendToWorkspace 7
+Mod4 F8 :SendToWorkspace 8
+Mod4 F9 :SendToWorkspace 9
+Mod4 F10 :SendToWorkspace 10
+Mod4 F11 :SendToWorkspace 11
+Mod4 F12 :SendToWorkspace 12
+
+# send the current window and change to a specific workspace
+Control Mod4 F1 :TakeToWorkspace 1
+Control Mod4 F2 :TakeToWorkspace 2
+Control Mod4 F3 :TakeToWorkspace 3
+Control Mod4 F4 :TakeToWorkspace 4
+Control Mod4 F5 :TakeToWorkspace 5
+Control Mod4 F6 :TakeToWorkspace 6
+Control Mod4 F7 :TakeToWorkspace 7
+Control Mod4 F8 :TakeToWorkspace 8
+Control Mod4 F9 :TakeToWorkspace 9
+Control Mod4 F10 :TakeToWorkspace 10
+Control Mod4 F11 :TakeToWorkspace 11
+Control Mod4 F12 :TakeToWorkspace 12
diff --git a/.fluxbox/menu b/.fluxbox/menu
index 2088386..ed1edfb 100644
--- a/.fluxbox/menu
+++ b/.fluxbox/menu
@@ -1,136 +1,3 @@
-[begin] (fluxbox on snark)
-[exec] (firefox) {firefox}
-[exec] (xterm) {xterm -rv +sb -ls}
-[exec] (alpine) {xterm -ls -rv +sb -e alpine}
-[exec] (xkill) {xkill &}
-[submenu] (remote)
-    [exec] (charm) {xterm -rv +sb -ls -e ssh bnewbold@charm.mit.edu}
-    [exec] (eta.xvm) {xterm -rv +sb -ls -e ssh bnewbold@eta.xvm.mit.edu}
-    [exec] (athena) {xterm -rv +sb -ls -e ssh bnewbold@athena.dialup.mit.edu}
-[end]
-[submenu] (apps)
-    [exec] (gimp) {gimp &}
-    [exec] (eclipse) {xterm -e bash -lc /usr/local/eclipse/eclipse &}
-    [exec] (azureus) {azureus &}
-    [exec] (vlc) {vlc &}
-    [exec] (xmms) {xmms &}
-    [exec] (quake3) {xinit /usr/local/bin/quake3 -display :2 -- :2}
-[end]
-[nop] (----------)
-[submenu] (fluxbox stuff)
-	      [config] (Configure)
-	[submenu] (System Styles) {Choose a style...}
-	      [stylesdir] (/usr/share/fluxbox/styles)
-	[end]
-	[submenu] (User Styles) {Choose a style...}
-	      [stylesdir] (~/.fluxbox/styles)
-	[end]
-[submenu] (Backgrounds) {Set the Background}
-	[exec] (Random Background) {fbsetbg -r ~/.fluxbox/backgrounds}
-	[exec] (blue_ridge) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/blue_ridge.png }
-	[exec] (fish) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/fish.png }
-	[exec] (default_blue) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/default_blue.jpg }
-	[exec] (triplegears) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/triplegears.jpg }
-	[exec] (green_weave) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/green_weave.png }
-	[exec] (3dgreen) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/3dgreen.png }
-	[exec] (blue_type) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/blue_type.png }
-	[exec] (Planning-And-Probing-1) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Planning-And-Probing-1.jpg }
-	[exec] (blue_gray_rough) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/blue_gray_rough.png }
-	[exec] (triangles) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/triangles.png }
-	[exec] (Paper01) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Paper01.jpg }
-	[exec] (cork) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/cork.png }
-	[exec] (reset) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/reset.png }
-	[exec] (sky_ridge) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/sky_ridge.png }
-	[exec] (qbist1) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/qbist1.png }
-	[exec] (only_k) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/only_k.jpg }
-	[exec] (terracotta) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/terracotta.png }
-	[exec] (ocean_stripes) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/ocean_stripes.png }
-	[exec] (Time-For-Lunch-2) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Time-For-Lunch-2.jpg }
-	[exec] (clouds) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/clouds.png }
-	[exec] (purple_marble) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/purple_marble.png }
-	[exec] (blobl) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/blobl.png }
-	[exec] (marble) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/marble.png }
-	[exec] (sinus) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/sinus.png }
-	[exec] (Foggy1) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Foggy1.jpg }
-	[exec] (java) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/java.png }
-	[exec] (Totally-New-Product-1) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Totally-New-Product-1.jpg }
-	[exec] (neurons) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/neurons.png }
-	[exec] (kde_passion) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/kde_passion.jpg }
-	[exec] (moss_ridge) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/moss_ridge.png }
-	[nop] (---------)
-	[submenu] (Backgrounds 2)
-	[exec] (Chicken-Songs-2) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Chicken-Songs-2.jpg }
-	[exec] (dunes) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/dunes.png }
-	[exec] (pavement) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/pavement.png }
-	[exec] (wavy_white) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/wavy_white.png }
-	[exec] (diffraction-patterns) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/diffraction-patterns.png }
-	[exec] (plasma) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/plasma.png }
-	[exec] (clover) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/clover.png }
-	[exec] (fibers) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/fibers.png }
-	[exec] (bark) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/bark.png }
-	[exec] (fossil) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/fossil.png }
-	[exec] (camouflage) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/camouflage.png }
-	[exec] (bricks) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/bricks.png }
-	[exec] (manila_paper) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/manila_paper.png }
-	[exec] (No-Ones-Laughing-3) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/No-Ones-Laughing-3.jpg }
-	[exec] (rattan) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/rattan.png }
-	[exec] (ridged_paper) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/ridged_paper.png }
-	[exec] (burlwood) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/burlwood.png }
-	[exec] (circuit) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/circuit.png }
-	[exec] (Won-Ton-Soup-3) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Won-Ton-Soup-3.jpg }
-	[exec] (paper) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/paper.png }
-	[exec] (flowers) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/flowers.png }
-	[exec] (Marble01) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Marble01.jpg }
-	[exec] (fleur_de_lis) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/fleur_de_lis.png }
-	[exec] (bluemars) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/bluemars.png }
-	[exec] (snow_ridge) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/snow_ridge.png }
-	[exec] (stonewall2) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/stonewall2.png }
-	[exec] (rough_paper) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/rough_paper.png }
-	[exec] (qbist2) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/qbist2.png }
-	[exec] (floral) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/floral.png }
-	[exec] (wood) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/wood.png }
-	[nop] (----------)
-	[submenu] (Backgrounds 3)
-	[exec] (All-Good-People-1) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/All-Good-People-1.jpg }
-	[exec] (numbers) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/numbers.png }
-	[exec] (Circuit) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Circuit.jpg }
-	[exec] (countertop) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/countertop.png }
-	[exec] (blue) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/blue.png }
-	[exec] (Blkmarble) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/Blkmarble.jpg }
-	[exec] (ice) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/ice.png }
-	[exec] (brushed_metal) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/brushed_metal.png }
-	[exec] (dots) {fbsetbg -a /usr/X11R6/share/backgrounds/tiles/dots.png }
-	[exec] (frosty_pipes) {fbsetbg -a /usr/X11R6/share/backgrounds/images/frosty_pipes.jpg }
-	[exec] (tiny_blast_of_red) {fbsetbg -a /usr/X11R6/share/backgrounds/images/tiny_blast_of_red.jpg }
-	[exec] (yellow_flower) {fbsetbg -a /usr/X11R6/share/backgrounds/images/yellow_flower.jpg }
-	[exec] (ladybugs) {fbsetbg -a /usr/X11R6/share/backgrounds/images/ladybugs.jpg }
-	[exec] (raingutter) {fbsetbg -a /usr/X11R6/share/backgrounds/images/raingutter.jpg }
-	[exec] (lightrays2) {fbsetbg -a /usr/X11R6/share/backgrounds/images/lightrays2.png }
-	[exec] (flowers_and_leaves) {fbsetbg -a /usr/X11R6/share/backgrounds/images/flowers_and_leaves.jpg }
-	[exec] (dragonfly) {fbsetbg -a /usr/X11R6/share/backgrounds/images/dragonfly.jpg }
-	[exec] (sneaking_branch) {fbsetbg -a /usr/X11R6/share/backgrounds/images/sneaking_branch.jpg }
-	[exec] (lightrays) {fbsetbg -a /usr/X11R6/share/backgrounds/images/lightrays.png }
-	[exec] (in_flight) {fbsetbg -a /usr/X11R6/share/backgrounds/images/in_flight.jpg }
-	[exec] (earth_from_space) {fbsetbg -a /usr/X11R6/share/backgrounds/images/earth_from_space.jpg }
-	[exec] (stone_bird) {fbsetbg -a /usr/X11R6/share/backgrounds/images/stone_bird.jpg }
-	[exec] (dewdop_leaf) {fbsetbg -a /usr/X11R6/share/backgrounds/images/dewdop_leaf.jpg }
-	[exec] (lightrays-transparent) {fbsetbg -a /usr/X11R6/share/backgrounds/images/lightrays-transparent.png }
-	[exec] (leafdrops) {fbsetbg -a /usr/X11R6/share/backgrounds/images/leafdrops.jpg }
-	[exec] (default) {fbsetbg -a /usr/X11R6/share/backgrounds/images/default.png }
-	[exec] (riverstreet_rail) {fbsetbg -a /usr/X11R6/share/backgrounds/images/riverstreet_rail.jpg }
-	[exec] (leaf_veins) {fbsetbg -a /usr/X11R6/share/backgrounds/images/leaf_veins.jpg }
-	[end]
-	[end]
-[end]
-      [workspaces]   (Workspace List)
-	[submenu] (Fluxbox Tools)
-[exec] (Window name) {xprop WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
-[exec] (Screenshot) {import screenshot.png && qiv -W 50 screenshot.png}
-[end]
-	[commanddialog] (Fluxbox Command)
-	[reconfig] (Reload config)
-	[restart] (Restart Fluxbox)
-	[end]
-[exec] (lock screen) {xlock}
-[exit] (logout)
+[begin] (fluxbox)
+[include] (/etc/X11/fluxbox/fluxbox-menu)
 [end]
diff --git a/.fluxbox/styles/TheGreen b/.fluxbox/styles/TheGreen
deleted file mode 100644
index 74cd8a4..0000000
--- a/.fluxbox/styles/TheGreen
+++ /dev/null
@@ -1,53 +0,0 @@
-
-*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/.fluxbox/styles/TheOrange b/.fluxbox/styles/TheOrange
deleted file mode 100644
index ad3c2c0..0000000
--- a/.fluxbox/styles/TheOrange
+++ /dev/null
@@ -1,53 +0,0 @@
-
-*focus:				flat gradient vertical
-*unfocus:			flat gradient vertical
-
-*colorTo:			rgb:70/70/70
-*color:				rgb:8A/8A/8A
-
-
-*focus.color:			rgb:D4/72/3C
-*focus.colorTo:			rgb:9D/4B/20
-
-*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:D4/72/3C
-menu.title.colorTo:		rgb:9D/4B/20
-
-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:D4/72/3C
-window.button.pressed.colorTo:	rgb:9D/4B/20
-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/.gconf/desktop/gnome/keybindings/custom0/%gconf.xml b/.gconf/desktop/gnome/keybindings/custom0/%gconf.xml
deleted file mode 100644
index 7031639..0000000
--- a/.gconf/desktop/gnome/keybindings/custom0/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="action" mtime="1309900855" type="string">
-		<stringvalue>xterm -rv -e &quot;cd ~; alpine&quot;</stringvalue>
-	</entry>
-	<entry name="name" mtime="1309900855" type="string">
-		<stringvalue>Alpine</stringvalue>
-	</entry>
-	<entry name="binding" mtime="1260548717" type="string">
-		<stringvalue>&lt;Mod4&gt;p</stringvalue>
-	</entry>
-</gconf>
diff --git a/.gconf/desktop/gnome/keybindings/custom1/%gconf.xml b/.gconf/desktop/gnome/keybindings/custom1/%gconf.xml
index c4ca7c5..883c0c7 100644
--- a/.gconf/desktop/gnome/keybindings/custom1/%gconf.xml
+++ b/.gconf/desktop/gnome/keybindings/custom1/%gconf.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <gconf>
-	<entry name="action" mtime="1309900885" type="string">
+	<entry name="action" mtime="1309913817" type="string">
 		<stringvalue>xterm -rv -e ipython</stringvalue>
 	</entry>
-	<entry name="name" mtime="1309900885" type="string">
+	<entry name="name" mtime="1309913817" type="string">
 		<stringvalue>ipython</stringvalue>
 	</entry>
 	<entry name="binding" mtime="1269537192" type="string">
diff --git a/.gconf/desktop/gnome/keybindings/custom3/%gconf.xml b/.gconf/desktop/gnome/keybindings/custom3/%gconf.xml
index 8fa09dd..e7c36c0 100644
--- a/.gconf/desktop/gnome/keybindings/custom3/%gconf.xml
+++ b/.gconf/desktop/gnome/keybindings/custom3/%gconf.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <gconf>
-	<entry name="action" mtime="1269640677" type="string">
+	<entry name="action" mtime="1309913824" type="string">
 		<stringvalue>xterm -rv -e vim -c &quot;cd ~&quot;</stringvalue>
 	</entry>
-	<entry name="name" mtime="1269640677" type="string">
+	<entry name="name" mtime="1309913824" type="string">
 		<stringvalue>vim</stringvalue>
 	</entry>
 	<entry name="binding" mtime="1269637793" type="string">
diff --git a/.pinerc b/.pinerc
index f99d9a8..5d7fade 100644
--- a/.pinerc
+++ b/.pinerc
@@ -196,7 +196,7 @@ display-filters=_BEGINNING("-----BEGIN PGP")_ ~/bin/ez-pine-gpg-incoming
 sending-filters=~/bin/ez-pine-gpg-sign-and-encrypt _INCLUDEALLHDRS_ _RECIPIENTS_,
 	~/bin/ez-pine-gpg-encrypt _RECIPIENTS_,
 	~/bin/ez-pine-gpg-sign _INCLUDEALLHDRS_,
-	~/bin/ez-pine-gpg-symmetric 
+	~/bin/ez-pine-gpg-symmetric
 
 # A list of alternate addresses the user is known by
 alt-addresses=bnewbold@alum.mit.edu,
@@ -334,7 +334,7 @@ global-address-book=
 last-time-prune-questioned=199.11
 
 # Set by Pine; controls display of "new version" message.
-last-version-used=6.00
+last-version-used=6.02
 
 # This names the path to an alternative program, and any necessary arguments,
 # to be used in posting mail messages.  Example:
diff --git a/.profile b/.profile
index 9904f34..9474662 100644
--- a/.profile
+++ b/.profile
@@ -40,3 +40,12 @@ alias vbox="VBOX_USB=USBFS VirtualBox"
 
 # arm-gcc codesourcery stuff
 PATH=$PATH:$HOME/leaf/bin/arm-gcc-codesourcery/bin; export PATH
+
+alias o3="cd ~/code/o3-env; source bin/activate; cd ~/code/o3-env/src/o3/o3"
+alias tdb="cd ~/code/thriftdb-env; source bin/activate; cd ~/code/thriftdb-env/src/thriftdb"
+alias o2="cd ~/code/o2-env; source bin/activate; cd ~/code/o2-env/src/o2/o2"
+alias pe="cd ~/code/pdfextract; source bin/activate; cd src"
+
+alias aws="read -s AWS_ACCESS_KEY AWS_SECRET_ACCESS_KEY && export AWS_ACCESS_KEY && export AWS_SECRET_ACCESS_KEY"
+
+alias start_thriftdb="/var/lib/thriftdb-index/tomcat/thriftdb__development/bin/startup.sh"
diff --git a/.ssh/config b/.ssh/config
index 568589b..0565485 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -68,6 +68,10 @@ Host cabinet
     ControlPath ~/.ssh/master-%l-%r@%h:%p
     ControlMaster auto
     LocalForward 4999 localhost:4999
+    LocalForward 8730 gearmand0:4730
     Compression yes
     ServerAliveInterval 30
-
+Host sandbox
+    HostName ec2-107-20-247-153.compute-1.amazonaws.com
+    User ubuntu
+    Compression yes
diff --git a/.vimrc b/.vimrc
index e41e361..5d24874 100644
--- a/.vimrc
+++ b/.vimrc
@@ -118,3 +118,4 @@ augroup encrypted
     autocmd BufWritePost,FileWritePost  *.gpg silent u
     autocmd BufWritePost,FileWritePost  *.gpg set nobin
 augroup END
+
diff --git a/.xmodmap b/.xmodmap
deleted file mode 100644
index d735c9b..0000000
--- a/.xmodmap
+++ /dev/null
@@ -1,15 +0,0 @@
-!
-! This is an `xmodmap' input file for 
-!   PC 105 key, wide Delete, tall Enter (XFree86; US) keyboards.
-! Automatically generated on Sun Oct  5 21:38:05 2008 by bnewbold with
-! XKeyCaps 2.47; Copyright (c) 1991-1999 Jamie Zawinski; 2005-2006 Christoph Berg.
-! http://www.jwz.org/xkeycaps/
-!
-! This file presupposes that the keyboard is in the default state, and
-! may malfunction if it is not.
-!
-remove Mod1    = Alt_R
-
-keycode 0x71 =	Meta_R
-
-add    Mod4    = Meta_R