@@ -23,7 +23,7 @@ set wildmode=list:longest,full
2323 set wildignore=*.class,*.o,*~,*.pyc,.git,third_party,node_modules,bower_components,static_root
2424 set laststatus=2
2525 set list
26-set lcs=trail:.,eol:$,tab:>-
26+set lcs=tab:▸\ ,trail:·,eol:¬,nbsp:_
2727
2828 map <leader>] :bnext<CR>
2929 map <leader>[ :bprev<CR>
@@ -50,16 +50,15 @@ command! W w
5050 " Colors
5151 set t_Co=256
5252 set t_ut=
53-set background=dark
54-let g:hybrid_use_Xresources = 1
55-colorscheme hybrid
53+set background=light
54+colorscheme solarized
5655
5756
5857 " Plugin stuff
59-let g:airline_theme="hybrid"
58+let g:airline_theme="solarized"
6059 let g:airline_powerline_fonts = 1
6160 let g:syntastic_javascript_checkers = ['jshint']
62-let g:syntastic_python_checkers = ['flake8']
61+let g:syntastic_python_checkers = ['pep8']
6362 let g:syntastic_sass_checkers = ['scss_lint']
6463 let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend|min\.js|min\.css)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py|static_root'
6564
@@ -85,4 +84,5 @@ autocmd BufNewFile,BufRead *.py inoremap # X<c-h>#<space>
8584 " Set the right indent for each file.
8685 autocmd BufNewFile,BufRead *.py :set ts=4 sw=4
8786 autocmd BufNewFile,BufRead *.html :set ts=2 sw=2 filetype=htmldjango
88-autocmd BufNewFile,BufRead *.js,*.scss :set ts=4 sw=4
87+autocmd BufNewFile,BufRead *.js,*.scss :set ts=2 sw=2
88+autocmd BufNewFile,BufRead *.json setfiletype json syntax=javascript