Updated

nvim/.config/nvim/.netrwhist

@@ -1,4 +1,6 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =2
+let g:netrw_dirhist_cnt =4
 let g:netrw_dirhist_1='/home/tim/.nvim'
 let g:netrw_dirhist_2='/home/tim/.dotfiles/nvim/.nvim'
+let g:netrw_dirhist_3='/home/tim/Projects/cpp/arena'
+let g:netrw_dirhist_4='/home/tim/Projects/cpp/stdany'

nvim/.config/nvim/init.vim

@@ -6,7 +6,7 @@ Plug 'morhetz/gruvbox'
 Plug 'Yggdroot/indentLine'
 Plug 'scrooloose/nerdtree'
 Plug 'godlygeek/tabular'
-Plug 'majutsushi/tagbar'
+" Plug 'majutsushi/tagbar'
 Plug 'tomtom/tcomment_vim'
 Plug 'bling/vim-airline'
 Plug 'tommcdo/vim-exchange'
@@ -17,15 +17,21 @@ Plug 'MarcWeber/vim-addon-mw-utils'
 Plug 'tomtom/tlib_vim'
 Plug 'SirVer/ultisnips'
 Plug 'honza/vim-snippets'
-Plug 'beyondmarc/glsl.vim'
+" Plug 'beyondmarc/glsl.vim'
 Plug 'tpope/vim-dispatch'
-Plug 'freitass/todo.txt-vim'
+" Plug 'freitass/todo.txt-vim'
 Plug 'tpope/vim-unimpaired'
 Plug 'milkypostman/vim-togglelist'
 Plug 'Valloric/YouCompleteMe'
+" Plug 'Shougo/deoplete.nvim'
+" Plug 'vim-scripts/LanguageTool'
+" Plug 'pangloss/vim-javascript'
+Plug 'moll/vim-bbye'
+Plug 'tpope/vim-fugitive'
+Plug 'tikhomirov/vim-glsl'
 call plug#end()
 
-let g:ctrlp_custom_ignore = '\v[\/](bin|obj)$'
+let g:ctrlp_custom_ignore = '\v[\/](bin|docs)$'
 
 let delimitMate_expand_cr = 1
 
@@ -35,14 +41,15 @@ set t_ZH=
 set t_ZR=
 set background=dark
 
-let g:indentLine_char = '│'
-let g:indentLine_color_term = 239
+" let g:indentLine_char = '│'
+" let g:indentLine_color_term = 239
+set list lcs=tab:\│\ 
 
 " map <silent> <M-a> :NERDTreeToggle<cr>
 map <silent> <F2> :NERDTreeToggle<cr>
 
 " map <silent> <M-2> :TagbarToggle<cr>
-map <silent> <F3> :TagbarToggle<cr>
+" map <silent> <F3> :TagbarToggle<cr>
 
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
@@ -76,6 +83,7 @@ set number
 set relativenumber
 set laststatus=2
 set softtabstop=4
+set tabstop=4
 set shiftwidth=4
 set noexpandtab
 set completeopt-=preview
@@ -83,6 +91,9 @@ set completeopt-=preview
 " I do not remember what this is for
 " set cinkeys=0{,0},0),:,!^F,o,O,e
 
+let g:languagetool_jar='$HOME/.local/bin/LanguageTool-3.2/languagetool-commandline.jar'
+let g:languagetool_lang="nl"
+
 map <silent> <tab> :bn<cr>
 map <silent> <S-tab> :bp<cr>
 
@@ -93,13 +104,19 @@ autocmd FileType cpp map <F9> :Make<cr>
 autocmd FileType cpp map <F10> :Make debug<cr>
 autocmd FileType cpp map <F12> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
 
+autocmd FileType go let &makeprg="go run %:p:h/*.go"
+autocmd FileType go map <F10> :Make<cr>
+
 autocmd FileType tex map <F9> :!arara %<cr>
 
+if !filereadable(expand("%:p:h")."/Makefile")
+    let &makeprg="cd CMake/default && make"
+endif
 map <silent> <F4> :call ToggleQuickfixList()<cr>
 map <silent> <F5> :e ./todo/todo.txt<cr>
 map <silent> <F6> :e ./todo/done.txt<cr>
-map <silent> <F7> :grep -F TODO -R ./src/**/*.cpp ./include/**/*.h<cr> :cw<cr>
-map <silent> <F8> :grep -F NOTE -R ./src/**/*.cpp ./include/**/*.h<cr> :cw<cr>
+" map <silent> <F7> :grep -F TODO -R ./src/**/*.cpp ./include/**/*.h<cr> :cw<cr>
+" map <silent> <F8> :grep -F NOTE -R ./src/**/*.cpp ./include/**/*.h<cr> :cw<cr>
 
 function! NeatFoldText()
   let line = ' ' . substitute(getline(v:foldstart), '^\s*"\?\s*\|\s*"\?\s*{{' . '{\d*\s*', '', 'g') . ' '
@@ -112,7 +129,45 @@ function! NeatFoldText()
   return foldtextstart . repeat(foldchar, winwidth(0)-foldtextlength) . foldtextend
 endfunction
 
-set foldtext=NeatFoldText()
+function! MyFoldText() " {{{
+    let line = getline(v:foldstart)
+
+    let nucolwidth = &fdc + &number * &numberwidth
+    let windowwidth = winwidth(0) - nucolwidth - 3
+    let foldedlinecount = v:foldend - v:foldstart
+
+    " expand tabs into spaces
+    let onetab = strpart('          ', 0, &tabstop)
+    let line = substitute(line, '\t', onetab, 'g')
+
+    let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+    let fillcharcount = windowwidth - len(line) - len(foldedlinecount)
+    return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' '
+endfunction " }}}
+
+fu! CustomFoldText()
+    "get first non-blank line
+    let fs = v:foldstart
+    while getline(fs) =~ '^\s*$' | let fs = nextnonblank(fs + 1)
+    endwhile
+    if fs > v:foldend
+        let line = getline(v:foldstart)
+    else
+        let line = substitute(getline(fs), '\t', repeat(' ', &tabstop), 'g')
+    endif
+
+    let w = winwidth(0) - &foldcolumn - (&number ? 8 : 0)
+    let foldSize = 1 + v:foldend - v:foldstart
+    let foldSizeStr = " " . foldSize . " lines "
+    let foldLevelStr = repeat("+--", v:foldlevel)
+    let lineCount = line("$")
+    let foldPercentage = printf("[%.1f", (foldSize*1.0)/lineCount*100) . "%] "
+    let expansionString = repeat(".", w - strwidth(foldSizeStr.line.foldLevelStr.foldPercentage))
+    return line . expansionString . foldSizeStr . foldPercentage . foldLevelStr
+endf
+
+" set foldtext=NeatFoldText()
+set foldtext=CustomFoldText()
 set foldcolumn=1
-au BufRead *.cpp setlocal foldmethod=syntax
-au BufRead *.cpp setlocal foldnestmax=1
+au BufRead *.cpp,*.go,*.js setlocal foldmethod=syntax
+au BufRead *.cpp,*go,*.js setlocal foldnestmax=1