@@ -13,11 +13,6 @@ set smartindent
1313 set cinkeys-=0#
1414 set hlsearch
1515 set linebreak
16-set autoindent
17-set expandtab
18-set smarttab
19-set tabstop=4
20-set shiftwidth=4
2116 set pastetoggle=<F2>
2217 set noswapfile
2318 set nobackup
@@ -25,7 +20,7 @@ set autoread
2520 set hidden
2621 set wildmenu
2722 set wildmode=list:longest,full
28-set wildignore=*.class,*.o,*~,*.pyc,.git,third_party,node_modules
23+set wildignore=*.class,*.o,*~,*.pyc,.git,third_party,node_modules,bower_components,static_root
2924 set laststatus=2
3025 set list
3126 set lcs=trail:.,eol:$,tab:>-
@@ -38,7 +33,14 @@ map <leader>x :bdelete<CR>
3833 nmap <leader>h :nohlsearch<CR>
3934 map j gj
4035 map k gk
36+nmap ; :CtrlPBuffer<CR>
37+nmap ' :CtrlPFile<CR>
4138 " I always work on 4 or 2 spaces indent files :)
39+set autoindent
40+set expandtab
41+set smarttab
42+set tabstop=2
43+set shiftwidth=2
4244 map <leader>2 :set ts=2 <bar> set sw=2<CR>
4345 map <leader>4 :set ts=4 <bar> set sw=4<CR>
4446 " don't remove indent on python comments #
@@ -50,16 +52,18 @@ command! W w
5052 set t_Co=256
5153 set t_ut=
5254 set background=dark
53-colorscheme PaperColor
55+colorscheme gruvbox
5456
5557 " Plugin stuff
56-let g:airline_theme='PaperColor'
58+let g:airline_theme='gruvbox'
5759 let g:airline_powerline_fonts=1
58-let g:bufferline_echo=0
5960
6061 let g:syntastic_javascript_checkers = ['jshint']
6162 let g:syntastic_python_checkers = ['flake8']
6263 let g:syntastic_sass_checkers = ['scss_lint']
6364
64-" Fix to use flatlandia theme:
65-"hi LineNr ctermfg=242 ctermbg=237 cterm=NONE
65+let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend|min\.js|min\.css)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py|static_root'
66+
67+hi IndentGuidesOdd ctermbg=237
68+hi IndentGuidesEven ctermbg=238
69+au VimEnter * :IndentGuidesEnable