From 6062eb6d8fd327887336a11770b291ca7b08fdcf Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 2 Jun 2014 04:54:21 -0400 Subject: [PATCH] Configured json colours, syntax plugin settings and definitions to match the new plugin included in the darkcloud polyglot fork --- vim/colors/darkcloud.vim | 4 ++++ vim/config/plugins.vim | 11 ++++++----- vim/config/settings.vim | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index 624cbce..5ee8169 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -404,6 +404,10 @@ hi! link javascriptHtmlEvents javaScriptSpecial hi! link javascriptDomElemAttrs javaScriptSpecial hi! link javascriptDomElemFuncs javaScriptFunction +autocmd BufEnter,FileType json hi! link Label Constant +autocmd BufEnter,FileType json hi! link Number Todo +autocmd BufEnter,FileType json hi! link String Statement + "coffeeScript hi! link coffeeRegExp javaScriptRegexpString diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index f663af4..5a0f732 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -13,6 +13,12 @@ execute pathogen#infect('bundle/{}', 'bundle.user/{}') "}}} +"SYNTAX PLUGINS: {{{ + let g:vim_json_warnings=0 + let g:vim_markdown_folding_disabled=0 + let g:vim_markdown_initial_foldlevel=2 +"}}} + "BREEZE: {{{ let g:breeze_active_filetypes="*.html,*.htm,*.xhtml,*.xml,*.php" let g:breeze_shade_color = "String" @@ -50,11 +56,6 @@ autocmd FileType gundo setlocal nocursorcolumn "}}} -"MARKDOWN VIM MODE: {{{ - let g:vim_markdown_folding_disabled=0 - let g:vim_markdown_initial_foldlevel=2 -"}}} - "NEOCOMPLCACHE AUTOCOMPLETION PLUGIN: {{{ let g:neocomplcache_enable_at_startup=1 let g:neocomplcache_enable_smart_case=1 diff --git a/vim/config/settings.vim b/vim/config/settings.vim index 75f5281..a7e9f36 100644 --- a/vim/config/settings.vim +++ b/vim/config/settings.vim @@ -79,7 +79,7 @@ autocmd BufNewFile,BufRead *.muttrc setf muttrc autocmd BufNewFile,BufRead pacman.conf,yaourtrc setf sh autocmd BufNewFile,BufRead archversion.conf setf archversion - autocmd BufNewFile,BufRead cjdroute.conf,ircd.conf setf javascript + autocmd BufNewFile,BufRead cjdroute.conf,ircd.conf setf json "misc filtype specific settings autocmd FileType gitcommit,notes,mail,notmuch,text setlocal spell