Create dirs

[max/saltfiles.git] / states / vim / files / vimrc

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index ebd0d6a94c7af8b728c61bbdd92f4ce05aad00da..b1090de1dc8bf584df64b377efcdf692e0e7e1b4 100644 (file)
--- 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
@@ -11,19 +11,15 @@ call vundle#begin()
 " call vundle#begin('~/some/path/here')
 Plugin 'gmarik/Vundle.vim'
 Plugin 'Yggdroot/indentLine'
-Plugin 'scrooloose/syntastic'
 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 +27,15 @@ 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 'pangloss/vim-javascript'
+Plugin 'itspriddle/vim-shellcheck'
+Plugin 'vimwiki/vimwiki'
+Plugin 'dense-analysis/ale'
+Plugin 'Shougo/deoplete.nvim'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -44,8 +46,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
@@ -53,26 +57,14 @@ set tabstop=4
 set relativenumber
 set number
 
+call deoplete#custom#option('sources', {'_': ['ale',],})
+let g:ale_completion_enabled = 1
+set omnifunc=ale#completion#OmniFunc
+let g:ale_linters = {'python': ['flake8', 'jedils']}
+let g:ale_python_flake8_options = '--max-line-length=88'
+
 let g:html_indent_inctags = "html,body,head,tbody"
-let g:indentLine_color_term = 200
-
-" syntastic
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 2
-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_aggregate_errors = 1
-
-" Syntastic C++11
-let g:syntastic_cpp_compiler = 'g++'
-let g:syntastic_cpp_compiler_options = '-std=c++14'
+let g:indentLine_color_term = 5
 
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
@@ -97,8 +89,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
@@ -139,17 +131,33 @@ let g:python_highlight_string_templates = 1
 let g:python_highlight_class_vars = 1
 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
 
-" 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>
+
+" Vimwiki
+let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+let g:vimwiki_global_ext = 0
+
+let g:indentLine_fileTypeExclude = ['tex', 'json', 'markdown']