From 21af2f55f341355309998b5551e8ddb628e542b0 Mon Sep 17 00:00:00 2001
From: jef <jef.roosens@ugent.be>
Date: Sun, 9 Aug 2020 07:49:51 +0200
Subject: [PATCH] Added more hard way config

---
 init.vim            |  6 ++++--
 init/autogroups.vim |  5 +++++
 init/keys.vim       |  4 ++++
 init/plugins.vim    |  3 +++
 init/settings.vim   |  3 ---
 init/tagbar.vim     | 16 ++++++++++++----
 6 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 init/autogroups.vim

diff --git a/init.vim b/init.vim
index 6b4b432..9a9c0ee 100644
--- a/init.vim
+++ b/init.vim
@@ -1,6 +1,8 @@
 " Change leader key to space
-" I run this before anything else so that <leader> is always the right value
-let mapleader = ' '
+" Map leader to space
+let g:mapleader = ' '
+" Map local leader to tab
+let g:maplocalleader = "\<tab>"
 
 " Source plugins
 runtime! init/*.vim
diff --git a/init/autogroups.vim b/init/autogroups.vim
new file mode 100644
index 0000000..9bd617c
--- /dev/null
+++ b/init/autogroups.vim
@@ -0,0 +1,5 @@
+augroup langs
+    autocmd!
+    " Remove trailing whitespace
+    autocmd BufWritePre *.py,*.java :silent! %s/\s\+$//g
+augroup END
diff --git a/init/keys.vim b/init/keys.vim
index e390c50..1685990 100644
--- a/init/keys.vim
+++ b/init/keys.vim
@@ -73,3 +73,7 @@ nnoremap <silent> <leader>c :call ColorschemeToggle()<CR>
 nnoremap <silent> <leader>vs :source $MYVIMRC<CR>
 " Open CtrlP in config directory
 nnoremap <silent> <leader>ve :split<CR>:exec 'CtrlP ' . fnamemodify($MYVIMRC, ':h')<CR>
+
+" Overwrite Esc (experiment)
+inoremap jk <Esc>
+inoremap <Esc> <nop>
diff --git a/init/plugins.vim b/init/plugins.vim
index 8a3e48d..c82b2aa 100644
--- a/init/plugins.vim
+++ b/init/plugins.vim
@@ -32,4 +32,7 @@ Plug 'yggdroot/indentline'
 " Auto-indent according to PEP8 rules
 Plug 'hynek/vim-python-pep8-indent'
 
+" Text object based on current indent level (e.g. Python)
+Plug 'michaeljsmith/vim-indent-object'
+
 call plug#end()
diff --git a/init/settings.vim b/init/settings.vim
index 28094ef..2588815 100644
--- a/init/settings.vim
+++ b/init/settings.vim
@@ -53,8 +53,5 @@ set nobackup
 set undofile
 set undodir=./.vim/undo//
 
-" Detect comments in json
-autocmd FileType json syntax match Comment +\/\/.\+$+
-
 " Increases speed of CoC and Gitgutter
 set updatetime=250
diff --git a/init/tagbar.vim b/init/tagbar.vim
index fbd6329..45332f3 100644
--- a/init/tagbar.vim
+++ b/init/tagbar.vim
@@ -1,10 +1,18 @@
 " Navigating between tags
-" Go to next one
-let g:tagbar_map_nexttag = 'j'
-" Go to previous one
-let g:tagbar_map_prevtag = 'k'
+" Go to next top-level tag
+let g:tagbar_map_nexttag = 'J'
+" Same, but previous
+let g:tagbar_map_prevtag = 'K'
 " Show prototype of current tag
 let g:tagbar_map_showproto = 'u'
+" Use order from source file
+let g:tagbar_sort = 0
+" Don't show help tip at the top
+let g:tagbar_compact = 1
+" Auto-open folds while following cursor
+let g:tagbar_autoshowtag = 1
+" Don't show status line
+let g:no_status_line = 1
 
 " Open tagbar when opening certain language types
 autocmd BufNewFile,BufReadPre *.py,*.java,*.rs,*.cpp,*.c TagbarOpen