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

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index 9a7f92b..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
@@ -10,36 +10,29 @@ 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 'Raimondi/delimitMate'
 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 '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'
-Plugin 'flazz/vim-colorschemes'
-Plugin 'benmills/vimux'
 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 'psf/black'
 Plugin 'vim-python/python-syntax'
+Plugin 'majutsushi/tagbar'
+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
@@ -50,15 +43,19 @@ 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 background=light
+colorscheme solarized
+let g:solarized_termtrans = 1
+
+set expandtab
+set shiftwidth=4
+set softtabstop=4
+set tabstop=4
 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#
@@ -71,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 = ['flake8']
+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
@@ -89,8 +87,6 @@ let g:airline#extensions#tabline#fnamemod = ':t'
 set wildignore+=venv
 set wildignore+=.git,.hg.svn
 
-" CtrlP
-let g:ctrlp_working_path_mode = 'r'
 
 " Editorconfig
 let g:EditorConfig_exclude_patterns = ['fugitive://.*']
@@ -103,19 +99,20 @@ let g:LatexBox_viewer = "mupdf"
 let g:clang_user_options='|| exit0'
 
 " Color 80th column
-highlight ColorColumn ctermbg=0
-set colorcolumn=80
+highlight ColorColumn ctermbg=7
+let &colorcolumn="80,100".join(range(120,999),",")
 
 " 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
+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
@@ -131,9 +128,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
@@ -149,3 +143,39 @@ let g:python_highlight_operators = 1
 
 " Python indent
 autocmd FileType python setlocal foldmethod=indent foldnestmax=2
+
+" Paren highlighting
+hi MatchParen cterm=underline ctermbg=none ctermfg=none
+
+" 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