From 8e1f6dba3a953b64ebb7ef9310f9a3d2e594f5a6 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 1 Sep 2013 14:08:57 -0400
Subject: [PATCH] short names, better colors

---
 .vim/autoload/airline/themes/barak.vim |  6 +--
 .vim/bundle/YouCompleteMe              |  2 +-
 .vim/bundle/vim-airline                |  2 +-
 .vim/bundle/vim-coffee-script          |  2 +-
 .vim/indent/cpp.vim                    | 92 ++++++++++++++++++++++++++++++++++
 .vimrc                                 | 14 ++++++
 6 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100644 .vim/indent/cpp.vim

diff --git a/.vim/autoload/airline/themes/barak.vim b/.vim/autoload/airline/themes/barak.vim
index ed5b873..4d39d39 100644
--- a/.vim/autoload/airline/themes/barak.vim
+++ b/.vim/autoload/airline/themes/barak.vim
@@ -2,9 +2,9 @@
 " (https://github.com/Donearm/Ubaryd)
 
 " Normal mode
-let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
-let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
-let s:N3 = [ '#b88853' , '#363946' , 137, 237 ] " toffee & darkgravel
+let s:N1 = [ '#141413' , '#b3b3b3' , 232 , 252 ] " blackestgravel & bleaksand
+let s:N2 = [ '#b3b3b3' , '#414141' , 252, 238 ] " bleaksand & deepgravel
+let s:N3 = [ '#e0e0e0' , '#363636' , 254, 237 ] " toffee & darkgravel
 let s:N4 = [ '#363946' , 237 ] " gravel
 
 " Insert mode
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index d2fe03f..df0be9f 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit d2fe03f0724d36ed75867e66150074930e2f3f2e
+Subproject commit df0be9fb2c78716dc82d86b11a27710d53567624
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
index 1f6b936..660109a 160000
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 1f6b936dd8454262cfd4effe42210f049891cff6
+Subproject commit 660109a61a1e5397121d9d2aaac8693e639ac3da
diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script
index d944c79..8f6be87 160000
--- a/.vim/bundle/vim-coffee-script
+++ b/.vim/bundle/vim-coffee-script
@@ -1 +1 @@
-Subproject commit d944c79848a29ac58cc1e435e81a795bb6d16c18
+Subproject commit 8f6be8704f13bbf4dbf1f08bdd52a710889e1181
diff --git a/.vim/indent/cpp.vim b/.vim/indent/cpp.vim
new file mode 100644
index 0000000..1ccb21f
--- /dev/null
+++ b/.vim/indent/cpp.vim
@@ -0,0 +1,92 @@
+" Vim indent file
+" Language:	C++
+" Maintainer:	Konstantin Lepa <konstantin.lepa@gmail.com>
+" Last Change:	2010 May 20
+" License: MIT
+" Version: 1.1.0
+"
+" Changes {{{
+" 1.1.0 2011-01-17
+"   Refactored source code.
+"   Some fixes.
+"
+" 1.0.1 2010-05-20
+"   Added some changes. Thanks to Eric Rannaud <eric.rannaud@gmail.com>
+"
+"}}}
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+
+function! GoogleCppIndent()
+    let l:cline_num = line('.')
+
+    let l:orig_indent = cindent(l:cline_num)
+
+    if l:orig_indent == 0 | return 0 | endif
+
+    let l:pline_num = prevnonblank(l:cline_num - 1)
+    let l:pline = getline(l:pline_num)
+    if l:pline =~# '^\s*template' | return l:pline_indent | endif
+
+    " TODO: I don't know to correct it:
+    " namespace test {
+    " void
+    " ....<-- invalid cindent pos
+    "
+    " void test() {
+    " }
+    "
+    " void
+    " <-- cindent pos
+    if l:orig_indent != &shiftwidth | return l:orig_indent | endif
+
+    let l:in_comment = 0
+    let l:pline_num = prevnonblank(l:cline_num - 1)
+    while l:pline_num > -1
+        let l:pline = getline(l:pline_num)
+        let l:pline_indent = indent(l:pline_num)
+
+        if l:in_comment == 0 && l:pline =~ '^.\{-}\(/\*.\{-}\)\@<!\*/'
+            let l:in_comment = 1
+        elseif l:in_comment == 1
+            if l:pline =~ '/\*\(.\{-}\*/\)\@!'
+                let l:in_comment = 0
+            endif
+        elseif l:pline_indent == 0
+            if l:pline !~# '\(#define\)\|\(^\s*//\)\|\(^\s*{\)'
+                if l:pline =~# '^\s*namespace.*'
+                    return 0
+                else
+                    return l:orig_indent
+                endif
+            elseif l:pline =~# '\\$'
+                return l:orig_indent
+            endif
+        else
+            return l:orig_indent
+        endif
+
+        let l:pline_num = prevnonblank(l:pline_num - 1)
+    endwhile
+
+    return l:orig_indent
+endfunction
+
+setlocal shiftwidth=2
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal expandtab
+setlocal textwidth=80
+setlocal wrap
+
+setlocal cindent
+setlocal cinoptions=h1,l1,g1,t0,i4,+4,(0,w1,W4
+
+setlocal indentexpr=GoogleCppIndent()
+
+let b:undo_indent = "setl sw< ts< sts< et< tw< wrap< cin< cino< inde<"
+
diff --git a/.vimrc b/.vimrc
index 58de30d..ca95e36 100644
--- a/.vimrc
+++ b/.vimrc
@@ -208,6 +208,20 @@ let g:airline_right_sep = ''
 let g:airline#extensions#syntastic#enabled = 1
 let g:airline#extensions#hunks#non_zero_only = 1
 let g:airline#extensions#whitespace#enabled = 0
+let g:airline_mode_map = {
+      \ '__' : '-',
+      \ 'n'  : 'N',
+      \ 'i'  : 'I',
+      \ 'R'  : 'R',
+      \ 'c'  : 'C',
+      \ 'v'  : 'V',
+      \ 'V'  : 'V',
+      \ '' : 'V',
+      \ 's'  : 'S',
+      \ 'S'  : 'S',
+      \ '' : 'S',
+      \ }
+
 
 " * CtrlP
 let g:ctrlp_map = ',t'