From 17b922b11b5699631c0b1c6f9675e5069363a9b9 Mon Sep 17 00:00:00 2001
From: Brandon Cornejo <brandon.cornejo@gmail.com>
Date: Thu, 28 Mar 2013 14:24:42 -0500
Subject: [PATCH 1/3] Added supertab plugin

---
 install.sh | 0
 tmux.conf  | 3 +++
 vimrc      | 1 +
 3 files changed, 4 insertions(+)
 mode change 100644 => 100755 install.sh

diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
diff --git a/tmux.conf b/tmux.conf
index c93bf4b..1e7ff09 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -2,6 +2,9 @@
 set-option -g prefix C-a
 bind-key C-a last-window
 
+# set default shell
+set-option -g default-shell /bin/zsh 
+
 # Window size constraints
 setw -g aggressive-resize on
 
diff --git a/vimrc b/vimrc
index fe1e8be..f32c519 100644
--- a/vimrc
+++ b/vimrc
@@ -57,6 +57,7 @@ Bundle 'fholgado/minibufexpl.vim.git'
 Bundle 'Lokaltog/vim-powerline.git'
 Bundle 'Lokaltog/vim-distinguished.git'
 Bundle 'scrooloose/nerdtree.git'
+Bundle 'ervandew/supertab.git'
 
 " toggle showing nerd-tree
 :nmap <leader>e :NERDTreeToggle<CR>

From b8f2505e609eadf03f80407c9e83a11464cf3a98 Mon Sep 17 00:00:00 2001
From: Brandon Cornejo <brandon.cornejo@gmail.com>
Date: Fri, 29 Mar 2013 13:43:21 -0500
Subject: [PATCH 2/3] dwm and conky configs

---
 README.md  | 6 +++++-
 install.sh | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 install.sh

diff --git a/README.md b/README.md
index a2576be..3840cc7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 dotfiles
 ========
 
-The aptly named
\ No newline at end of file
+The aptly named.
+
+Vim: Vundle plugin manager, nerdtree, minibufexpl
+Tmux: Play nice with vim colors, use screen keybindings
+dwm+conky: basic status bar (cpu/temp/mem/SSID/date/battery), and feh for wallpaper
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index 3764140..76f5468
--- a/install.sh
+++ b/install.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
 
 dir=~/dotfiles
-files="vimrc tmux.conf"
+files="vimrc tmux.conf conkyrc"
 
 cd $dir
 for file in $files; do
 	ln -s $dir/$file ~/.$file
 done
 
+chmod +x dwmstart
+ln -s $dir/dwmstart ~/dwmstart
+
 if [ ! -d ~/.vim/bundle/vundle ]; then
 	git clone https://github.com/gmarik/vundle.git  ~/.vim/bundle/vundle
 	vim +BundleInstall +qall

From a11c03b9710a7058c7444d6b3a492a316ad63e4c Mon Sep 17 00:00:00 2001
From: Brandon Cornejo <brandon.cornejo@gmail.com>
Date: Fri, 29 Mar 2013 13:44:29 -0500
Subject: [PATCH 3/3] dwm and conky configs

---
 conkyrc  | 10 ++++++++++
 dwmstart |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 conkyrc
 create mode 100755 dwmstart

diff --git a/conkyrc b/conkyrc
new file mode 100644
index 0000000..6a948af
--- /dev/null
+++ b/conkyrc
@@ -0,0 +1,10 @@
+out_to_console yes
+out_to_x no
+background no
+update_interval 2
+total_run_times 0
+use_spacer none
+
+TEXT
+${cpu cpu1}% / ${cpu cpu2}% :: ${acpitemp}c ${color #0100ff} :: $memperc% ($mem) :: ${wireless_essid wlan0} :: ${time %a %b %d %I:%M%P} [${battery BAT0} ${battery_time BAT0}]
+
diff --git a/dwmstart b/dwmstart
new file mode 100755
index 0000000..386679c
--- /dev/null
+++ b/dwmstart
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+conky | while read -r; do xsetroot -name "$REPLY"; done &
+sh ~/.fehbg &
+exec dwm