Merge branch 'master' of https://www.github.com/binaryatrocity/dotfiles

README.md

@@ -1,4 +1,8 @@
 dotfiles
 ========
 
-The aptly named
+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

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}]
+

dwmstart

@@ -0,0 +1,5 @@
+#! /bin/bash
+
+conky | while read -r; do xsetroot -name "$REPLY"; done &
+sh ~/.fehbg &
+exec dwm

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

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
 

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>