X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;ds=sidebyside;f=keymaps.vim;h=38f7774ee4d6a38379edc9f0e8f66e243c19337b;hb=HEAD;hp=234ee91746f3b735ce918958f0c793f5feec912d;hpb=a7bd98a26484944d7db299009cc9cab309389c86;p=vimconf.git

diff --git a/keymaps.vim b/keymaps.vim
index 234ee91..f63b011 100644
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -2,40 +2,34 @@
 " Global settings
 
 if has('clipboard')
+    " Use + or * registers
+    if has('unnamedplus')
+        set clipboard+=unnamedplus
+    else
+        set clipboard+=unnamed
+    endif
+
     " Ordinary ctrl+{c,x,v} using system clipboard register +. We use autocmd to
     " override plugin keymaps.
-    autocmd VimEnter * vnoremap <C-c> "+y
-    autocmd VimEnter * vnoremap <C-x> "+x
+    "autocmd VimEnter * vnoremap <C-c> "+y
+    "autocmd VimEnter * vnoremap <C-x> "+x
+    " Is performed by S+Ins
     "autocmd VimEnter * nnoremap <C-v> "+p
-    autocmd VimEnter * inoremap <C-v> <c-r>+
+    "autocmd VimEnter * inoremap <C-v> <c-r>+
 endif
 
 " ctrl+d as EOF exits shells and the like. Add a keymap for the same here.
 nnoremap <C-d> :q<cr>
 
-nnoremap <C-p> :Denite file/rec<cr>
-nnoremap <space>/ :Denite grep:.<cr>
-nnoremap <space>s :Denite buffer<cr>
-
 nnoremap <C-space> pumvisible() ? "\<c-n>" : "\<tab>"
 
-nnoremap <F2> :NERDTreeToggle<cr>
+nnoremap <F2> :lua MiniFiles.open()<cr>
 nnoremap <F3> :TagbarToggle<cr>
+nnoremap <F4> :lua MiniMap.toggle()<cr>
 
 nmap <s-PageDown> :bn<CR>
 nmap <s-PageUp>   :bp<CR>
 
-map <a-c> <plug>NERDCommenterToggle
-
-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
@@ -61,28 +55,13 @@ au Filetype c,cpp,objc map <buffer> <S-F12> :FSHere<CR>
 au Filetype c,cpp,objc map <buffer> <F24> :FSHere<CR>
 
 au Filetype markdown map <buffer> <F5> :call RunMarkdown()<CR>
-au Filetype asciidoc map <buffer> <F5> :call RunAsciidoc()<CR>
-
-" 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)
+au Filetype asciidoc,asciidoctor map <buffer> <F5> :call RunAsciidoc()<CR>
 
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
 
-
 if filereadable($HOME . '/.vim/keymaps-local.vim')
   source ~/.vim/keymaps-local.vim
 endif