summaryrefslogtreecommitdiffstats
path: root/vimrc
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2017-11-04 23:03:50 -0400
committerJesse Luehrs <doy@tozt.net>2017-11-04 23:44:20 -0400
commit3fcb921077ae6aee0e25afef5d23c368c90ec3d3 (patch)
tree6c913475ec13c9888c0dc2abd94c20332ba7fa31 /vimrc
parent7214071e57b7dd332ae4653af1fa292ac9676eb8 (diff)
downloadconf-3fcb921077ae6aee0e25afef5d23c368c90ec3d3.tar.gz
conf-3fcb921077ae6aee0e25afef5d23c368c90ec3d3.zip
restore the old rainbow paren plugin
the new one is too complicated and breaks too many things
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc29
1 files changed, 10 insertions, 19 deletions
diff --git a/vimrc b/vimrc
index 4f9c315..2d68fb9 100644
--- a/vimrc
+++ b/vimrc
@@ -132,25 +132,9 @@ endfunction
autocmd vimrc VimEnter * call <SID>configure_neosnippet_tab_mappings()
" }}}
" rainbow {{{
-let g:rainbow_active = 1
-let g:rainbow_conf = {
-\ 'ctermfgs': [
-\ 'darkred',
-\ 'darkmagenta',
-\ 'darkblue',
-\ 'darkyellow',
-\ 'darkgreen',
-\ 'darkcyan',
-\ ],
-\ 'guitermfgs': [
-\ 'red',
-\ 'magenta',
-\ 'blue',
-\ 'yellow',
-\ 'green',
-\ 'cyan',
-\ ],
-\}
+let g:rainbow = 1
+let g:rainbow_paren = 1
+let g:rainbow_brace = 1
" }}}
" startify {{{
let g:startify_list_order = ['dir', 'bookmarks', 'commands']
@@ -174,5 +158,12 @@ let g:Textobj_defs = [
\['\|', 'Textobj_paired', '\|'],
\]
" }}}
+" Load plugins that don't use vim's format {{{
+" just loading this directly from the plugin directory fails because language
+" syntax files override the highlighting
+" using BufWinEnter because that is run after modelines are run (so it catches
+" modelines which update highlighting)
+autocmd vimrc BufWinEnter,FileType * runtime plugin/rainbow_paren.vim
+" }}}
" }}}
" vim: fdm=marker