X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=vim%2F.vimrc;h=dc45e82ec6f9a4a1a3a95fdec83f0420b82bd205;hb=b6146c546f434df2f72016f7ef5e298c3ab5ddef;hp=e92096fdf617a69b4bfc555fe8c7e477de9b2f58;hpb=a8244e06cd9069e62f97755502a1fe8379427a93;p=max%2Fdotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index e92096f..dc45e82 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -11,15 +11,15 @@ call vundle#begin()
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
 Plugin 'jelera/vim-javascript-syntax' 
-Plugin 'altercation/vim-colors-solarized'
-Plugin 'Lokaltog/vim-distinguished'
+Plugin 'noahfrederick/vim-noctu'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Yggdroot/indentLine'
 Plugin 'Raimondi/delimitMate'
 Plugin 'scrooloose/syntastic'
 Plugin 'ternjs/tern_for_vim'
 Plugin 'docunext/closetag.vim'
-Plugin 'bling/vim-airline'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
@@ -29,20 +29,27 @@ 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'
+Plugin 'fatih/vim-go'
 
 " 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
-set t_Co=256
 syntax on
 set background=dark
-colorscheme solarized
-set expandtab
-set shiftwidth=2
-set softtabstop=2
-set number
+colorscheme molokai
+" set expandtab
+" set shiftwidth=2
+" set softtabstop=2
+set relativenumber
 
 let g:html_indent_inctags = "html,body,head,tbody"
 let g:indentLine_color_term = 200
@@ -54,15 +61,16 @@ 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_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++'
-let g:syntastic_cpp_compiler_options = '-std=c++11'
+let g:syntastic_cpp_compiler_options = '-std=c++14'
 
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
@@ -83,15 +91,25 @@ 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=237
+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
+
+" Set folding
+set foldmethod=syntax