From now on I try to use terminal-vim more often

Adding powerline vim plugin, removing statusline

.gitmodules

@@ -67,9 +67,6 @@
 [submodule "vim/bundle/typoscript"]
 	path = vim/bundle/typoscript
 	url = git://github.com/nebelschwade/typoscript-vim.git
-[submodule "vim/bundle/statusline"]
-	path = vim/bundle/statusline
-	url = git://github.com/nebelschwade/statusline-vim.git
 [submodule "vim/bundle/snipmate-snippets"]
 	path = vim/bundle/snipmate-snippets
 	url = git://github.com/nebelschwade/snipmate-snippets.git
@@ -124,3 +121,6 @@
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
 	url = git@github.com:nebelschwade/oh-my-zsh.git
+[submodule "vim/bundle/powerline"]
+	path = vim/bundle/powerline
+	url = git://github.com/Lokaltog/vim-powerline.git

Jakefile.js

@@ -44,7 +44,7 @@ namespace('setup', function() {
     var cmds = [
       'git submodule init',
       'git submodule update',
-      'git submodule foreach git checkout master',
+      'git submodule foreach git checkout HEAD',
       'git submodule foreach git pull'
     ];
 

gitconfig

@@ -3,7 +3,7 @@
 
 [core]
   excludesfile = ~/.gitignore
-  editor = mvim -f
+  editor = vim
   autocrlf = input
   eol = lf
   pager = less -FXRS -x2
@@ -33,6 +33,7 @@
   ps = push
   pl = pull
   mg = merge
+  d = difftool
   unst = reset HEAD
   hub = push origin master
   fac = push origin refac
@@ -45,11 +46,7 @@
 
 [diff]
   tool = vimdiff
-  guitool = mvimdiff
 
-[mergetool]
+[difftool]
   prompt = false
-  keepBackup = false
-
-[difftool "mvimdiff"]
-  cmd = /usr/local/bin/mvimdiff -f "$LOCAL" "$MERGED" "$REMOTE"
+  cmd = /usr/local/bin/vimdiff "$LOCAL" "$MERGED" "$REMOTE"

vim/bundle/powerline

@@ -0,0 +1 @@
+Subproject commit 20ab08c9a8fe6cdfb7c303aa3063f211d72f8b2f

vim/bundle/statusline

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

vim/bundle/tlib

@@ -1 +1 @@
-Subproject commit 422fa77c8e9e94f511fa76bbae497e1eaa30b9c1
+Subproject commit e9007fa7ff26850e54b4cee9580d8ccd0a1faef7

vimrc

@@ -42,10 +42,18 @@ set smarttab
 set expandtab
 set autoindent
 
-set guifont=MesloLGSDZ:h12 " a nice font here
-set guioptions-=T          " no toolbar
-set guioptions-=L          " no left scrollbar
-set guioptions-=r          " no right scrollbar
+" use the mouse for scrolling, yeah
+set mouse=a
+
+" gui options
+if has('gui_running')
+  set guifont=MesloLGMDZ:h12 " a nice font here
+  set guioptions-=T          " no toolbar
+  set guioptions-=L          " no left scrollbar
+  set guioptions-=r          " no right scrollbar
+endif
+
+" color options
 color jellybeans
 set fillchars=""
 
@@ -180,6 +188,8 @@ nmap <leader>l mQgewvu`Q
 " Swap two words
 nmap <leader>w :s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/<CR>`'
 
+" change working directory to current file
+nnoremap <leader>d :cd %:p:h<CR>:pwd<CR>
 
 " ========== PLugins leaders and other config ==========
 " search using ack
@@ -242,38 +252,45 @@ let g:tagbar_autofocus=1
 let g:tagbar_autoclose=1
 let g:tagbar_compact=1
 
-nnoremap <leader>d :cd %:p:h<CR>:pwd<CR>
-
 " CtrlP
 let g:ctrlp_map = '<leader>t'
 let g:ctrlp_working_path_mode = 0
 let g:ctrlp_max_height = 12
-let g:ctrlp_custom_ignore = {
-	\ 'dir':  '\v[\/](\.git|\.hg|\.svn|\.sass-cache)$',
-	\ 'file': '\.exe$\|\.so$\|\.dll$\|\.psd$\|\.png$\|\.jpg$\|\.gif$',
-	\ }
-
+let g:ctrlp_custom_ignore = { 'dir':  '\v[\/](\.git|\.hg|\.svn|\.sass-cache)$',
+                            \ 'file': '\.exe$\|\.so$\|\.dll$\|\.psd$\|\.png$\|\.jpg$\|\.gif$',
+                            \ }
 " easier split screens
 let g:ctrlp_switch_buffer = 0
 
 " Gist filetype-detection
 let g:gist_detect_filetype = 1
 
+" Powerline customization
+let g:Powerline_stl_path_style = 'short'
+let g:Powerline_symbols_override = { 'BRANCH': '‣',
+                                   \ 'LINE': 'L',
+                                   \ }
+call Pl#Theme#RemoveSegment('scrollpercent')
+
+
 " custom shift-tab mapping -- opens new { } and blank line
 " Supertab and snipmate backwards-key are overwritten to use shfit + alt / crtl
 let g:SuperTabMappingBackward = '<s-c-tab>'
 let g:snips_trigger_key_backwards = '<s-m-tab>'
 inoremap <s-tab> {<Esc>i <Esc>o<CR>}<Esc>ki<tab>
 
+
 " ========== Custom Pseudofunctions ==========
 " add json syntax highlighting
 au BufNewFile,BufRead *.json set ft=javascript
 " typoscript syntax
 au BufNewFile,BufRead *.ts set ft=typoscript
-" typoscript syntax
+" typoscript syntax for all text-files
 au BufNewFile,BufRead *.txt set ft=typoscript
 " scss
 au BufNewFile,BufRead *.scss set ft=scss.css
+" php
+au BufNewFile,BufRead Phakefile set ft=php
 
 " Remember last location in file
 if has("autocmd")

zshrc

@@ -17,9 +17,8 @@ export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
 export COPYFILE_DISABLE=true
 
 # editor
-export EDITOR=mvim
-VISUAL=$EDITOR; 
-export VISUAL
+export EDITOR=vim
+export VISUAL=vim
 
 # node.js
 export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
@@ -48,15 +47,14 @@ alias npmup='npm -g cache clean && npm -g update'
 alias rvmup='rvm get latest'
 alias upall='brewup && rvmup && gemup && npmup && dotup && dotsubup'
 
-# always use mvim
-alias v='mvim'
-alias vim='mvim'
-alias vd='mvimdiff'
-alias diff='mvimdiff'
+# always use vim
+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 ..'