diff --git a/dotfiles/.config/vim/vimrc b/dotfiles/.config/vim/vimrc index cdac902..8f441f4 100644 --- a/dotfiles/.config/vim/vimrc +++ b/dotfiles/.config/vim/vimrc @@ -83,54 +83,53 @@ let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" Plug 'bronson/vim-trailing-whitespace' Plug 'elzr/vim-json' Plug 'godlygeek/tabular' | Plug 'plasticboy/vim-markdown' + let g:vim_markdown_conceal_code_blocks = 0 Plug 'junegunn/rainbow_parentheses.vim' + let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']] Plug 'kien/ctrlp.vim' + let g:ctrlp_match_window = 'bottom,order:ttb' + let g:ctrlp_switch_buffer = 0 " open files in new buffer + let g:ctrlp_show_hidden = 1 " show hidden files Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } Plug 'tpope/vim-commentary' Plug 'tpope/vim-fugitive' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' + if !exists('g:airline_symbols') + let g:airline_symbols = {} + endif + let g:airline_left_sep = ' ' + let g:airline_left_alt_sep = '' + let g:airline_right_sep = ' ' + let g:airline_right_alt_sep = '' + let g:airline_symbols.crypt = '🔒' + let g:airline_symbols.branch = '⎇' + let g:airline_symbols.paste = 'Ⓟ' + let g:airline_symbols.spell = '✔' + let g:airline_symbols.readonly = ' ⃠' + let g:airline_symbols.notexists = '∄' + let g:airline_symbols.whitespace = '✗' Plug 'vim-scripts/srec.vim' + highlight link srecStart Comment + highlight link srecType Comment + highlight link srecLength WarningMsg + highlight link srec16BitAddress Constant + highlight link srec24BitAddress Constant + highlight link srec32BitAddress Constant + highlight link srecChecksum Type Plug 'keith/swift.vim' Plug 'chr4/nginx.vim' call plug#end() - let g:ctrlp_match_window = 'bottom,order:ttb' - let g:ctrlp_switch_buffer = 0 " open files in new buffer - let g:ctrlp_show_hidden = 1 " show hidden files - - let g:rainbow#pairs = [['(',')'], ['[',']'], ['{','}']] - + " This has to be here (as opposed to right after the Plug call) because the + " function airline#section#create doesn't exist before plug#end() is + " called. if has('multi_byte') && &encoding ==# 'utf-8' let g:airline_section_z = airline#section#create(['ℓ%4l/%L 𝚌%3v']) else " line / total : col let g:airline_section_z = airline#section#create(['L%4l/%L c%3v']) endif - if !exists('g:airline_symbols') - let g:airline_symbols = {} - endif - - let g:airline_left_sep = ' ' - let g:airline_left_alt_sep = '' - let g:airline_right_sep = ' ' - let g:airline_right_alt_sep = '' - let g:airline_symbols.crypt = '🔒' - let g:airline_symbols.branch = '⎇' - let g:airline_symbols.paste = 'Ⓟ' - let g:airline_symbols.spell = '✔' - let g:airline_symbols.readonly = ' ⃠' - let g:airline_symbols.notexists = '∄' - let g:airline_symbols.whitespace = '✗' - - highlight link srecStart Comment - highlight link srecType Comment - highlight link srecLength WarningMsg - highlight link srec16BitAddress Constant - highlight link srec24BitAddress Constant - highlight link srec32BitAddress Constant - highlight link srecChecksum Type - colorscheme solarized filetype plugin indent on syntax enable