Reformat for use with Effuse

12 files changed, 9 insertions, 1216 deletions

diff --git a/_irbrc b/.irbrc
index 008e97cf..008e97cf 100644
--- a/_irbrc
+++ b/.irbrc
diff --git a/_riplrc b/.riplrc
index 8830a335..8830a335 100644
--- a/_riplrc
+++ b/.riplrc
diff --git a/_xinitrc b/.xinitrc
index 61d281d3..ef325a38 100644
--- a/_xinitrc
+++ b/.xinitrc
@@ -1,9 +1,16 @@
+export BROWSER=chromium
+
 xrdb ~/.Xresources &
 xautolock -locker slimlock -time 30 &
+start-pulseaudio-x11 &
+mpd &
+mpdscribble &
+mpDris2 &
 
 # Keyboard stuff
 xmodmap -e "clear Lock" -e "keysym Caps_Lock = Escape" # Caps Lock -> Esc
 xmodmap -e "remove mod1 = Alt_R" -e "keysym Alt_R = Multi_key" # Right Alt -> Compose
+xmodmap -e "remove mod1 = Alt_L" -e "remove mod4 = Super_L" -e "add mod1 = Super_L" -e "add mod4 = Alt_L" # Swap Super and Alt
 
 SESSION=openbox-session
 [ $1 ] && SESSION=$1
diff --git a/_zshrc b/.zshrc
index e9445050..04f52b31 100644
--- a/_zshrc
+++ b/.zshrc
@@ -135,10 +135,12 @@ alias gsh='git show'
 alias gmv='git mv'
 alias grm='git rm'
 alias gi='git init'
+alias glg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --color"
 alias mc='make clean'
 alias m='make -j4'
 alias killlall='killall'
 alias irb='ripl'
+alias l='ls'
 
 function gvim {
     [ "$@" ] && =gvim --remote-silent $@ || =gvim
diff --git a/_config/Terminal/terminalrc b/_config/Terminal/terminalrc
deleted file mode 100644
index adb21a1f..00000000
--- a/_config/Terminal/terminalrc
+++ /dev/null
@@ -1,44 +0,0 @@
-[Configuration]
-FontName=Monospace 9
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=TRUE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=FALSE
-MiscMouseAutohide=FALSE
-MiscToolbarsDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-ColorPalette2=#d7d77c7c7979
-ColorPalette10=#dfdf65656565
-ColorPalette3=#c2c2c7c77b7b
-ColorPalette11=#c5c5d1d15c5c
-ColorPalette4=#f4f4cfcf8686
-ColorPalette12=#ececcece5858
-ColorPalette5=#9292b2b2caca
-ColorPalette13=#8c8cb6b6e1e1
-ColorPalette6=#c0c0a7a7c7c7
-ColorPalette14=#cfcfababdfdf
-ColorPalette7=#9a9ac9c9c4c4
-ColorPalette15=#8080cacabfbf
-ColorPalette8=#a7a7a8a8a7a7
-ColorPalette16=#a7a7a8a8a7a7
-ColorPalette9=#555557575353
-ColorCursor=#d7d7dadad8d8
-ScrollingOnOutput=FALSE
-ScrollingLines=100000
-BackgroundDarkness=0.850000
-ShortcutsNoMenukey=TRUE
-TitleMode=TERMINAL_TITLE_REPLACE
-Term=xterm-256color
-ColorForeground=#d7d7dadad8d8
-ColorSelection=#47474c4c5252
-BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-
diff --git a/_config/openbox/autostart.sh b/_config/openbox/autostart.sh
deleted file mode 100644
index 16f90b02..00000000
--- a/_config/openbox/autostart.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-thunar --daemon &
-
-# Compositing
-#xcompmgr &
-xcompmgr -c -f -D 3 -C &
-
-# Wallpaper
-nitrogen --restore
-
-# Panels/Docks
-lxpanel &
-docky &
-
-# Tray apps
-parcellite &
-volwheel &
-
-# Conky
-conky &
-
-# Other daemons
-/home/curtis/code/c/keycounter/keycounter -f -d -p /home/curtis/.keycounter.pid /home/curtis/.keycount &
diff --git a/_config/openbox/environment b/_config/openbox/environment
deleted file mode 100644
index 1ab311e2..00000000
--- a/_config/openbox/environment
+++ /dev/null
@@ -1,4 +0,0 @@
-export DESKTOP_ENV="OPENBOX"
-export BROWSER=chromium
-export XDG_DATA_DIRS=/home/curtis/.local/share:$XDG_DATA_DIRS:/home/curtis/.local/share
-export GNOME_DESKTOP_SESSION_ID="openbox"
diff --git a/_config/openbox/menu.xml b/_config/openbox/menu.xml
deleted file mode 100644
index 90665667..00000000
--- a/_config/openbox/menu.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openbox_menu xmlns="http://openbox.org/3.4/menu">
-	<menu id="root-menu" label="Openbox 3">
-		<separator label="Applications"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Accessories" id="accessories" label="Accessories"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Games" id="games" label="Games"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Graphics" id="graphics" label="Graphics"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Internet" id="internet" label="Internet"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Office" id="office" label="Office"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Other" id="other" label="Other"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Development" id="programming" label="Programming"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications Multimedia" id="multimedia" label="Sound &amp; Video"/>
-		<menu execute="/home/curtis/bin/xdg-menu.py applications System" id="system" label="System Tools"/>
-		<separator label="Places"/>
-		<menu id="root-menu-87402" label="Home">
-			<item label="Home">
-				<action name="Execute">
-					<execute>
-						thunar
-					</execute>
-				</action>
-			</item>
-			<separator/>
-			<item label="code">
-				<action name="Execute">
-					<execute>
-						thunar ~/code
-					</execute>
-				</action>
-			</item>
-			<item label="Downloads">
-				<action name="Execute">
-					<execute>
-						thunar ~/Downloads
-					</execute>
-				</action>
-			</item>
-			<item label="Music">
-				<action name="Execute">
-					<execute>
-						thunar ~/Music
-					</execute>
-				</action>
-			</item>
-			<item label="Videos">
-				<action name="Execute">
-					<execute>
-						thunar ~/Videos
-					</execute>
-				</action>
-			</item>
-			<item label="stuff">
-				<action name="Execute">
-					<execute>
-						thunar ~/stuff
-					</execute>
-				</action>
-			</item>
-		</menu>
-		<item label="Filesystem">
-			<action name="Execute">
-				<execute>
-					thunar /
-				</execute>
-			</action>
-		</item>
-		<separator label="System"/>
-		<menu id="root-menu-69812" label="Preferences">
-			<item label="Appearance">
-				<action name="Execute">
-					<execute>
-						lxappearance
-					</execute>
-				</action>
-			</item>
-			<item label="Qt Configuration">
-				<action name="Execute">
-					<execute>
-						qtconfig
-					</execute>
-				</action>
-			</item>
-			<item label="Wallpaper">
-				<action name="Execute">
-					<execute>
-						nitrogen
-					</execute>
-				</action>
-			</item>
-			<item label="Menu Items">
-				<action name="Execute">
-					<execute>
-						gmenu-simple-editor
-					</execute>
-				</action>
-			</item>
-		</menu>
-		<menu id="openbox" label="Openbox">
-			<item label="Configure Openbox">
-				<action name="Execute">
-					<execute>
-						obconf
-					</execute>
-				</action>
-			</item>
-			<item label="Configure Menu">
-				<action name="Execute">
-					<execute>
-						obmenu
-					</execute>
-				</action>
-			</item>
-			<item label="Configure Keybindings">
-				<action name="Execute">
-					<execute>
-						obkey
-					</execute>
-				</action>
-			</item>
-			<separator/>
-			<item label="Edit rc.xml">
-				<action name="Execute">
-					<execute>
-						gvim ~/.config/openbox/rc.xml
-					</execute>
-				</action>
-			</item>
-			<item label="Edit menu.xml">
-				<action name="Execute">
-					<execute>
-						gvim ~/.config/openbox/menu.xml
-					</execute>
-				</action>
-			</item>
-			<item label="Edit autostart.sh">
-				<action name="Execute">
-					<execute>
-						gvim ~/.config/openbox/autostart.sh
-					</execute>
-				</action>
-			</item>
-			<separator/>
-			<item label="Reload">
-				<action name="Reconfigure"/>
-			</item>
-			<item label="Restart">
-				<action name="Restart"/>
-			</item>
-			<item label="Exit">
-				<action name="Exit"/>
-			</item>
-		</menu>
-		<separator/>
-		<item label="Exit">
-			<action name="Exit">
-				<execute>
-					/home/curtis/bin/cb-logout.py
-				</execute>
-			</action>
-		</item>
-	</menu>
-</openbox_menu>
diff --git a/_config/openbox/rc.xml b/_config/openbox/rc.xml
deleted file mode 100644
index be373857..00000000
--- a/_config/openbox/rc.xml
+++ /dev/null
@@ -1,791 +0,0 @@
-<?xml version="1.0"?>
-<openbox_config xmlns="http://openbox.org/3.4/rc">
-  <resistance>
-    <strength>10</strength>
-    <screen_edge_strength>20</screen_edge_strength>
-  </resistance>
-  <focus>
-    <focusNew>yes</focusNew>
-    <!-- always try to focus new windows when they appear. other rules do
-       apply -->
-    <followMouse>no</followMouse>
-    <!-- move focus to a window when you move the mouse into it -->
-    <focusLast>yes</focusLast>
-    <!-- focus the last used window when changing desktops, instead of the one
-       under the mouse pointer. when followMouse is enabled -->
-    <underMouse>no</underMouse>
-    <!-- move focus under the mouse, even when the mouse is not moving -->
-    <focusDelay>200</focusDelay>
-    <!-- when followMouse is enabled, the mouse must be inside the window for
-       this many milliseconds (1000 = 1 sec) before moving focus to it -->
-    <raiseOnFocus>no</raiseOnFocus>
-    <!-- when followMouse is enabled, and a window is given focus by moving the
-       mouse into it, also raise the window -->
-  </focus>
-  <placement>
-    <policy>Smart</policy>
-    <!-- 'Smart' or 'UnderMouse' -->
-    <center>yes</center>
-    <!-- whether to place windows in the center of the free area found or
-       the top left corner -->
-    <monitor>Active</monitor>
-    <!-- with Smart placement on a multi-monitor system, try to place new windows
-       on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
-       the active window is -->
-    <primaryMonitor>1</primaryMonitor>
-    <!-- The monitor where Openbox should place popup dialogs such as the
-       focus cycling popup, or the desktop switch popup.  It can be an index
-       from 1, specifying a particular monitor.  Or it can be one of the
-       following: 'Mouse' - where the mouse is, or
-                  'Active' - where the active window is -->
-  </placement>
-  <theme>
-    <name>egtk</name>
-    <titleLayout>CL</titleLayout>
-    <!--
-      available characters are NDSLIMC, each can occur at most once.
-      N: window icon
-      L: window label (AKA title).
-      I: iconify
-      M: maximize
-      C: close
-      S: shade (roll up/down)
-      D: omnipresent (on all desktops).
-  -->
-    <keepBorder>yes</keepBorder>
-    <animateIconify>no</animateIconify>
-    <font place="ActiveWindow">
-      <name>Sans</name>
-      <size>8</size>
-      <!-- font size in points -->
-      <weight>Bold</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="InactiveWindow">
-      <name>sans</name>
-      <size>8</size>
-      <!-- font size in points -->
-      <weight>bold</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="MenuHeader">
-      <name>sans</name>
-      <size>9</size>
-      <!-- font size in points -->
-      <weight>normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="MenuItem">
-      <name>Sans</name>
-      <size>9</size>
-      <!-- font size in points -->
-      <weight>Normal</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>Normal</slant>
-      <!-- 'italic' or 'normal' -->
-    </font>
-    <font place="ActiveOnScreenDisplay">
-      <name/>
-    </font>
-    <font place="InactiveOnScreenDisplay">
-      <name>Sans</name>
-      <size>8</size>
-      <weight/>
-      <slant/>
-    </font>
-  </theme>
-  <desktops>
-    <!-- this stuff is only used at startup, pagers allow you to change them
-       during a session
-
-       these are default values to use when other ones are not already set
-       by other applications, or saved in your session
-
-       use obconf if you want to change these without having to log out
-       and back in -->
-    <number>6</number>
-    <firstdesk>1</firstdesk>
-    <names>
-      <name>One</name>
-      <name>Two</name>
-      <name>Three</name>
-      <name>Four</name>
-      <name>Five</name>
-      <name>Six</name>
-    </names>
-    <popupTime>875</popupTime>
-    <!-- The number of milliseconds to show the popup for when switching
-       desktops.  Set this to 0 to disable the popup. -->
-  </desktops>
-  <resize>
-    <drawContents>yes</drawContents>
-    <popupShow>NonPixel</popupShow>
-    <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
-    <popupPosition>Center</popupPosition>
-    <!-- 'Center', 'Top', or 'Fixed' -->
-    <popupFixedPosition>
-      <!-- these are used if popupPosition is set to 'Fixed' -->
-      <x>10</x>
-      <!-- positive number for distance from left edge, negative number for
-         distance from right edge, or 'Center' -->
-      <y>10</y>
-      <!-- positive number for distance from top edge, negative number for
-         distance from bottom edge, or 'Center' -->
-    </popupFixedPosition>
-  </resize>
-  <!-- You can reserve a portion of your screen where windows will not cover when
-     they are maximized, or when they are initially placed.
-     Many programs reserve space automatically, but you can use this in other
-     cases. -->
-  <margins>
-    <top>0</top>
-    <bottom>0</bottom>
-    <left>0</left>
-    <right>0</right>
-  </margins>
-  <dock>
-    <position>Top</position>
-    <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
-    <floatingX>0</floatingX>
-    <floatingY>0</floatingY>
-    <noStrut>no</noStrut>
-    <stacking>Below</stacking>
-    <!-- 'Above', 'Normal', or 'Below' -->
-    <direction>Horizontal</direction>
-    <!-- 'Vertical' or 'Horizontal' -->
-    <autoHide>no</autoHide>
-    <hideDelay>300</hideDelay>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <showDelay>300</showDelay>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <moveButton>Middle</moveButton>
-    <!-- 'Left', 'Middle', 'Right' -->
-  </dock>
-  <keyboard>
-    <chainQuitKey>C-g</chainQuitKey>
-    <keybind key="C-A-Left">
-      <action name="DesktopLeft"/>
-    </keybind>
-    <keybind key="C-A-Right">
-      <action name="DesktopRight"/>
-    </keybind>
-    <keybind key="C-A-Up">
-      <action name="DesktopUp">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="C-A-Down">
-      <action name="DesktopDown">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Left">
-      <action name="SendToDesktopLeft">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Right">
-      <action name="SendToDesktopRight">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Up">
-      <action name="SendToDesktopUp">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="S-A-Down">
-      <action name="SendToDesktopDown">
-        <wrap>no</wrap>
-      </action>
-    </keybind>
-    <keybind key="W-F1">
-      <action name="Desktop"/>
-    </keybind>
-    <keybind key="W-F2">
-      <action name="Desktop">
-        <desktop>2</desktop>
-      </action>
-    </keybind>
-    <keybind key="W-F3">
-      <action name="Desktop">
-        <desktop>3</desktop>
-      </action>
-    </keybind>
-    <keybind key="W-F4">
-      <action name="Desktop">
-        <desktop>4</desktop>
-      </action>
-    </keybind>
-    <keybind key="W-d">
-      <action name="ToggleShowDesktop"/>
-    </keybind>
-    <keybind key="A-F4">
-      <action name="Close"/>
-    </keybind>
-    <keybind key="A-Escape">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </keybind>
-    <keybind key="A-space">
-      <action name="ShowMenu">
-        <menu>client-menu</menu>
-      </action>
-    </keybind>
-    <keybind key="A-Tab">
-      <action name="NextWindow"/>
-    </keybind>
-    <keybind key="A-S-Tab">
-      <action name="PreviousWindow"/>
-    </keybind>
-    <keybind key="C-A-Tab">
-      <action name="NextWindow">
-        <panels>yes</panels>
-        <desktop>yes</desktop>
-      </action>
-    </keybind>
-    <keybind key="Alt-F2">
-      <action name="Execute">
-        <command>gmrun</command>
-      </action>
-    </keybind>
-    <keybind key="F12">
-      <action name="Execute">
-        <command>terminal</command>
-      </action>
-    </keybind>
-    <keybind key="W-space">
-      <action name="ShowMenu">
-        <menu>root-menu</menu>
-      </action>
-    </keybind>
-    <keybind key="Print">
-      <action name="Execute">
-        <command>/home/curtis/bin/scrot-upload</command>
-      </action>
-    </keybind>
-    <keybind key="W-Print">
-      <action name="Execute">
-        <command>/home/curtis/bin/scrot-upload -b -s</command>
-      </action>
-    </keybind>
-    <keybind key="C-A-k">
-      <action name="DesktopLeft"/>
-    </keybind>
-    <keybind key="C-A-j">
-      <action name="DesktopRight"/>
-    </keybind>
-    <keybind key="W-Right">
-      <action name="GrowToEdgeEast"/>
-    </keybind>
-    <keybind key="W-Left">
-      <action name="GrowToEdgeWest"/>
-    </keybind>
-    <keybind key="W-Up">
-      <action name="GrowToEdgeNorth"/>
-    </keybind>
-    <keybind key="W-Down">
-      <action name="GrowToEdgeSouth"/>
-    </keybind>
-    <keybind key="XF86AudioPlay">
-      <action name="Execute">
-        <command>banshee --toggle-playing</command>
-      </action>
-    </keybind>
-    <keybind key="XF86AudioPrev">
-      <action name="Execute">
-        <command>banshee --previous</command>
-      </action>
-    </keybind>
-    <keybind key="XF86AudioNext">
-      <action name="Execute">
-        <command>banshee --next</command>
-      </action>
-    </keybind>
-    <keybind key="XF86AudioStop">
-      <action name="Execute">
-        <command>banshee --stop</command>
-      </action>
-    </keybind>
-    <keybind key="XF86Calculator">
-      <action name="Execute">
-        <command>qalculate</command>
-      </action>
-    </keybind>
-    <keybind key="W-l">
-      <action name="Execute">
-        <command>xautolock -locknow</command>
-      </action>
-    </keybind>
-  </keyboard>
-  <mouse>
-    <dragThreshold>8</dragThreshold>
-    <!-- number of pixels the mouse must move before a drag begins -->
-    <doubleClickTime>200</doubleClickTime>
-    <!-- in milliseconds (1000 = 1 second) -->
-    <screenEdgeWarpTime>400</screenEdgeWarpTime>
-    <!-- Time before changing des<prompt>
-					yes
-				</prompt>ktops when the pointer touches the edge of the
-       screen while moving a window, in milliseconds (1000 = 1 second).
-       Set this to 0 to disable warping -->
-    <context name="Frame">
-      <mousebind action="Press" button="A-Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Left">
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Drag" button="A-Left">
-        <action name="Move"/>
-      </mousebind>
-      <mousebind action="Press" button="A-Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Drag" button="A-Right">
-        <action name="Resize"/>
-      </mousebind>
-      <mousebind action="Press" button="A-Middle">
-        <action name="Lower"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Click" button="C-A-Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="C-A-Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Click" button="A-S-Up">
-        <action name="SendToDesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="A-S-Down">
-        <action name="SendToDesktopNext"/>
-      </mousebind>
-    </context>
-    <context name="Titlebar">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Move"/>
-      </mousebind>
-      <mousebind action="DoubleClick" button="Left">
-        <action name="ToggleMaximizeFull"/>
-      </mousebind>
-      <mousebind action="Press" button="Middle">
-        <action name="Lower"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-      </mousebind>
-      <!--<mousebind action="Click" button="Up">
-        <action name="Shade"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-        <action name="Lower"/>
-    </mousebind>-->
-      <mousebind action="Click" button="Up">
-        <action name="ToggleAlwaysOnTop"/>
-      </mousebind>
-      <mousebind action="Click" button="Down">
-        <action name="Unshade"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Top">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize">
-          <edge>top</edge>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Left">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize">
-          <edge>left</edge>
-        </action>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Right">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize">
-          <edge>right</edge>
-        </action>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="Bottom">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize">
-          <edge>bottom</edge>
-        </action>
-      </mousebind>
-      <mousebind action="Press" button="Middle">
-        <action name="Lower"/>
-        <action name="FocusToBottom"/>
-        <action name="Unfocus"/>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="BLCorner">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize"/>
-      </mousebind>
-    </context>
-    <context name="BRCorner">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize"/>
-      </mousebind>
-    </context>
-    <context name="TLCorner">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize"/>
-      </mousebind>
-    </context>
-    <context name="TRCorner">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Drag" button="Left">
-        <action name="Resize"/>
-      </mousebind>
-    </context>
-    <context name="Client">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Press" button="Middle">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-    </context>
-    <context name="Icon">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="ShowMenu">
-          <menu>client-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="AllDesktops">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Click" button="Left">
-        <action name="ToggleOmnipresent"/>
-      </mousebind>
-    </context>
-    <context name="Shade">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Click" button="Left">
-        <action name="ToggleShade"/>
-      </mousebind>
-    </context>
-    <context name="Iconify">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Click" button="Left">
-        <action name="Iconify"/>
-      </mousebind>
-    </context>
-    <context name="Maximize">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Press" button="Middle">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Click" button="Left">
-        <action name="ToggleMaximizeFull"/>
-      </mousebind>
-      <mousebind action="Click" button="Middle">
-        <action name="ToggleMaximizeVert"/>
-      </mousebind>
-      <mousebind action="Click" button="Right">
-        <action name="ToggleMaximizeHorz"/>
-      </mousebind>
-    </context>
-    <context name="Close">
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </mousebind>
-      <mousebind action="Click" button="Left">
-        <action name="Close"/>
-      </mousebind>
-    </context>
-    <context name="Desktop">
-      <mousebind action="Click" button="Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Click" button="C-A-Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="C-A-Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Press" button="Left">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="Focus"/>
-        <action name="Raise"/>
-      </mousebind>
-    </context>
-    <context name="Root">
-      <!-- Menus -->
-      <mousebind action="Press" button="Middle">
-        <action name="ShowMenu">
-          <menu>client-list-combined-menu</menu>
-        </action>
-      </mousebind>
-      <mousebind action="Press" button="Right">
-        <action name="ShowMenu">
-          <menu>root-menu</menu>
-        </action>
-      </mousebind>
-    </context>
-    <context name="MoveResize">
-      <mousebind action="Click" button="Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Up">
-        <action name="DesktopPrevious"/>
-      </mousebind>
-      <mousebind action="Click" button="A-Down">
-        <action name="DesktopNext"/>
-      </mousebind>
-    </context>
-  </mouse>
-  <menu><!-- You can specify more than one menu file in here and they are all loaded,
-       just don't make menu ids clash or, well, it'll be kind of pointless --><!-- default menu file (or custom one in $HOME/.config/openbox/) --><file>menu.xml</file><hideDelay>200</hideDelay><!-- if a press-release lasts longer than this setting (in milliseconds), the
-       menu is hidden again --><middle>no</middle><!-- center submenus vertically about the parent entry --><submenuShowDelay>100</submenuShowDelay><!-- time to delay before showing a submenu after hovering over the parent
-       entry.
-       if this is a negative value, then the delay is infinite and the
-       submenu will not be shown until it is clicked on --><submenuHideDelay>400</submenuHideDelay><!-- time to delay before hiding a submenu when selecting another
-       entry in parent menu -->
-       if this is a negative value, then the delay is infinite and the
-       submenu will not be hidden until a different submenu is opened --&gt;
-  <applicationIcons>yes</applicationIcons>
-  <!-- controls if icons appear in the client-list-(combined-)menu -->
-  <manageDesktops>yes</manageDesktops>
-  <!-- show the manage desktops section in the client-list-(combined-)menu -->
-</menu>
-  <applications>
-    <!--
-  # this is an example with comments through out. use these to make your
-  # own rules, but without the comments of course.
-
-  <application name="the window's _OB_APP_NAME property (see obxprop)"
-              class="the window's _OB_APP_CLASS property (see obxprop)"
-               role="the window's _OB_APP_ROLE property (see obxprop)"
-               type="the window's _OB_APP_TYPE property (see obxprob)..
-                      (if unspecified, then it is 'dialog' for child windows)">
-  # you may set only one of name/class/role/type, or you may use more than one
-  # together to restrict your matches.
-
-  # the name, class, and role use simple wildcard matching such as those
-  # used by a shell. you can use * to match any characters and ? to match
-  # any single character.
-
-  # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
-  #    or desktop
-
-  # when multiple rules match a window, they will all be applied, in the
-  # order that they appear in this list
-
-
-    # each rule element can be left out or set to 'default' to specify to not 
-    # change that attribute of the window
-
-    <decor>yes</decor>
-    # enable or disable window decorations
-
-    <shade>no</shade>
-    # make the window shaded when it appears, or not
-
-    <position force="no">
-      # the position is only used if both an x and y coordinate are provided
-      # (and not set to 'default')
-      # when force is "yes", then the window will be placed here even if it
-      # says you want it placed elsewhere.  this is to override buggy
-      # applications who refuse to behave
-      <x>center</x>
-      # a number like 50, or 'center' to center on screen. use a negative number
-      # to start from the right (or bottom for <y>), ie -50 is 50 pixels from the
-      # right edge (or bottom).
-      <y>200</y>
-      <monitor>1</monitor>
-      # specifies the monitor in a xinerama setup.
-      # 1 is the first head, or 'mouse' for wherever the mouse is
-    </position>
-
-    <focus>yes</focus>
-    # if the window should try be given focus when it appears. if this is set
-    # to yes it doesn't guarantee the window will be given focus. some
-    # restrictions may apply, but Openbox will try to
-
-    <desktop>1</desktop>
-    # 1 is the first desktop, 'all' for all desktops
-
-    <layer>normal</layer>
-    # 'above', 'normal', or 'below'
-
-    <iconic>no</iconic>
-    # make the window iconified when it appears, or not
-
-    <skip_pager>no</skip_pager>
-    # asks to not be shown in pagers
-
-    <skip_taskbar>no</skip_taskbar>
-    # asks to not be shown in taskbars. window cycling actions will also
-    # skip past such windows
-
-    <fullscreen>yes</fullscreen>
-    # make the window in fullscreen mode when it appears
-
-    <maximized>true</maximized>
-    # 'Horizontal', 'Vertical' or boolean (yes/no)
-  </application>
-
-  # end of the example
--->
-    <application name="cb-logout.py">
-      <decor>no</decor>
-      <shade>no</shade>
-      <skip_pager>yes</skip_pager>
-      <fullscreen>no</fullscreen>
-      <maximized>no</maximized>
-      <layer>above</layer>
-    </application>
-    <application name="DesktopTerminal">
-      <decor>no</decor>
-      <shade>no</shade>
-      <skip_pager>yes</skip_pager>
-      <skip_taskbar>yes</skip_taskbar>
-      <fullscreen>no</fullscreen>
-      <maximized>yes</maximized>
-      <layer>below</layer>
-      <desktop>all</desktop>
-    </application>
-  </applications>
-</openbox_config>
diff --git a/_conkyrc b/_conkyrc
deleted file mode 100644
index 0cf5de47..00000000
--- a/_conkyrc
+++ /dev/null
@@ -1,62 +0,0 @@
-
-alignment top_right
-background no
-border_width 1
-cpu_avg_samples 2
-default_color white
-default_outline_color white
-default_shade_color white
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-use_xft yes
-xftfont DejaVu Sans Mono:size=9
-gap_x 5
-gap_y 29
-minimum_size 5 5
-net_avg_samples 2
-no_buffers yes
-out_to_console no
-out_to_stderr no
-extra_newline no
-own_window yes
-own_window_class Conky
-#own_window_type override
-own_window_type desktop
-own_window_hints below, undecorated, sticky, skip_taskbar, skip_pager
-double_buffer true
-own_window_transparent true
-stippled_borders 0
-update_interval 1.0
-uppercase no
-use_spacer right
-show_graph_scale no
-show_graph_range no
-format_human_readable yes
-short_units yes
-
-TEXT
-${color white}$nodename $alignr $kernel
-${color lightgrey}up${color white} $uptime_short $alignr $user_number ${color lightgrey}users${color white}
-${color lightgrey}updates${color white}$alignr${texeci 300 /home/curtis/bin/updates.sh} 
-$hr
-${color lightgrey}processes${color white}$alignr${running_processes}/${processes}
-$alignc${cpugraph 18,200}
-${color lightgrey}cpu-1${color white}$alignr${cpu cpu1}% ${cpubar cpu1 4,125}
-${color lightgrey}cpu-2${color white}$alignr${cpu cpu2}% ${cpubar cpu2 4,125}
-${color lightgrey}cpu-3${color white}$alignr${cpu cpu3}% ${cpubar cpu3 4,125}
-${color lightgrey}cpu-4${color white}$alignr${cpu cpu4}% ${cpubar cpu4 4,125}
-$hr
-${color lightgrey}ram${color white}$alignr${mem}/${memmax} ${membar 4,85}
-${color lightgrey}swap${color white}$alignr${swap}/${swapmax} ${swapbar 4,85}
-$hr
-${color lightgrey}/${color white}$alignr${fs_used /}/${fs_size /} ${fs_bar 4,75 /}
-${color lightgrey}/home${color white}$alignr${fs_used /home}/${fs_size /home} ${fs_bar 4,75 /home}
-${color lightgrey}read${color white}$alignr${diskio_read}/s ${diskiograph_read 9,105}
-${color lightgrey}write${color white}$alignr${diskio_write}/s ${diskiograph_write 9,105}
-$hr
-${color lightgrey}eth0${color white}$alignr${addr eth0}
-$alignr${texeci 3600 curl da.gd/ip}
-${color lightgrey}down${color white}$alignr${downspeed eth0}/s ${downspeedgraph eth0 9,70} $totaldown
-${color lightgrey}up${color white}$alignr${upspeed eth0}/s ${upspeedgraph eth0 9,70} $totalup
diff --git a/_vimrc b/_vimrc
deleted file mode 100644
index 20cb2441..00000000
--- a/_vimrc
+++ /dev/null
@@ -1,102 +0,0 @@
-set nocompatible
-
-noremap \ ,
-let mapleader = ","
-
-set backspace=indent,eol,start " allow backspacing everything
-set hidden
-set backup
-set history=50
-set ruler " show cursor position all the time
-set showcmd " show incomplete commands
-set incsearch
-set ignorecase
-set smartcase
-set guioptions-=t " no tear-off menus
-if has('mouse')
-  set mouse=a
-endif
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-
-augroup vimrcEx
-au!
-" jump to the last cursor position
-autocmd BufReadPost *
-  \ if line("'\"") > 1 && line("'\"") <= line("$") |
-  \   exe "normal! g`\"" |
-  \ endif
-augroup END
-
-set autoindent
-set smartindent
-colorscheme Tomorrow-Night
-set nu
-
-" 4-space indents
-set tabstop=4
-set shiftwidth=4
-set expandtab
-
-filetype plugin indent on
-autocmd FileType ruby setlocal expandtab shiftwidth=2
-
-"set showmatch " jump to matching bracket
-set guioptions-=T " no toolbar in gvim
-"set cc=80 " highlight 80th column
-set guifont=Monospace\ 9
-
-set spell
-"set fdm=syntax " fold by syntax
-
-set cc=80 " Highlight column 80
-
-nnoremap ' `
-nnoremap ` '
-
-"better tab complete
-set wildmenu
-set wildmode=list:longest
-set wildignore=*.o,*.d,*~
-
-set title " change terminal title
-
-runtime macros/matchit.vim " smarter %
-
-nmap <silent> <leader>n :silent :nohlsearch<CR>
-
-" Show trailing whitespace with ,s
-nmap <silent> <leader>s :set nolist!<CR>
-
-set shortmess=atI
-
-" Easy X copy/paste
-map <leader>p "+p
-map <leader>P "+P
-map <leader>y "+y
-map <leader>Y "+Y
-map <leader>d "+d
-map <leader>D "+D
-
-set visualbell t_vb=
-
-set cursorline
-
-" Insert hard tab
-imap <silent> <S-tab> <C-v><tab>
-
-set browsedir=buffer " GUI Open starts in CWD
-
-map Q gq
-
-command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis | wincmd p | diffthis
-
-" Show trailing whitespace and hard tabs
-set list
-set listchars=tab:»·,trail:·
-
-set smarttab
-
-command W :w " I often accidentally type :W when I mean :w
diff --git a/update.rb b/update.rb
deleted file mode 100755
index 9f1c67dd..00000000
--- a/update.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-
-dotfiles = {}
-
-dirs = ['.']
-dirs.each do |dir|
-  Dir.foreach(dir) do |file|
-    next if file[0] == '.'
-    file = File.join(dir, file)
-    if File.directory? file
-      dirs << file
-      next
-    end
-    dotfiles[file] = file.sub('.', '~').sub('_', '.') if %r{/_} =~ file
-  end
-end
-
-dotfiles.each do |a, b|
-  a, b = File.expand_path(a), File.expand_path(b)
-  FileUtils.cp(b, a)
-  puts "#{b} -> #{a}"
-end
-
-system('git diff')
-system('git add .')
-system('git commit')
-system('git push')