From: Stefan Huber Date: Wed, 23 Dec 2020 07:31:40 +0000 (+0100) Subject: keymaps: Cleanup configuration X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=f8b34fbb5f65efffa11b3ee5018c5c924b2a95b5;p=vimconf.git keymaps: Cleanup configuration --- 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 -" ji ji -au FileType java nmap (JavaComplete-Imports-AddSmart) -au FileType java imap (JavaComplete-Imports-AddSmart) -" ii jii -au FileType java nmap (JavaComplete-Imports-Add) -au FileType java imap (JavaComplete-Imports-Add) -" I jI -au FileType java nmap (JavaComplete-Imports-AddMissing) -au FileType java imap (JavaComplete-Imports-AddMissing) -" R jR -au FileType java nmap (JavaComplete-Imports-RemoveUnused) -au FileType java imap (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 :Denite file/rec -nnoremap / :Denite grep:. -nnoremap s :Denite buffer +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Global settings nnoremap pumvisible() ? "\" : "\" nnoremap :NERDTreeToggle nnoremap :TagbarToggle -au Filetype gnuplot map :call OpenIn("gnuplot -persist") nmap :bn nmap :bp @@ -17,16 +15,43 @@ imap (neosnippet_expand_or_jump) smap (neosnippet_expand_or_jump) xmap (neosnippet_expand_target) +" Start interactive EasyAlign in visual mode (e.g. vipga) +vmap (EasyAlign) +" Start interactive EasyAlign for a motion/text object (e.g. gaip) +nmap ga (EasyAlign) + + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Some filetype-specific settings + +au Filetype gnuplot map :call OpenIn("gnuplot -persist") + au Filetype c,cpp,objc map :vsplit:FSRight au Filetype c,cpp,objc map :FSHere au Filetype markdown map :call RunMarkdown() au Filetype asciidoc map :call RunAsciidoc() -" Start interactive EasyAlign in visual mode (e.g. vipga) -vmap (EasyAlign) -" Start interactive EasyAlign for a motion/text object (e.g. gaip) -nmap ga (EasyAlign) +" See https://github.com/artur-shaik/vim-Javacomplete2 +" ji ji +au FileType java nmap (JavaComplete-Imports-AddSmart) +au FileType java imap (JavaComplete-Imports-AddSmart) +" ii jii +au FileType java nmap (JavaComplete-Imports-Add) +au FileType java imap (JavaComplete-Imports-Add) +" I jI +au FileType java nmap (JavaComplete-Imports-AddMissing) +au FileType java imap (JavaComplete-Imports-AddMissing) +" R jR +au FileType java nmap (JavaComplete-Imports-RemoveUnused) +au FileType java imap (JavaComplete-Imports-RemoveUnused) + + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Some plugin-specific settings + + + if filereadable($HOME . '/.vim/keymaps-local.vim') source ~/.vim/keymaps-local.vim