Merge branch 'master' of git.friedersdorff.com:max/saltfiles

[max/saltfiles.git] / states / vim / files / vimrc

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index 0b68ef8d38b7ccb110a5d245d9b8a3a5b715d7fb..c81cf77a8034e62648d3eae8f794ed5bd74e5190 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -24,7 +24,6 @@ Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
-Plugin 'ajh17/VimCompletesMe'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
@@ -34,7 +33,6 @@ Plugin 'tmhedberg/SimpylFold'
 Plugin 'saltstack/salt-vim'
 Plugin 'fatih/vim-go'
 Plugin 'gu-fan/riv.vim'
-Plugin 'nvie/vim-rst-tables'
 Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
 Plugin 'vim-python/python-syntax'
@@ -56,6 +54,7 @@ colorscheme molokai
 " set shiftwidth=2
 " set softtabstop=2
 set relativenumber
+set number
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -104,7 +103,7 @@ let g:clang_user_options='|| exit0'
 
 " Color 80th column
 highlight ColorColumn ctermbg=0
-set colorcolumn=80
+let &colorcolumn="80,".join(range(100,999),",")
 
 " Octave Syntax
 " augroup filetypedetect