X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fvim%2Ffiles%2Fvimrc;h=c39436f6209fe414277efa7b203018cb6688a149;hb=62a4997c0138796041aa257d18ee2dc6d3fd151f;hp=ebd0d6a94c7af8b728c61bbdd92f4ce05aad00da;hpb=d28495f157ce749d456fc494e9f70b0544ac3eec;p=max%2Fsaltfiles.git

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index ebd0d6a..c39436f 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -1,4 +1,4 @@
-:let mapleader = "-"
+:let mapleader = ","
 :let maplocalleader = "\\"
 
 set nocompatible              " be iMproved, required
@@ -16,14 +16,11 @@ 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 '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 'tmhedberg/SimpylFold'
 Plugin 'saltstack/salt-vim'
 Plugin 'fatih/vim-go'
@@ -31,9 +28,11 @@ Plugin 'gu-fan/riv.vim'
 Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
 Plugin 'vim-python/python-syntax'
-Plugin 'luochen1990/rainbow'
 Plugin 'majutsushi/tagbar'
-Plugin 'heavenshell/vim-pydocstring'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'Chiel92/vim-autoformat'
+Plugin 'python-mode/python-mode'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -44,8 +43,10 @@ set backupdir=$HOME/.vim/backup//
 
 " Random look and feel stuff
 syntax on
-set background=dark
-colorscheme molokai
+set background=light
+colorscheme solarized
+let g:solarized_termtrans = 1
+
 set expandtab
 set shiftwidth=4
 set softtabstop=4
@@ -54,7 +55,7 @@ set relativenumber
 set number
 
 let g:html_indent_inctags = "html,body,head,tbody"
-let g:indentLine_color_term = 200
+let g:indentLine_color_term = 5
 
 " syntastic
 set statusline+=%#warningmsg#
@@ -67,7 +68,8 @@ 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 = ['python3 -m pylint --error-only']
+let g:syntastic_python_checkers = ['python', 'flake8']
+let g:syntastic_python_flake8_args='--config=/home/max/.config/flake8'
 let g:syntastic_aggregate_errors = 1
 
 " Syntastic C++11
@@ -97,8 +99,8 @@ let g:LatexBox_viewer = "mupdf"
 let g:clang_user_options='|| exit0'
 
 " Color 80th column
-highlight ColorColumn ctermbg=0
-let &colorcolumn="80,".join(range(100,999),",")
+highlight ColorColumn ctermbg=7
+let &colorcolumn="80,100".join(range(120,999),",")
 
 " Octave Syntax
 " augroup filetypedetect
@@ -145,11 +147,35 @@ autocmd FileType python setlocal foldmethod=indent foldnestmax=2
 " Paren highlighting
 hi MatchParen cterm=underline ctermbg=none ctermfg=none
 
-" Rainbow parens
-let g:rainbow_active = 1
-
 " Activate tagbar with F8
 nmap <F8> :TagbarToggle<CR>
 
 " Set path to doq
 let g:pydocstring_doq_path= "/home/max/.local/bin/doq"
+
+
+" Bindings
+" Clipboard
+noremap <Leader>y "+y
+noremap <Leader>p "+p
+
+let g:ctrlp_cache_dir = $HOME . '/.cache/ctrlp'
+if executable('ag')
+    let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
+endif
+
+" Auto formatters
+let g:formatdef_autopep8 = "'autopep8 --aggressive --aggressive - --range '.a:firstline.' '.a:lastline"
+let g:formatters_python = ['autopep8']
+noremap <F3> :Autoformat<CR>
+
+let g:pymode_lint = 0
+let g:pymode_folding = 1
+let g:pymode_rope = 1
+let g:pymode_rope_completion = 1
+
+augroup unset_folding_in_insert_mode
+    autocmd!
+    autocmd InsertEnter *.py setlocal foldmethod=marker
+    autocmd InsertLeave *.py setlocal foldmethod=expr
+augroup END