More fzf and sorting

diff --git a/vimrc b/vimrc
index c50fe2175c8688fb5489c8d260c79c60a26f39e7..6813ed6b01cada6179b95ddef49de276a3fcceb7 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -12,43 +12,44 @@ silent! packadd minpac
 if exists('*minpac#init')
   call minpac#init()
   call minpac#add('k-takata/minpac', {'type': 'opt'})
+  " editing
   call minpac#add('tpope/vim-repeat', {'type': 'opt'})
   call minpac#add('tpope/vim-surround', {'type': 'opt'})
   call minpac#add('tpope/vim-unimpaired', {'type': 'opt'})
   call minpac#add('tpope/vim-endwise', {'type': 'opt'})
-  call minpac#add('tpope/vim-fugitive', {'type': 'opt'})
   call minpac#add('tpope/vim-commentary', {'type': 'opt'})
+  call minpac#add('tpope/vim-fugitive', {'type': 'opt'})
   call minpac#add('tpope/vim-vinegar', {'type': 'opt'})
-  call minpac#add('Yggdroot/indentLine', {'type': 'opt'})
+  call minpac#add('ervandew/supertab', {'type': 'opt'})
+  " snippets
+  call minpac#add('SirVer/ultisnips', {'type': 'opt'})
   call minpac#add('garbas/vim-snipmate', {'type': 'opt'})
-  call minpac#add('MarcWeber/vim-addon-mw-utils', {'type': 'opt'})
-  call minpac#add('tomtom/tlib_vim', {'type': 'opt'})
   call minpac#add('honza/vim-snippets', {'type': 'opt'})
+  call minpac#add('tomtom/tlib_vim', {'type': 'opt'})
+  call minpac#add('MarcWeber/vim-addon-mw-utils', {'type': 'opt'})
+  " visuals
+  call minpac#add('Yggdroot/indentLine', {'type': 'opt'})
   call minpac#add('vim-airline/vim-airline', {'type': 'opt'})
-  call minpac#add('majutsushi/tagbar', {'type': 'opt'})
   call minpac#add('mh21/errormarker.vim', {'type': 'opt'})
-  call minpac#add('skywind3000/asyncrun.vim', {'type': 'opt'})
-  call minpac#add('haya14busa/incsearch.vim', {'type': 'opt'})
-  call minpac#add('w0rp/ale', {'type': 'opt'})
-  call minpac#add('vim-pandoc/vim-pandoc', {'type': 'opt'})
-  call minpac#add('vim-pandoc/vim-pandoc-syntax', {'type': 'opt'})
-  call minpac#add('maralla/completor.vim', {'type': 'opt'})
-  call minpac#add('maralla/validator.vim', {'type': 'opt'})
   call minpac#add('justinmk/vim-syntax-extra', {'type': 'opt'})
-  call minpac#add('ervandew/supertab', {'type': 'opt'})
+  call minpac#add('haya14busa/incsearch.vim', {'type': 'opt'})
+  " browsing
+  call minpac#add('junegunn/fzf.vim', {'type': 'opt'})
+  call minpac#add('majutsushi/tagbar', {'type': 'opt'})
+  call minpac#add('jsfaint/gen_tags.vim', {'type': 'opt'})
   call minpac#add('calleerlandsson/pick.vim', {'type': 'opt'})
-  call minpac#add('thanthese/Tortoise-Typing', {'type': 'opt'})
+  " coding->linting->building->testing
+  call minpac#add('w0rp/ale', {'type': 'opt'})
   call minpac#add('igankevich/mesonic', {'type': 'opt'})
-  call minpac#add('roxma/nvim-yarp', {'type': 'opt'})
-  call minpac#add('Shougo/deoplete.nvim', {'type': 'opt'})
-  call minpac#add('roxma/vim-hug-neovim-rpc', {'type': 'opt'})
-  call minpac#add('jsfaint/gen_tags.vim', {'type': 'opt'})
+  call minpac#add('skywind3000/asyncrun.vim', {'type': 'opt'})
+  " markdown
+  call minpac#add('previm/previm', {'type': 'opt'})
   call minpac#add('tyru/open-browser.vim', {'type': 'opt'})
   call minpac#add('plasticboy/vim-markdown', {'type': 'opt'})
-  call minpac#add('previm/previm', {'type': 'opt'})
-  call minpac#add('Yggdroot/LeaderF', {'type': 'opt'})
-  call minpac#add('vifm/vifm.vim', {'type': 'opt'})
-  call minpac#add('junegunn/fzf.vim', {'type': 'opt'})
+  call minpac#add('vim-pandoc/vim-pandoc', {'type': 'opt'})
+  call minpac#add('vim-pandoc/vim-pandoc-syntax', {'type': 'opt'})
+  " others
+  call minpac#add('thanthese/Tortoise-Typing', {'type': 'opt'})
 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -56,14 +57,22 @@ endif
 let mapleader = ' '
 let localmapleader = ' '
 
-nnoremap <leader>w                :update<cr>
-nnoremap <leader>t                :term<cr>
-nnoremap <leader>*                :grep <cword> \| copen<cr><c-l>
-nnoremap <leader>+                :exe "resize " . (winheight(0) * 3/2)<cr>
-nnoremap <leader>-                :exe "resize " . (winheight(0) * 2/3)<cr>
+nnoremap <silent> <Leader><Leader>        :Files<CR>
+nnoremap <silent> <Leader><Enter>         :Buffers<CR>
+nnoremap <silent> <Leader>L               :Lines<CR>
+nnoremap <silent> <Leader>T               :Tags<CR>
+nnoremap <silent> <Leader>`               :Marks<CR>
+nnoremap <silent> <Leader>C               :Commits<CR>
+nnoremap <silent> <Leader>S               :Snippets<CR>
+
+nnoremap <silent> <leader>w               :update<cr>
+nnoremap <silent> <leader>t               :term<cr>
+nnoremap <silent> <leader>*               :grep <cword> \| copen<cr><c-l>
+nnoremap <silent> <leader>+               :exe "resize " . (winheight(0) * 3/2)<cr>
+nnoremap <silent> <leader>-               :exe "resize " . (winheight(0) * 2/3)<cr>
 "nnoremap <leader>html             :-1read ~/.vim/template/html<CR>3jwf>a
 "nnoremap <leader>php              :-1read ~/.vim/template/php<CR>2ja
-
+"
 " Normal Mode
 nnoremap Y                        y$
 nnoremap n                        nzzzv
@@ -318,7 +327,13 @@ silent! packadd! vim-commentary
 silent! packadd! vim-vinegar
 silent! packadd! vim-endwise
 silent! packadd! supertab
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" fzf
 silent! packadd! fzf.vim
+let g:fzf_buffers_jump = 1
+let g:fzf_tags_command = 'ctags -R'
+let g:fzf_commits_log_options = '--graph --color=always --format="%C(auto)%h%d %s %C(black)%C(bold)%cr"'
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 silent! packadd! indentLine
@@ -351,8 +366,8 @@ let g:ale_enabled = 1
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Gtags-Cscope
 if executable('global')
-  "silent! packadd! gen_tags.vim
-  let GtagsCscope_Auto_Map = 1
+  silent! packadd! gen_tags.vim
+ 
   let GtagsCscope_Ignore_Case = 1
   let GtagsCscope_Absolute_Path = 1
   let GtagsCscope_Keep_Alive = 1
@@ -381,10 +396,14 @@ command! -bang -nargs=* -complete=file Grep AsyncRun -program=grep @ <args>
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Snippets 
-"silent! packadd! tlib_vim 
-"silent! packadd! vim-addon-mw-utils
+if executable('python')
+silent! packadd! ultisnips
+else
 "silent! packadd! vim-snipmate
 "silent! packadd! vim-snippets 
+"silent! packadd! tlib_vim 
+"silent! packadd! vim-addon-mw-utils
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Jedi (python)
@@ -429,4 +448,3 @@ silent! helptags ALL
 if filereadable(expand('~/.vim/vimrc.local'))
   source ~/.vim/vimrc.local
 endif
-