lots of changes

vim/.vimrc

@@ -24,7 +24,7 @@ set showmatch           " Show matching brackets.
 set hlsearch
 "set ignorecase         " Do case insensitive matching
 "set smartcase          " Do smart case matching
-"set incsearch          " Incremental search
+set incsearch          " Incremental search
 "set autowrite          " Automatically save before commands like :next and :make
 set hidden             " Hide buffers when they are abandoned
 set mouse=a
@@ -42,6 +42,7 @@ set backupdir=~/.vim/backup//
 set directory=~/.vim/swap//
 set undodir=~/.vim/undo//
 set splitright
+set cursorline
 
 " flag lines wider than 80 char
 highlight ColorColumn ctermbg=magenta
@@ -51,14 +52,16 @@ call matchadd('ColorColumn', '\%81v', 100)
 if has("autocmd")
   autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType html setlocal ts=2 sts=2 sw=2 expandtab
+  autocmd FileType gohtmltmpl setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType css setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType javascript setlocal ts=2 sts=2 sw=2 expandtab
-  autocmd FileType handlebars setlocal ts=2 sts=2 sw=2 expandtab
+  autocmd FileType html.handlebars setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType xml setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType go setlocal ts=4 sts=4 sw=4 noexpandtab
   autocmd FileType rst setlocal tw=80 ts=3 sts=3 sw=3 expandtab
   autocmd FileType gitcommit setlocal tw=80 ts=2 sts=2 sw=2 expandtab
   autocmd FileType md setlocal tw=80 ts=2 sts=2 sw=2 expandtab
+  autocmd FileType vimwiki setlocal tw=80 ts=2 sts=2 sw=2 expandtab
 endif
 
 " Airline options
@@ -85,9 +88,10 @@ let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_java_javac_config_file_enabled = 1
 
 " Vim-go options
-let g:go_fmt_command = "goimports"
+let g:go_fmt_command = "goreturns"
+let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell']
 let g:go_metalinter_autosave = 1
-let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell', 'gas']
+let g:go_metalinter_autosave_enabled = ['vet', 'golint', 'errcheck', 'structcheck', 'deadcode', 'gocyclo', 'ineffassign', 'dupl', 'gotype', 'varcheck', 'interfacer', 'gosimple', 'staticcheck', 'misspell']
 let g:go_get_update = 0
 let g:go_list_type = "quickfix"
 let g:go_highlight_functions = 1
@@ -118,44 +122,55 @@ let g:vimwiki_list = [{'path': '~/Notebook/work',
                       \ 'index': 'main',
                       \ 'ext': '.md',
                       \ 'syntax': 'markdown'}]
+let g:vimwiki_ext2syntax = {'.md': 'markdown'}
 
 " Grammalecte options
-let g:grammalecte_cli_py='/usr/share/grammalecte-fr/cli.py'
+let g:grammalecte_cli_py='/usr/bin/grammalecte-cli.py'
+
+" IndentGuide options
+let g:indent_guides_auto_colors = 0
+autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  ctermbg=none
+autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=black
 
 call plug#begin('~/.vim/plugged')
 
     Plug 'scrooloose/nerdtree'
     Plug 'xuyuanp/nerdtree-git-plugin'
 
-    Plug 'airblade/vim-gitgutter'
-    Plug 'bling/vim-airline'
+    Plug 'vim-airline/vim-airline'
     Plug 'vim-airline/vim-airline-themes'
+
+    Plug 'airblade/vim-gitgutter'
     Plug 'tpope/vim-fugitive'
     Plug 'jreybert/vimagit'
-    Plug 'kien/ctrlp.vim'
-    Plug 'valloric/youcompleteme'
-    Plug 'altercation/vim-colors-solarized'
     
     Plug 'fatih/vim-go'
     Plug 'joukevandermaas/vim-ember-hbs'
+    Plug 'dag/vim-fish'
     Plug 'glench/vim-jinja2-syntax'
+    Plug 'mattn/emmet-vim'
 
     Plug 'scrooloose/syntastic'
     Plug 'mtscout6/syntastic-local-eslint.vim'
+    Plug 'kien/ctrlp.vim'
+    Plug 'valloric/youcompleteme'
 
     Plug 'aklt/plantuml-syntax'
     Plug 'scrooloose/vim-slumlord'
 
     Plug 'vimwiki/vimwiki'
-
     Plug 'dpelle/vim-Grammalecte'
+    Plug 'nathanaelkane/vim-indent-guides'
+    Plug 'altercation/vim-colors-solarized'
 
 call plug#end()
 
-
 " Other key mappings
 map <C-n> :NERDTreeToggle<CR>
 map <leader>n :cnext<CR>
 map <leader>p :cprevious<CR>
 nmap <leader>N :NERDTreeFocus<CR>
 nnoremap <leader>h :cclose<CR>
+" Removes trailing whitespaces
+nnoremap <leader>s :keeppattern %s/\s\+$//<CR>
+