update plugins

jmagoon · Apr 5, 2017 · 50ccb54 · 50ccb54
1 parent e8da24d
commit 50ccb54
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.config b/.config
@@ -27,7 +27,7 @@ system_clipboard=n
 # 2: lines  - Yggdroot/indentLine
 # 3: -      - none
 # : indentation plugin?
-visual_indent=guides
+visual_indent=lines
 
 # 
 # : install NerdTree(and tools) and NerdCommenter?

diff --git a/vimrc b/vimrc
@@ -70,8 +70,8 @@ set modelines=5         " number of lines to check for vim: directives at the st
 "set fixdel                 " fix terminal code for delete (if delete is broken but backspace works)
 set autoindent          " automatically indent new line
 
-set ts=4                " number of spaces in a tab
-set sw=4                " number of spaces for indent
+set ts=2                " number of spaces in a tab
+set sw=2                " number of spaces for indent
 set et                  " expand tabs into spaces
 
 set ttimeoutlen=50      " fast Esc to normal mode
@@ -241,6 +241,12 @@ nnoremap <Leader>Yd :let @*=expand("%:h")<cr>:echo "Copied file directory to cli
 " keep at least  5 lines above/below cursor (when scrolling)
 set scrolloff=5
 
+" plugins/30-general/plugins/indent/lines -------------------
+
+" prevent indent-lines from messing with concealing settings set globally
+let g:indentLine_concealcursor = &concealcursor
+let g:indentLine_conceallevel = &conceallevel
+
 " plugins/70-languages/plugins/json/plugins/noconceal/files -------------------
 
 let g:vim_json_syntax_conceal = 0
diff --git a/vimrc.plugins b/vimrc.plugins
@@ -31,16 +31,9 @@ let g:gundo_close_on_revert = 1
 
 nmap <leader>u :GundoToggle<CR>
 
-" plugins/30-general/plugins/indent/guides -------------------
+" plugins/30-general/plugins/indent/lines -------------------
 
-call dein#add('Indent-Guides')
-colorscheme default
-
-" indent-guides
-let g:indent_guides_start_level = 2
-let g:indent_guides_enable_on_vim_startup = 1
-let g:indent_guides_guide_size = 1
-let g:indent_guides_color_change_percent = 5
+call dein#add('Yggdroot/indentLine')
 
 " plugins/30-general/plugins/nerdtools/plugins/nerdtree/files -------------------