Simplify vim config somewhat

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index c7b1e418d9507fa042ab308235e65f924757318f..ebd0d6a94c7af8b728c61bbdd92f4ce05aad00da 100644 (file)
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -10,26 +10,20 @@ call vundle#begin()
 " alternatively, pass a path where Vundle should install plugins
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
-Plugin 'jelera/vim-javascript-syntax'
-Plugin 'noahfrederick/vim-noctu'
-Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
 Plugin 'scrooloose/syntastic'
-Plugin 'ternjs/tern_for_vim'
 Plugin 'docunext/closetag.vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
 Plugin 'liskin/vim-fubitive'
-Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'editorconfig/editorconfig-vim'
 Plugin 'LaTeX-Box-Team/LaTeX-Box'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
 Plugin 'flazz/vim-colorschemes'
-Plugin 'benmills/vimux'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'saltstack/salt-vim'
 Plugin 'fatih/vim-go'
@@ -55,6 +49,7 @@ colorscheme molokai
 set expandtab
 set shiftwidth=4
 set softtabstop=4
+set tabstop=4
 set relativenumber
 set number
 
@@ -72,7 +67,7 @@ let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 1
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_python_python_exec = '/usr/bin/python3'
-let g:syntastic_python_checkers = ['flake8', 'python3 -m pylint']
+let g:syntastic_python_checkers = ['python3 -m pylint --error-only']
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -90,11 +85,6 @@ let g:airline#extensions#tabline#fnamemod = ':t'
 set wildignore+=venv
 set wildignore+=.git,.hg.svn
 
-" CtrlP
-let g:ctrlp_working_path_mode = 'r'
-" Ignore git ignored files
-let g:ctrlp_user_command = 'git ls-files -co --exclude-standard $(git rev-parse --show-toplevel 2> /dev/null) 2> /dev/null || find . -type f'
-
 
 " Editorconfig
 let g:EditorConfig_exclude_patterns = ['fugitive://.*']
@@ -115,11 +105,12 @@ let &colorcolumn="80,".join(range(100,999),",")
 "   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
 " augroup END
 
-" vimux
-map C :VimuxPromptCommand<CR>
-
 " Quiet netrw
 let g:netrw_silent = 1
+let g:netrw_liststyle = 3
+let g:netrw_banner = 0
+let g:netrw_browse_split = 4
+let g:netrw_winsize = 20
 
 " Set folding
 set foldmethod=syntax
@@ -135,9 +126,6 @@ set list listchars=trail:•,extends:>,precedes:<,nbsp:␣,eol:↲,tab:→\,
 " Force python3 for rst tables plugin
 let g:rst_prefer_python_version = 2
 
-" Set linelength for python
-let g:black_linelength = 80
-
 " Python syntax highlighting
 let g:python_highlight_builtins = 1
 let g:python_highlight_builtin_objs = 1