From f8b34fbb5f65efffa11b3ee5018c5c924b2a95b5 Mon Sep 17 00:00:00 2001
From: Stefan Huber <shuber@sthu.org>
Date: Wed, 23 Dec 2020 08:31:40 +0100
Subject: [PATCH] keymaps: Cleanup configuration

---
 init.vim    | 13 -------------
 keymaps.vim | 41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/init.vim b/init.vim
index 7a3858e..d5ad8eb 100644
--- a/init.vim
+++ b/init.vim
@@ -196,19 +196,6 @@ let g:vimwiki_global_ext = 0
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete
 au FileType java JCEnable
-" See https://github.com/artur-shaik/vim-Javacomplete2
-" <C-j>ji <leader>ji
-au FileType java nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-au FileType java imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-" <C-j>ii <leader>jii
-au FileType java nmap <F5> <Plug>(JavaComplete-Imports-Add)
-au FileType java imap <F5> <Plug>(JavaComplete-Imports-Add)
-" <C-j>I <leader>jI
-au FileType java nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-" <C-j>R <leader>jR
-au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
-au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
 let g:VimMailContactsProvider=['khard']
 let g:VimMailContactsCommands={
diff --git a/keymaps.vim b/keymaps.vim
index 1cbfbf9..d4a5f97 100644
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -1,12 +1,10 @@
-nnoremap <C-p> :Denite file/rec<cr>
-nnoremap <space>/ :Denite grep:.<cr>
-nnoremap <space>s :Denite buffer<cr>
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Global settings
 
 nnoremap <C-space> pumvisible() ? "\<c-n>" : "\<tab>"
 
 nnoremap <F2> :NERDTreeToggle<cr>
 nnoremap <F3> :TagbarToggle<cr>
-au Filetype gnuplot map <buffer> <F5> :call OpenIn("gnuplot -persist") <CR>
 
 nmap <s-PageDown> :bn<CR>
 nmap <s-PageUp>   :bp<CR>
@@ -17,16 +15,43 @@ imap <C-k>     <Plug>(neosnippet_expand_or_jump)
 smap <C-k>     <Plug>(neosnippet_expand_or_jump)
 xmap <C-k>     <Plug>(neosnippet_expand_target)
 
+" Start interactive EasyAlign in visual mode (e.g. vipga)
+vmap <Enter> <Plug>(EasyAlign)
+" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+nmap ga <Plug>(EasyAlign)
+
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some filetype-specific settings
+
+au Filetype gnuplot map <buffer> <F5> :call OpenIn("gnuplot -persist") <CR>
+
 au Filetype c,cpp,objc map <buffer> <F11> :vsplit<CR>:FSRight<CR>
 au Filetype c,cpp,objc map <buffer> <S-F11> :FSHere<CR>
 
 au Filetype markdown map <buffer> <F5> :call RunMarkdown()<CR>
 au Filetype asciidoc map <buffer> <F5> :call RunAsciidoc()<CR>
 
-" Start interactive EasyAlign in visual mode (e.g. vipga)
-vmap <Enter> <Plug>(EasyAlign)
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
-nmap ga <Plug>(EasyAlign)
+" See https://github.com/artur-shaik/vim-Javacomplete2
+" <C-j>ji <leader>ji
+au FileType java nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+au FileType java imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+" <C-j>ii <leader>jii
+au FileType java nmap <F5> <Plug>(JavaComplete-Imports-Add)
+au FileType java imap <F5> <Plug>(JavaComplete-Imports-Add)
+" <C-j>I <leader>jI
+au FileType java nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+" <C-j>R <leader>jR
+au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some plugin-specific settings
+
+
+
 
 if filereadable($HOME . '/.vim/keymaps-local.vim')
   source ~/.vim/keymaps-local.vim
-- 
2.30.2