# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1292375623 18000
# Node ID 29ed704bc669e131b683df97daa7069bbb7d124e
# Parent  1e291f276d2160d5ac9e9b0db5d74c935211524f# Parent  cae75a813ef916c1b60e9444501c19c8e39e4deb
Merge.

diff -r cae75a813ef9 -r 29ed704bc669 .tmux.conf
--- a/.tmux.conf	Tue Dec 14 20:08:11 2010 -0500
+++ b/.tmux.conf	Tue Dec 14 20:13:43 2010 -0500
@@ -13,7 +13,9 @@
 bind -t vi-copy y copy-selection
 bind -n C-p paste-buffer -s \015
 
+# random options
 setw -g automatic-rename
+set-option -g default-terminal "screen-256color"
 
 # status bar
 set-option -g status-utf8 on
diff -r cae75a813ef9 -r 29ed704bc669 .zshrc
--- a/.zshrc	Tue Dec 14 20:08:11 2010 -0500
+++ b/.zshrc	Tue Dec 14 20:13:43 2010 -0500
@@ -10,6 +10,8 @@
 alias j='z'
 alias fab='fab -i ~/.ssh/stevelosh'
 alias oldgcc='export CC=/usr/bin/gcc-4.0'
+alias tm='tmux -u2'
+alias c='clear'
 
 # Environment variables ------------------------------------------------------
 export EDITOR='vim'
diff -r cae75a813ef9 -r 29ed704bc669 vim/.vimrc
--- a/vim/.vimrc	Tue Dec 14 20:08:11 2010 -0500
+++ b/vim/.vimrc	Tue Dec 14 20:13:43 2010 -0500
@@ -73,7 +73,7 @@
 " Color scheme (terminal)
 syntax on
 set background=dark
-colorscheme delek
+colorscheme molokai
 
 " NERD Tree
 map <F2> :NERDTreeToggle<cr>
@@ -366,8 +366,6 @@
 
 if has('gui_running')
     set guifont=Menlo:h12
-    colorscheme molokai
-    set background=dark
 
     set go-=T
     set go-=l