From 4167924e830392432f6d73d8fce1267dbaec028f Mon Sep 17 00:00:00 2001
From: Amin Bandali <me@aminb.org>
Date: Tue, 28 Oct 2014 22:29:31 -0400
Subject: [PATCH] add vim-json and partially resolve its conflict with
 indentLine

---
 vim/.vimrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vim/.vimrc b/vim/.vimrc
index 4a3981d..e3c3679 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -21,6 +21,7 @@ Plugin 'Yggdroot/indentLine'
 Plugin 'airblade/vim-gitgutter'
 "Plugin 'altercation/vim-colors-solarized'
 Plugin 'terryma/vim-multiple-cursors'
+Plugin 'elzr/vim-json'
 call vundle#end()            " required
 " ==== </Vundle> ====
 
@@ -237,3 +238,6 @@ let &t_EI = "\<Esc>]50;CursorShape=0\x7"
 
 set pastetoggle=<leader>t
 
+set conceallevel=0
+let g:vim_json_syntax_conceal = 0
+let g:indentLine_noConcealCursor=""
-- 
2.20.1