Merge branch 'master' of github.com:dustinswan/dotfiles

tmux.conf

@@ -1,19 +1,20 @@
-# command prefix (like screen)
+# Set the prefix to ^A
-# set -g prefix C-a
-# bind C-a send-prefix
-
-# Set the prefix to ^A.
 unbind C-b
 set -g prefix C-a
-bind C-a send-prefix
+bind a send-prefix
+
+# Start numbering at 1
+set -g base-index 1
 
 # I must be missing something..
 bind C-n next-window
 bind C-p previous-window
 bind C-c new-window
-bind C-a last-window
 bind C-d detach
 
+# handy
+bind C-a last-window
+
 # basic settings
 set-window-option -g mode-keys vi # vi key
 set-option -g status-keys vi
@@ -40,4 +41,3 @@ set -g status-left '#[fg=colour238,bg=colour234,nobold]⮀'
 set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]⮂#[fg=colour16,bg=colour254,bold] #h '
 set -g window-status-format "#[fg=white,bg=colour234] #I #W "
 set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
-#

vim/bundle/vundle

@@ -1 +1 @@
-Subproject commit dd8356aea7499fed92f7c37227b1625a2b3dc190
+Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89

vimrc

@@ -168,6 +168,9 @@ nnoremap <leader>w <c-w>v<c-w>l
 " open Ack
 nnoremap <leader>a :Ack<space>
 
+" Marked
+nnoremap <leader>m :silent !open -a Marked.app '%:p'<cr>
+
 " Clam
 nnoremap ! :Clam<space>
 

zshrc

@@ -32,7 +32,6 @@ source $ZSH/oh-my-zsh.sh
 # Customize to your needs...
 alias vi=vim
 export EDITOR=vim
-export PATH="/usr/local/bin:$PATH"
 
 # VCS stuff
 export P4USER=dswan
@@ -44,4 +43,7 @@ export SVN_EDITOR=vim
 # sync visidev to latest Perforce
 alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'"
 
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+export PATH=/usr/local/bin:$PATH # Homebrew
+export PATH=$HOME/.rvm/bin:$PATH # RVM
+export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH # Postgres
+export PATH=$HOME/Library/Haskell/bin:$PATH # Haskell