vim: Minor vimrc tweaking

[shutils.git] / dotfiles / vim / .vimrc

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 04ed529a0980814f228ef213cf97e93928e82586..df65e4a1e854e135ceaf320bac618b1585aef3e8 100644 (file)
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -5,12 +5,12 @@
 "profile func *
 "profile file *
 
-
-set nocompatible
 set encoding=utf8
 set number
 set backspace=indent,eol,start
 
+set mouse=a
+
 set tagstack
 set grepprg=grep\ -nH\ $*
 set foldcolumn=1
@@ -20,6 +20,7 @@ set hlsearch
 
 set cursorline
 set laststatus=2
+set scrolloff=4
 
 set listchars=tab:»­,trail:·,eol:$
 set virtualedit=block
@@ -42,20 +43,65 @@ set tags=./tags;/
 syntax on
 filetype plugin indent on
 
-" Pathogen runtime path manipulation
-"call pathogen#infect() "Using the infect method breaks ft detection
-call pathogen#runtime_append_all_bundles()
-call pathogen#helptags()
+runtime! autoload/plug.vim
+" Check if there is vim-plug installed
+if exists('g:loaded_plug')
+    call plug#begin('~/.config/nvim/plugged')
+        Plug 'Glench/Vim-Jinja2-Syntax'
+        Plug 'LaTeX-Box-Team/LaTeX-Box'
+        Plug 'benekastah/neomake'
+        Plug 'vim-airline/vim-airline'
+        Plug 'vim-airline/vim-airline-themes'
+        Plug 'chrisbra/csv.vim'
+        Plug 'craigemery/vim-autotag'
+        Plug 'godlygeek/tabular'
+        "Plug 'kien/ctrlp.vim'
+        Plug 'junegunn/fzf'
+        Plug 'majutsushi/tagbar'
+        Plug 'mhinz/vim-signify'
+        Plug 'msanders/snipmate.vim'
+        Plug 'scrooloose/nerdcommenter'
+        Plug 'scrooloose/nerdtree'
+        " Plug 'scrooloose/syntastic'
+        Plug 'sjl/splice.vim'
+        Plug 'Shougo/deoplete.nvim'
+        Plug 'suan/vim-instant-markdown'
+        Plug 't4ku/marktag'
+        Plug 'thinca/vim-fontzoom'
+        Plug 'tpope/vim-ragtag'
+        Plug 'vim-scripts/CSApprox'
+        Plug 'vim-scripts/DetectIndent'
+        Plug 'vim-scripts/git_patch_tags.vim'
+        Plug 'vim-scripts/loremipsum'
+    call plug#end()
+
+    autocmd! BufWritePost,BufEnter * Neomake
+
+" If there is no vim-plug, try pathogen
+else
+    runtime autoload/pathogen.vim
+    if exists("g:loaded_pathogen")
+        " Pathogen runtime path manipulation
+        call pathogen#runtime_append_all_bundles()
+        call pathogen#helptags()
+    endif
+endif
 
 
-"Power saving tip: powertop-homepage
-let &guicursor = &guicursor . ",a:blinkon0"
-"According to vim help -- enable mouse in xterm...
-set mouse=a
+if has('nvim')
+    set rtp^=/usr/share/vim/vimfiles
+else
+    set nocompatible
+endif
 
-" Use 256 colors
-set t_Co=256
+" Color settings
+if !has('nvim')
+    set t_Co=256
+else
+    let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+endif
 let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : 'underline', 'sp' : 'bg' }
+
 colorscheme shuber-wombat
 
 
@@ -72,9 +118,6 @@ if exists(":DetectIndent")
 endif
 
 
-let g:syntastic_mode_map = { 'mode' : 'active', 'active_filetypes' : [], 'passive_filetypes' : ['html'] }
-
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  Airline
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -250,7 +293,6 @@ au BufRead,BufNewFile *.wxm set filetype=maxima
 "  LaTeX
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-
 let g:LatexBox_split_side = "rightbelow"
 "let g:LatexBox_split_resize = 1
 let g:LatexBox_ref_pattern = '\c\\\a*ref\*\?\_\s*{'
@@ -263,13 +305,13 @@ let g:LatexBox_latexmk_preview_continuously = 1
 "let g:LatexBox_show_warnings = 0
 let g:LatexBox_quickfix = 4
 
-
 if version >= 700
     au Filetype tex set spell
 endif
 
 au BufRead,BufNewFile *.cls set filetype=tex
 au Filetype tex set textwidth=80
+au Filetype tex set shiftwidth=2
 au Filetype tex set smartindent
 " Override Tagbar Toggle with LatexBox TOC
 au Filetype tex nmap <buffer> <F10> :LatexTOCToggle<CR>
@@ -311,6 +353,7 @@ au Filetype python set expandtab
 " Wrap text after a certain number of characters
 au Filetype python set textwidth=79
 
+let g:syntastic_python_checkers = ["pyflakes"]
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  XML, Ipe
@@ -388,11 +431,18 @@ if executable('marktag')
 end
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  deoplete
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:deoplete#enable_at_startup = 1
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+let g:ycm_confirm_extra_conf = 0
 
 let g:ycm_min_num_of_chars_for_completion = 4
 let g:ycm_collect_identifiers_from_tags_files = 1
@@ -407,6 +457,25 @@ let g:ycm_filetype_whitelist = { 'c' : 1, 'cpp' : 1, 'cs' : 1, 'objc' : 1, 'java
 "let g:ycm_server_log_level = 'debug'
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  syntastic
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:syntastic_mode_map = { 'mode' : 'active', 'active_filetypes' : [], 'passive_filetypes' : ['html'] }
+let g:ycm_show_diagnostics_ui = 0
+let g:syntastic_c_checkers = ["cppcheck"]
+let g:syntastic_cpp_checkers = g:syntastic_c_checkers
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  signify
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:signify_vcs_list = ['git']
+
+
+
+
 if filereadable($HOME . "/.vimrc-local")
     source ~/.vimrc-local
 endif