Added node_modules to gitignore (use package.json)

tmux / copy paste changes, z now installed via homebrew

gitignore

@@ -15,6 +15,7 @@
 .tmp_*
 .revision
 _srcs
+node_modules
 
 # OS or editor folders and files
 .DS_Store

oh-my-zsh

@@ -1 +1 @@
-Subproject commit 97a154e6b246dc5716ddadd3e510c22951a8135b
+Subproject commit 35acc62c0382a41d2101488df0b13bbdbb32f2c1

tmux.conf

@@ -1,3 +1,6 @@
+# reparing copy & paste
+set-option -g default-command "reattach-to-user-namespace -l zsh"
+
 # Use a 256 color terminal
 set-option -g default-terminal "screen-256color"
 
@@ -43,6 +46,17 @@ set -g mouse-select-window on
 set -g mouse-resize-pane on
 setw -g mode-mouse on
 
+# Copy mode
+setw -g mode-keys vi
+bind ` copy-mode
+unbind [
+unbind p
+bind p paste-buffer
+bind -t vi-copy v begin-selection
+bind -t vi-copy y copy-selection
+bind -t vi-copy Escape cancel
+bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
+
 # Number windows and panes from 1
 set -g base-index 1
 setw -g pane-base-index 1

vim/bundle/html5

@@ -1 +1 @@
-Subproject commit 34b407d2344a3c2a94b56e9d443e18e01e8544d9
+Subproject commit d89cdd355c10335d02531e83eb0c699304914e1e

vim/bundle/supertab

@@ -1 +1 @@
-Subproject commit d34f3c01f9b7f4eb9d0f942bcc3ecd65c31128fc
+Subproject commit 7152e361e78d08857c577b1161fe6f6235b8a9aa

vimrc

@@ -8,6 +8,9 @@ syntax on
 " Gstatus etc. will work fine after 'sudo mv /etc/zshenv /etc/zprofile' anyways
 " set shell=/usr/local/bin/zsh\ -l\ -i\ -e
 
+" terminal vim and tmux
+set clipboard=unnamed
+
 set nocompatible   " activate vim awesomeness
 set ruler          " show where you are in the document
 set cursorline     " highligh current line
@@ -179,6 +182,12 @@ vmap <C-left> <gv
 vmap <C-right> >gv
 
 set pastetoggle=<F2>    " toggle paste-mode for c&p with F2
+" Yank text to the OS X clipboard
+noremap <leader>y "*y
+noremap <leader>Y "*Y
+
+" Preserve indentation while pasting text from the OS X clipboard
+noremap <leader>p :set paste<CR>:put  *<CR>:set nopaste<CR>
 
 " no HELP while mishitting ESC - awesome
 inoremap <F1> <ESC>

zshrc

@@ -9,7 +9,7 @@ source $ZSH/oh-my-zsh.sh
 unsetopt correct_all
 
 # paths
-export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH
+export PATH=/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:$HOME/.rvm/bin:$PATH
 export MANPATH=/usr/local/share/man:$MANPATH
 
 # disable stupid ._ and dsstore files
@@ -17,8 +17,8 @@ export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
 export COPYFILE_DISABLE=true
 
 # editor
-export EDITOR=mvim
-export VISUAL=mvim
+export EDITOR=vim
+export VISUAL=vim
 
 # node.js
 export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
@@ -26,6 +26,9 @@ export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
 # disable auto titling fixes tmux window
 export DISABLE_AUTO_TITLE=true
 
+# z script installed via homebrew
+. `brew --prefix`/etc/profile.d/z.sh
+
 ### aliases ##
 # aliases for apache and mysql
 alias apachestart='_ /usr/sbin/apachectl start'
@@ -51,13 +54,13 @@ alias rvmup='rvm get latest'
 alias upall='brewup && rvmup && gemup && npmup && dotup && dotsubup'
 
 # always use mvim but for 'vim'
-alias v='mvim'
-alias vd='mvimdiff'
-alias diff='mvimdiff'
+alias v='vim'
+alias vd='vimdiff'
+alias diff='vimdiff'
 
 # easy hosts-editing
-alias hosts='_ mvim /etc/hosts'
-alias vhosts='_ mvim /etc/apache2/extra/httpd-vhosts.conf'
+alias hosts='_ vim /etc/hosts'
+alias vhosts='_ vim /etc/apache2/extra/httpd-vhosts.conf'
 
 # Easier navigation: .., ..., ~ and -
 alias ..='cd ..'