diff --git a/.vim/tmp/.#nightly.timer5bd53d54b4ed885c~ b/.vim/tmp/.#nightly.timer5bd53d54b4ed885c~
new file mode 100644
index 0000000..2aa855a
--- /dev/null
+++ b/.vim/tmp/.#nightly.timer5bd53d54b4ed885c~
@@ -0,0 +1,9 @@
+[Unit]
+Description=Reach nightly.target nightly
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/.vim/tmp/.#nightly.timer93fab2ded589cc0c~ b/.vim/tmp/.#nightly.timer93fab2ded589cc0c~
new file mode 100644
index 0000000..38c0ca3
--- /dev/null
+++ b/.vim/tmp/.#nightly.timer93fab2ded589cc0c~
@@ -0,0 +1,9 @@
+[Unit]
+Description=Push Home dir Git repo daily.
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/.vim/tmp/.#nightlypush.service71a610c97e90e58c~ b/.vim/tmp/.#nightlypush.service71a610c97e90e58c~
new file mode 100644
index 0000000..b51c9d9
--- /dev/null
+++ b/.vim/tmp/.#nightlypush.service71a610c97e90e58c~
@@ -0,0 +1,7 @@
+[Unit]
+Description=Push all vcsh repos daily
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash for i in $(vcsh list); do vcsh $i push; done
+
diff --git a/.vim/tmp/.#nightlypush.serviceaac3e021557c4199~ b/.vim/tmp/.#nightlypush.serviceaac3e021557c4199~
new file mode 100644
index 0000000..bd3b29f
--- /dev/null
+++ b/.vim/tmp/.#nightlypush.serviceaac3e021557c4199~
@@ -0,0 +1,7 @@
+[Unit]
+Description=Push all vcsh repos daily
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash for i in $(vcsh list); do echo $i\:; vcsh $i push; done
+
diff --git a/.vim/tmp/.#nightlypush.serviceee1bd018debe4989~ b/.vim/tmp/.#nightlypush.serviceee1bd018debe4989~
new file mode 100644
index 0000000..13c4435
--- /dev/null
+++ b/.vim/tmp/.#nightlypush.serviceee1bd018debe4989~
@@ -0,0 +1,7 @@
+[Unit]
+Description=Push Homedir git repo to remote server
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/git -C /home/dthurstenson push
+
diff --git a/.vim/tmp/.#pkglistbu.servicebe30d932425439db~ b/.vim/tmp/.#pkglistbu.servicebe30d932425439db~
new file mode 100644
index 0000000..9a96d81
--- /dev/null
+++ b/.vim/tmp/.#pkglistbu.servicebe30d932425439db~
@@ -0,0 +1,7 @@
+[Unit]
+Description=Package List Backup Utility
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash %h/.pkglists/pkglistbu.sh
+
diff --git a/.vim/tmp/.xinitrc~ b/.vim/tmp/.xinitrc~
index e7a071a..761748d 100644
--- a/.vim/tmp/.xinitrc~
+++ b/.vim/tmp/.xinitrc~
@@ -52,10 +52,16 @@ fi
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
-xrandr --output VGA1 --auto --right-of HDMI1
-
+# Automatically lock after 30 minutes using slock
 xautolock -time 30 -locker slock &
 
+if [[ "$HOSTNAME" == "dtarch" ]]; then
+	# Set VGA1 to be right of HDMI1
+	xrandr --output VGA1 --auto --right-of HDMI1
+
+	# Set the bell to be different from Matt's 
+	xset b 75 750 50
+fi
 session=${1:-i3}
 
 case $session in
@@ -69,7 +75,7 @@ case $session in
 	fluxbox           ) exec startfluxbox;;
 	gnome             ) exec gnome-session;;
 	gnome-classic     ) exec gnome-session --session=gnome-classic;;
-	i3|i3wm           ) exec i3;;
+	i3|i3wm           ) exec i3 -c ~/.config/i3/$HOSTNAME.config;;
 	icewm             ) exec icewm-session;;
 	jwm               ) exec jwm;;
 	kde               ) exec startkde;;
diff --git a/.vim/tmp/COMMIT_EDITMSG~ b/.vim/tmp/COMMIT_EDITMSG~
index 68753c5..3fb9de4 100644
--- a/.vim/tmp/COMMIT_EDITMSG~
+++ b/.vim/tmp/COMMIT_EDITMSG~
@@ -5,29 +5,121 @@
 # Your branch is up-to-date with 'origin/master'.
 #
 # Changes to be committed:
-#	new file:   .pkglists/dtarch.20160120.list
-#	modified:   .pkglists/dtarch.list.log
+#	new file:   nightly.target
+#	renamed:    nightlypush.timer -> nightly.timer
+#	new file:   pkglistbu.service
 #
 # Changes not staged for commit:
-#	modified:   .config/deluge/hostlist.conf.1.2
-#	modified:   .config/deluge/ipc/deluge-gtk.lock
-#	modified:   .config/gtk-2.0/gtkfilechooser.ini
-#	modified:   .config/pbpst/db.json
-#	modified:   .config/pulse/6aec0aca4e584766b368aeac519511ab-stream-volumes.tdb
-#	modified:   .config/rabbitvcs/RabbitVCS.log
-#	modified:   .config/rabbitvcs/previous_log_messages
-#	modified:   .config/rabbitvcs/repos_paths
-#	modified:   .weechat/weechat.log
+#	modified:   nightlypush.service
 #
 # Untracked files:
-#	.RapidSVN
-#	.config/deluge/icons/archlinux.org.ico
-#	.config/rabbitvcs/RabbitVCS.log.2015-12-23
-#	.config/vcsh/
-#	backup.sh
-#	baseball/
-#	debconf.conf
-#	pbpst
-#	rpi/
-#	supportserv
+#	../../../.ICEauthority
+#	../../../.README.md
+#	../../../.RapidSVN
+#	../../../.Xauthority
+#	../../../.android/
+#	../../../.bash_history
+#	../../../.bash_logout
+#	../../../.bash_profile
+#	../../../.bashrc
+#	../../../.cache/
+#	../../../.chirp/
+#	../../../.cinnamon/
+#	../../Synergy/
+#	../../Trolltech.conf
+#	../../autostart/
+#	../../dconf/
+#	../../deluge/
+#	../../ds4drv.conf
+#	../../gconf/
+#	../../gedit/
+#	../../google-chrome/
+#	../../gtk-2.0/
+#	../../htop/
+#	../../i3/
+#	../../i3status/
+#	../../libvirt/
+#	../../maint/
+#	../../menus/
+#	../../nemo-compare.conf
+#	../../nemo/
+#	../../pbpst/
+#	../../pkglists/
+#	../../pulse/
+#	../../rabbitvcs/
+#	nightly.target.wants/
+#	timers.target.wants/
+#	../../touchegg/
+#	../../transmission/
+#	../../vcsh/
+#	../../vlc/
+#	../../../.dmrc
+#	../../../.eaglemode/
+#	../../../.esd_auth
+#	../../../.git-credentials
+#	../../../.gitconfig
+#	../../../.gitignore~
+#	../../../.gnome/
+#	../../../.gnupg/
+#	../../../.irssi/
+#	../../../.lesshst
+#	../../../.local/
+#	../../../.node_repl_history
+#	../../../.pkglists/
+#	../../../.pki/
+#	../../../.python-eggs/
+#	../../../.ssh/
+#	../../../.subversion/
+#	../../../.themes/
+#	../../../.tmux.conf
+#	../../../.tmux.conf~
+#	../../../.vim/
+#	../../../.viminfo
+#	../../../.vimrc
+#	../../../.vimrc~
+#	../../../.weechat/
+#	../../../.xinitrc
+#	../../../.xinitrc~
+#	../../../.xsession-errors
+#	../../../.xsession-errors.old
+#	../../../.zenmap/
+#	../../../0.4.2.tar.gz
+#	../../../2015-09-24-raspbian-jessie.img
+#	../../../2015-09-24-raspbian-jessie.zip
+#	../../../49-wheel-nopasswd.rules
+#	../../../ArchLinuxARM-beagleboard-latest.tar.gz
+#	../../../Downloads/
+#	../../../abs/
+#	../../../archlinux-2015.11.01-dual.iso
+#	../../../backup.sh
+#	../../../baseball/
+#	../../../blackmagic/
+#	../../../bu.gitignore
+#	../../../debconf.conf
+#	../../../drengrave.zip
+#	../../../ds4drv.conf
+#	../../../engraver/
+#	../../../fdboot.img
+#	../../../github/
+#	../../../gtk-theme-arc-git/
+#	../../../installlist.save
+#	../../../iptables.rules
+#	../../../ipxe.efi
+#	../../../ipxe/
+#	../../../jessie-rpi2-20150705.img
+#	../../../jessie-rpi2-20150705.img.gz
+#	../../../matt.pub
+#	../../../pbpst
+#	../../../piconfig/
+#	../../../raineysvn/
+#	../../../rpi/
+#	../../../rules
+#	../../../rules1
+#	../../../rules2
+#	../../../sp-rpi-alpha-19-11-15.img
+#	../../../spserv
+#	../../../supportserv
+#	../../../test
+#	../../../test.txt
+#	../../../wimboot-latest.zip
 #
diff --git a/.vim/tmp/dtarch.config~ b/.vim/tmp/dtarch.config~
new file mode 100644
index 0000000..94d726c
--- /dev/null
+++ b/.vim/tmp/dtarch.config~
@@ -0,0 +1,170 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:monospace 8
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+
+# set border to 1px 
+bindsym $mod+Shift+b border toggle
+
+# mod+m to move workspace to next display 
+bindsym $mod+m move workspace to output left
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status -c ~/.config/i3status/$HOSTNAME.config
+        tray_output primary
+	output HDMI1
+}
+
+bindsym Mod1+Control+l exec slock
+
+new_window none
+new_float none
diff --git a/.vim/tmp/pkglistbu.service~ b/.vim/tmp/pkglistbu.service~
new file mode 100644
index 0000000..f5045d5
--- /dev/null
+++ b/.vim/tmp/pkglistbu.service~
@@ -0,0 +1,7 @@
+[Unit]
+Description=Package List Backup Utility
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash /home/dthurstenson/.pkglists/pkglistbu.sh
+
diff --git a/.vim/tmp/pkglistbu.sh~ b/.vim/tmp/pkglistbu.sh~
new file mode 100644
index 0000000..8689e1a
--- /dev/null
+++ b/.vim/tmp/pkglistbu.sh~
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# pkglistbu.sh
+
+# Automatically back up package lists to a file
+# intended to run as a cron/timer job
+
+pluser=dthurstenson
+pldate=`date +%Y%m%d`
+pldir=/home/$pluser/.pkglists/
+plist=$pldir$HOSTNAME.$pldate.list
+plog=$pldir$HOSTNAME.list.log
+platest=$(ls -t -d -1 $pldir$HOSTNAME*.list | head -1)
+
+echo Last list: $platest
+
+echo Getting package list for: $HOSTNAME
+
+pacman -Qqen > $plist
+chown $pluser:$pluser $plist
+
+echo Comparing $platest to $plist
+
+# If $platest differs from $plist
+if ! cmp $platest $plist >/dev/null 2>&1
+then
+	# Add diff to log
+	printf "\n\n=== $(date +%m.%d.%Y) ==\n" >> $plog
+	diff $platest $plist | grep '[<>]' >> $plog
+
+	echo "Adding and commiting changes to git repo"
+	git -C /home/$pluser add $pldir
+	git -C /home/$pluser commit -m "Pkglistbu auto commit for $date"
+
+	echo Done: Package list stored at: $plist
+else
+	echo $platest and $plist are identical!
+	echo "Package list hasn't changed since last run"
+	rm $plist 
+	echo Done.
+fi
diff --git a/.vim/undo/%home%dthurstenson%.config%i3%dtarch.config b/.vim/undo/%home%dthurstenson%.config%i3%dtarch.config
new file mode 100644
index 0000000..fa06df0
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%i3%dtarch.config differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer5bd53d54b4ed885c b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer5bd53d54b4ed885c
new file mode 100644
index 0000000..fb5e906
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer5bd53d54b4ed885c differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer93fab2ded589cc0c b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer93fab2ded589cc0c
new file mode 100644
index 0000000..ab8e318
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightly.timer93fab2ded589cc0c differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.service71a610c97e90e58c b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.service71a610c97e90e58c
new file mode 100644
index 0000000..d2bb56b
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.service71a610c97e90e58c differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceaac3e021557c4199 b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceaac3e021557c4199
new file mode 100644
index 0000000..acaa636
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceaac3e021557c4199 differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceee1bd018debe4989 b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceee1bd018debe4989
new file mode 100644
index 0000000..d1bba53
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#nightlypush.serviceee1bd018debe4989 differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%.#pkglistbu.servicebe30d932425439db b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#pkglistbu.servicebe30d932425439db
new file mode 100644
index 0000000..6669ac3
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%.#pkglistbu.servicebe30d932425439db differ
diff --git a/.vim/undo/%home%dthurstenson%.config%systemd%user%nightly.target b/.vim/undo/%home%dthurstenson%.config%systemd%user%nightly.target
new file mode 100644
index 0000000..43847ba
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%systemd%user%nightly.target differ
diff --git a/.vim/undo/%home%dthurstenson%.config%vcsh%repo.d%systemd-user.git%COMMIT_EDITMSG b/.vim/undo/%home%dthurstenson%.config%vcsh%repo.d%systemd-user.git%COMMIT_EDITMSG
new file mode 100644
index 0000000..1adefb9
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.config%vcsh%repo.d%systemd-user.git%COMMIT_EDITMSG differ
diff --git a/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.service b/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.service
new file mode 100644
index 0000000..25197cf
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.service differ
diff --git a/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.sh b/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.sh
new file mode 100644
index 0000000..69fd9f8
Binary files /dev/null and b/.vim/undo/%home%dthurstenson%.pkglists%pkglistbu.sh differ
diff --git a/.vim/undo/%home%dthurstenson%.xinitrc b/.vim/undo/%home%dthurstenson%.xinitrc
index 19d6553..a0478c3 100644
Binary files a/.vim/undo/%home%dthurstenson%.xinitrc and b/.vim/undo/%home%dthurstenson%.xinitrc differ