From 1e5594721c02c72d357d63bbd306b99ef3d0f277 Mon Sep 17 00:00:00 2001
From: Jakub Fojt <jakub.fojt96@gmail.com>
Date: Wed, 27 May 2020 13:27:32 +0200
Subject: [PATCH] vimrc: Gutentags and gu for GitGutterUndoHunk

modules
---
 .modules.kuba/gpaw/jfojt.lua      |  7 +--
 .modules.kuba/python-wrap/3.7.lua |  1 +
 .vimrc                            | 84 +++++++++++++++++++++++++++++--
 3 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/.modules.kuba/gpaw/jfojt.lua b/.modules.kuba/gpaw/jfojt.lua
index c50d95b..5d8965e 100644
--- a/.modules.kuba/gpaw/jfojt.lua
+++ b/.modules.kuba/gpaw/jfojt.lua
@@ -1,11 +1,12 @@
-local name, version = splitFileName(myModuleName())
-local platform  = "linux-x86_64-ubuntu-3.6"
+local name, version = splitFileName(myModuleFullName())
+local platform  = "linux-x86_64-ubuntu-3.8"
 local home      = os.getenv("HOME")
-local gpaw_root = pathJoin(home, "git", version .. "-gpaw")
+local gpaw_root = pathJoin(home, "git/gpaw", version)
 
 load("gpaw-setups/0.9.20000")
 
 setenv("OMP_NUM_THREADS", 1)
+prepend_path("PYTHONPATH", ".")
 prepend_path("PYTHONPATH", gpaw_root)
 prepend_path("PYTHONPATH", pathJoin(gpaw_root, "build/lib." .. platform))
 prepend_path("PATH", pathJoin(gpaw_root, "tools"))
diff --git a/.modules.kuba/python-wrap/3.7.lua b/.modules.kuba/python-wrap/3.7.lua
index 2bad216..018aa8a 100644
--- a/.modules.kuba/python-wrap/3.7.lua
+++ b/.modules.kuba/python-wrap/3.7.lua
@@ -2,6 +2,7 @@ local name    = myModuleName()
 local version = myModuleVersion()
 local wrapdir = pathJoin("/tmp", name .. version .. '_kuba')
 
+prepend_path("PYTHONPATH", ".")
 prepend_path("PATH", wrapdir)
 execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
 execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python3") .. ' 2>/dev/null', modeA={"load"}}
diff --git a/.vimrc b/.vimrc
index 3df86cb..0031772 100755
--- a/.vimrc
+++ b/.vimrc
@@ -26,6 +26,7 @@ if filereadable(expand(vundle_dir) . "/README.md")
     Plugin 'cpiger/NeoDebug'
     Plugin 'ivan-krukov/vim-snakemake'
     Plugin 'nvie/vim-flake8'
+    Plugin 'ludovicchabant/vim-gutentags'
 
     call vundle#end()            " required
 else
@@ -110,6 +111,73 @@ noremap Y y$
 command! -bang -range=% -complete=file -nargs=* W <line1>,<line2>write<bang> <args>
 command! -bang Q quit<bang>
 
+" Gutentags configuration
+let g:gutentags_add_default_project_roots = 0
+let g:gutentags_project_root = ['.git']
+
+let g:gutentags_generate_on_new = 1
+let g:gutentags_generate_on_missing = 1
+let g:gutentags_generate_on_write = 1
+let g:gutentags_generate_on_empty_buffer = 0
+
+" Put all tags in one place
+let g:gutentags_cache_dir = expand('~/.cache/vim/ctags/')
+
+" Extra tag information
+let g:gutentags_ctags_extra_args = [
+      \ '--tag-relative=yes',
+      \ '--fields=+ailmnS',
+      \ ]
+
+let g:gutentags_ctags_exclude = [
+      \ '*.git', '*.svg', '*.hg',
+      \ '*/tests/*',
+      \ 'build',
+      \ 'dist',
+      \ '*sites/*/files/*',
+      \ 'bin',
+      \ 'node_modules',
+      \ 'bower_components',
+      \ 'cache',
+      \ 'compiled',
+      \ 'docs',
+      \ 'example',
+      \ 'bundle',
+      \ 'vendor',
+      \ '*.md',
+      \ '*-lock.json',
+      \ '*.lock',
+      \ '*bundle*.js',
+      \ '*build*.js',
+      \ '.*rc*',
+      \ '*.json',
+      \ '*.min.*',
+      \ '*.map',
+      \ '*.bak',
+      \ '*.zip',
+      \ '*.pyc',
+      \ '*.class',
+      \ '*.sln',
+      \ '*.Master',
+      \ '*.csproj',
+      \ '*.tmp',
+      \ '*.csproj.user',
+      \ '*.cache',
+      \ '*.pdb',
+      \ 'tags*',
+      \ 'cscope.*',
+      \ '*.css',
+      \ '*.less',
+      \ '*.scss',
+      \ '*.exe', '*.dll',
+      \ '*.mp3', '*.ogg', '*.flac',
+      \ '*.swp', '*.swo',
+      \ '*.bmp', '*.gif', '*.ico', '*.jpg', '*.png',
+      \ '*.rar', '*.zip', '*.tar', '*.tar.gz', '*.tar.xz', '*.tar.bz2',
+      \ '*.pdf', '*.doc', '*.docx', '*.ppt', '*.pptx',
+      \ ]
+
+
 " fugitive.vim looks for tags in .git
 " set tags +=~/tags " Recursively move upwards in tree, searching in subfolders for tags file
 
@@ -183,11 +251,11 @@ map <F5> :call CurtineIncSw()<CR>
 
 nmap <Leader>cf :cd %:p:h <CR> " Change dir to parent of current file
 nmap <Leader>cg :cd $git_root_location <CR> " Change dir to git root
-nmap <Leader>vs :sp $MYVIMRC <CR>
-nmap <Leader>vv :vsp $MYVIMRC <CR>
-nmap <Leader>vt :tabnew $MYVIMRC <CR>
-nmap <Leader>vo :e $MYVIMRC <CR>
-nmap <Leader>v :e $MYVIMRC <CR>
+nmap <Leader>vs :sp $HOME/.vimrc <CR>
+nmap <Leader>vv :vsp $HOME/.vimrc <CR>
+nmap <Leader>vt :tabnew $HOME/.vimrc <CR>
+nmap <Leader>vo :e $HOME/.vimrc <CR>
+nmap <Leader>v :e $HOME/.vimrc <CR>
 
 " Match git conflict markers
 nmap <Leader>/g /[<=>]\{7,}.*$<CR>
@@ -197,6 +265,12 @@ nmap <Leader>gS :!git add %<CR>
 nmap <Leader>gc :Gcommit<CR>
 nmap <Leader>gg :Ggrep<space>
 nmap <Leader>gb :Gblame<CR>
+nmap <Leader>gu :GitGutterUndoHunk<CR>
+
+" Fugitive Conflict Resolution
+nnoremap <leader>gd :Gvdiffsplit!<CR>
+nnoremap gdh :diffget //2<CR>
+nnoremap gdl :diffget //3<CR>
 
 " Toggle wrapping of long lines
 nmap <Leader>l :set wrap!<CR>