remove oh-my-zsh

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "oh-my-zsh"]
-	path = oh-my-zsh
-	url = git@github.com:webgefrickel/oh-my-zsh.git

exports

@@ -1,11 +1,17 @@
 # Terminal
 export TERM="screen-256color"
 
+# shell
+export SHELL=/usr/local/bin/zsh
+
 # brew CASK
 export HOMEBREW_CASK_OPTS="--appdir=/Applications"
 
 # paths
-export PATH=/usr/local/bin:/usr/local/sbin:$HOME/.rvm/bin:$PATH
+export PATH=/usr/local/bin:/usr/local/sbin:$PATH
+export PATH=$HOME/.rvm/bin:$PATH
+export PATH=$HOME/.tmuxifier/bin:$PATH
+
 export MANPATH=/usr/local/share/man:$MANPATH
 
 # disable stupid ._ and dsstore files

oh-my-zsh

@@ -1 +0,0 @@
-Subproject commit bf4afdf274522f8d7d22e59a47c0e6226cd9d69a

tmux.conf

@@ -4,44 +4,68 @@ set -g default-terminal "screen-256color"
 # zsh
 set-option -g default-shell $SHELL
 
+# bind default prefix to ctrl-a
+set -g prefix C-a
+unbind-key C-b
+bind-key a send-prefix
+
+
+
+# use vim motions :-)
+setw -g mode-keys vi
+
+# copy & paste shortcut
+unbind [
+unbind p
+bind Escape copy-mode
+bind p paste-buffer
+
 # reparing copy & paste
-set-option -g default-command "reattach-to-user-namespace -l zsh"
+# Setup 'v' to begin selection as in Vim
+bind-key -t vi-copy v begin-selection
+bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+
+# Update default binding of `Enter` to also use copy-pipe
+unbind -t vi-copy Enter
+bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
+
+
 
 # Fix for sending keys to Vim
 setw -g xterm-keys on
+# set esc-timeout to 50ms (better vim)
+set -sg escape-time 50
+
+
 
-# bind default prefix to ctrl-a
-set -g prefix C-a
-unbind-key C-b
-bind-key a send-prefix
 
 # Force a reload of te config file
 unbind-key r
 bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded!"
 
-# set esc-timeout to 50ms (better vim)
-set -sg escape-time 50
-
 # Saner window splitting
 unbind %
 bind \ split-window -h
 bind - split-window -v
 
+
 # Easier resizing
 unbind-key -n C-j
 unbind-key -n C-k
 unbind-key -n C-h
 unbind-key -n C-l
+
 bind-key -r C-j resize-pane -D
 bind-key -r C-k resize-pane -U
 bind-key -r C-h resize-pane -L
 bind-key -r C-l resize-pane -R
 
 # Navigation
-bind-key -r j select-pane -D
-bind-key -r k select-pane -U
-bind-key -r h select-pane -L
-bind-key -r l select-pane -R
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key h select-pane -L
+bind-key l select-pane -R
+
 
 # Mouse support
 set -g mouse-select-pane on
@@ -49,18 +73,7 @@ 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
+# counting panes starts at 1
 set -g base-index 1
 setw -g pane-base-index 1
 
@@ -68,7 +81,7 @@ setw -g pane-base-index 1
 set -g display-time 2000
 
 
-# default statusbar colors / solarized dark
+# statusbar colors solarized dark
 set-option -g status-bg black 
 set-option -g status-fg yellow
 set-option -g status-attr default
@@ -84,8 +97,7 @@ set-option -g display-panes-active-colour blue
 set-option -g display-panes-colour brightred
 set-window-option -g clock-mode-colour green
 
-
-# Custom status bar - Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
+# Custom status bar - with Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
 set -g status-left-length 32
 set -g status-right-length 150
 set -g status-interval 5

vimrc

@@ -168,9 +168,10 @@ set noerrorbells        " don't beep
 set visualbell          " don't beep
 
 
-" ========== Custom Keymappings ==========
+" Custom key mappings and shortcuts
+" ======================================================================
 
-" Typos
+" Fix some common typos
 command! -bang E e<bang>
 command! -bang Q q<bang>
 command! -bang W w<bang>
@@ -292,17 +293,21 @@ nnoremap <space> za
 nnoremap <leader>c :execute "vimgrep /" . expand("<cword>") . "/j **" <Bar> cnext<CR>
 
 
-" ========== PLugins leaders and other config ==========
-" search using Ag - the Silver Surfer ftw!
+" Plugins
+" ======================================================================
+"
+" Ag
 nnoremap <leader>a :Ag 
 
-" Nerdtree toggle
+
+" NERDtree
 nnoremap <leader>n :NERDTreeToggle<cr>
 let NERDTreeMinimalUI=1
 let NERDTreeWinSize=50
 let NERDTreeShowHidden=1
 
-" fugitive shortcuts -- 20+ increases window-height
+
+" fugitive shortcuts (20+ increases window-height)
 nnoremap <silent> <leader>gs :Gstatus<CR><C-w>20+
 nnoremap <silent> <leader>gd :Gdiff<CR><C-w>20+
 nnoremap <silent> <leader>gc :Gcommit<CR><C-w>20+
@@ -311,12 +316,14 @@ nnoremap <silent> <leader>gl :Glog<CR><C-w>20+
 nnoremap <silent> <leader>gp :Git push<CR><C-w>20+
 nnoremap <silent> <leader>gw :Gwrite<CR><C-w>20+
 
+
 " TComment
 nnoremap <leader>/ :TComment<CR>
 vnoremap <leader>/ :TComment<CR>
 inoremap <leader>/ <Esc>:TComment<CR>
 
-" Tabularize a == think align
+
+" Tabularize (a == think align)
 nmap <Leader>a= :Tabularize /=<CR>
 vmap <Leader>a= :Tabularize /=<CR>
 nmap <Leader>a{ :Tabularize /{<CR>
@@ -329,21 +336,24 @@ nmap <Leader>a<Bar> :Tabularize /<Bar><CR>
 vmap <Leader>a<Bar> :Tabularize /<Bar><CR>
 
 
-" easymotion config leader m
+" easymotion
 let g:EasyMotion_leader_key = '<leader>m'
 
-" ultisnips in custom dir
-let g:UltiSnipsSnippetDirectories=["snippets"]
+
+" ultisnips
+let g:UltiSnipsSnippetDirectories = ["snippets"]
 
 
-" Enable syntastic syntax checking
+" Syntastic
 " no checking for xhtml/html -- because of fluidtemplate for TYPO3
 " and no checking for scss.css because of CSS3 and SASS-Variable
-" errors for included files - let codekit handle this
-let g:syntastic_auto_jump=0
-let g:syntastic_mode_map = { 'mode': 'active',
-                           \ 'active_filetypes': ['ruby', 'php', 'javascript'],
-                           \ 'passive_filetypes': ['xhtml', 'html', 'scss', 'scss.css'] }    
+let g:syntastic_auto_jump = 0
+let g:syntastic_mode_map = { 
+  \ 'mode': 'active',
+  \ 'active_filetypes': ['ruby', 'php', 'javascript'],
+  \ 'passive_filetypes': ['xhtml', 'html', 'scss', 'scss.css', 'css'] 
+  \ }    
+
 
 " CtrlP
 nnoremap <leader>b :CtrlPBuffer<cr>
@@ -357,15 +367,16 @@ let g:ctrlp_custom_ignore = {
   \ 'file': '\v\.(exe|so|dll|zip|gz|png|gif|jpg|tif|psd|pdf|mp4|webm|mp3)$',
   \ }
 
+
 " Gist filetype-detection
 let g:gist_detect_filetype = 1
 
 
 " airline config
+let g:airline_theme = 'solarized'
+let g:airline_left_sep = '▶'
+let g:airline_right_sep = '◀'
 
-let g:airline_theme='solarized'
-let g:airline_left_sep='▶'
-let g:airline_right_sep='◀'
 
 " Mac Dash.app integration
 nmap <silent> <leader>d <Plug>DashSearch
@@ -375,24 +386,19 @@ let g:dash_map = {
   \ }
 
 
-" ========== Custom Pseudofunctions ==========
-" Phakefiles syntax is php
-au BufNewFile,BufRead Phakefile set ft=php
-
 
-" Remember last location in file
-if has("autocmd")
-  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal g'\"" | endif
-endif
-
-
-
-" Other functions
+" Other functions / Onload, Autocommands
 " ======================================================================
 
 " spell correction on text-files
 autocmd BufRead,BufNewFile *.{md|rst|txt} setlocal spell
 
+" Phakefiles syntax is php
+au BufNewFile,BufRead Phakefile set ft=php
 
+" Remember last location/cursor in file
+if has("autocmd")
+  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+    \| exe "normal g'\"" | endif
+endif
 

zshrc

@@ -1,30 +1,16 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
-ZSH_THEME="webgefrickel"
+# Load the functions, aliases, function etc.
 
-
-# default plugins to load
-plugins=(brew git git-flow github history-substring-search jake-node npm node gem osx zsh-syntax-highlighting)
-
-
-source $ZSH/oh-my-zsh.sh
-unsetopt correct_all
-
-
-# Load the shell dotfiles, and then some:
-# * ~/.path can be used to extend `$PATH`.
-# * ~/.extra can be used for other settings you don’t want to commit.
 for file in ~/.{exports,aliases,functions}; do
   [ -r "$file" ] && source "$file"
 done
 unset file
 
 
-# z script installed via homebrew
-. `brew --prefix`/etc/profile.d/z.sh
+eval "$(tmuxifier init -)"
 
 
 # rvm TODO use rbenv in the future
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
+
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting