X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=bdb8feb5eb902f5ad5521231f423ca2622fdfb24;hb=e4d350e0dd95e743b01e6623c98e93466ca4b951;hp=e860cc10d5497f653473c865da926dabccee1c14;hpb=a05fca40ea9797c19a4658317f2195dc1adf45b0;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index e860cc1..bdb8feb 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -12,7 +12,6 @@ call vundle#begin()
 Plugin 'gmarik/Vundle.vim'
 Plugin 'jelera/vim-javascript-syntax' 
 Plugin 'noahfrederick/vim-noctu'
-Plugin 'Lokaltog/vim-distinguished'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
 Plugin 'Raimondi/delimitMate'
@@ -30,17 +29,26 @@ Plugin 'ajh17/VimCompletesMe'
 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'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
 
+" Swapfiles
+set backupdir=$HOME/.vim/backup//
+
 " Random look and feel stuff
 syntax on
+set background=dark
+colorscheme molokai
 set expandtab
 set shiftwidth=2
 set softtabstop=2
-set number
+set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -52,11 +60,12 @@ set statusline+=%*
 
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 2
-let g:syntastic_check_on_open = 0
+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']
+let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
 let g:syntastic_cpp_compiler = 'g++'
@@ -81,15 +90,22 @@ let g:EditorConfig_exclude_patterns = ['fugitive://.*']
 
 " latex-box
 let g:LatexBox_quickfix = 4
+let g:LatexBox_viewer = "mupdf"
 
 " clang fix
 let g:clang_user_options='|| exit0'
 
 " Color 80th column
-highlight ColorColumn ctermbg=1
+highlight ColorColumn ctermbg=0
 set colorcolumn=80
 
 " Octave Syntax
 " augroup filetypedetect
 "   au! BufRead,BufNewFile *.m,*.oct set filetype=octave
 " augroup END 
+
+" vimux
+map C :VimuxPromptCommand<CR>
+
+" Quiet netrw
+let g:netrw_silent = 1