Merge branch 'master' of github.com:Pezz89/vimconfig

This commit is contained in:
Sam Perry
2016-09-30 21:45:14 +01:00
2 changed files with 20 additions and 2 deletions
+20 -1
View File
@@ -13,6 +13,7 @@ function! DoRemote(arg)
endfunction
" let Vundle manage Vundle, required
" Plug 'Valloric/YouCompleteMe'
Plug 'sudar/vim-arduino-syntax'
Plug 'bling/vim-airline'
Plug 'docunext/closetag.vim'
Plug 'rizzatti/dash.vim'
@@ -20,7 +21,8 @@ Plug 'terryma/vim-expand-region'
Plug 'tpope/vim-fugitive'
Plug 'othree/html5.vim'
Plug 'klen/python-mode'
Plug 'altercation/vim-colors-solarized'
Plug 'jplaut/vim-arduino-ino'
" Plug 'altercation/vim-colors-solarized'
Plug 'rstacruz/sparkup'
Plug 'scrooloose/syntastic'
Plug 'majutsushi/tagbar'
@@ -37,6 +39,8 @@ Plug 'Yggdroot/indentLine'
Plug 'mindriot101/vim-yapf'
Plug 'scrooloose/nerdtree'
" Plug 'vim-scripts/TaskList.vim'
Plug 'xolox/vim-notes'
Plug 'xolox/vim-misc'
Plug 'tpope/vim-vinegar'
Plug 'vim-scripts/MatlabFilesEdition'
Plug 'lervag/vimtex'
@@ -54,6 +58,8 @@ Plug 'jlanzarotta/bufexplorer'
Plug 'chriskempson/base16-vim', { 'commit': '98aa775c5fd9156ada4f912a9af41f1c020da55d' }
Plug 'vim-airline/vim-airline-themes'
Plug 'danro/rename.vim'
" Plug 'vim-scripts/LanguageTool'
" Plug 'vim-latex/vim-latex'
call plug#end() " required
filetype on
filetype plugin on
@@ -165,6 +171,8 @@ if has('autocmd')
autocmd! BufReadPost,FileReadPost * Neomake
endif
let g:neomake_cpp_enable_markers=['clang']
"let g:neomake_cpp_clang_args = ["-std=c++14"]
"let g:neomake_open_list = 2
"
"let g:neomake_python_enabled_makers = ['pep8', 'pylint']
@@ -488,6 +496,10 @@ map <Leader>vs :VimuxInterruptRunner<CR>
" Focus on tagbar when it is opened
let g:tagbar_autofocus = 1
" ====================================
" LanguageTool Settings
" ====================================
let g:languagetool_jar=system("find $(brew --prefix)/Cellar -name \"languagetool-commandline.jar\" -print -quit | xargs echo -n")
" ====================================
" Custom key bindings
" ====================================
@@ -568,6 +580,7 @@ inoremap <C-h> <ESC>:wincmd h<CR>
inoremap <C-j> <ESC>:wincmd j<CR>
inoremap <C-k> <ESC>:wincmd k<CR>
inoremap <C-l> <ESC>:wincmd l<CR>
" Always enter terminal windows in terminal mode
autocmd BufWinEnter,WinEnter term://* startinsert
@@ -728,4 +741,10 @@ nnoremap <silent> <Leader><Enter> :call fzf#run({
" endif
" endif
if (v:version >= 700)
highlight SpellBad ctermfg=126 term=Reverse guisp=126 gui=undercurl ctermbg=None
highlight SpellCap ctermfg=Green term=Reverse guisp=Green gui=undercurl ctermbg=None
highlight SpellLocal ctermfg=Cyan term=Underline guisp=Cyan gui=undercurl ctermbg=None
highlight SpellRare ctermfg=Magenta term=underline guisp=Magenta gui=undercurl ctermbg=None
endif " version 7+