Fzf Fig

2022-09-27 14:55:48 -05:00
parent 3effd03a36
commit 0139026e84
33 changed files with 39 additions and 36 deletions
--- a/vim/.vim/plugged/asyncrun.vim
+++ b/vim/.vim/plugged/asyncrun.vim
--- a/vim/.vim/plugged/cmp-buffer
+++ b/vim/.vim/plugged/cmp-buffer
--- a/vim/.vim/plugged/fzf.vim
+++ b/vim/.vim/plugged/fzf.vim
--- a/vim/.vim/plugged/java-syntax.vim
+++ b/vim/.vim/plugged/java-syntax.vim
--- a/vim/.vim/plugged/linediff.vim
+++ b/vim/.vim/plugged/linediff.vim
--- a/vim/.vim/plugged/lspkind.nvim
+++ b/vim/.vim/plugged/lspkind.nvim
--- a/vim/.vim/plugged/nerdcommenter
+++ b/vim/.vim/plugged/nerdcommenter
--- a/vim/.vim/plugged/nvim-cmp
+++ b/vim/.vim/plugged/nvim-cmp
--- a/vim/.vim/plugged/nvim-lsp-installer
+++ b/vim/.vim/plugged/nvim-lsp-installer
--- a/vim/.vim/plugged/nvim-lspconfig
+++ b/vim/.vim/plugged/nvim-lspconfig
--- a/vim/.vim/plugged/nvim-treesitter
+++ b/vim/.vim/plugged/nvim-treesitter
--- a/vim/.vim/plugged/nvim-web-devicons
+++ b/vim/.vim/plugged/nvim-web-devicons
--- a/vim/.vim/plugged/plenary.nvim
+++ b/vim/.vim/plugged/plenary.nvim
--- a/vim/.vim/plugged/telescope.nvim
+++ b/vim/.vim/plugged/telescope.nvim
--- a/vim/.vim/plugged/trouble.nvim
+++ b/vim/.vim/plugged/trouble.nvim
--- a/vim/.vim/plugged/ultisnips
+++ b/vim/.vim/plugged/ultisnips
--- a/vim/.vim/plugged/vim-airline
+++ b/vim/.vim/plugged/vim-airline
--- a/vim/.vim/plugged/vim-airline-themes
+++ b/vim/.vim/plugged/vim-airline-themes
--- a/vim/.vim/plugged/vim-android
+++ b/vim/.vim/plugged/vim-android
--- a/vim/.vim/plugged/vim-fugitive
+++ b/vim/.vim/plugged/vim-fugitive
--- a/vim/.vim/plugged/vim-gitgutter
+++ b/vim/.vim/plugged/vim-gitgutter
--- a/vim/.vim/plugged/vim-go
+++ b/vim/.vim/plugged/vim-go
--- a/vim/.vim/plugged/vim-helm
+++ b/vim/.vim/plugged/vim-helm
--- a/vim/.vim/plugged/vim-javascript
+++ b/vim/.vim/plugged/vim-javascript
--- a/vim/.vim/plugged/vim-markdown
+++ b/vim/.vim/plugged/vim-markdown
--- a/vim/.vim/plugged/vim-signify
+++ b/vim/.vim/plugged/vim-signify
--- a/vim/.vim/plugged/vim-snippets
+++ b/vim/.vim/plugged/vim-snippets
--- a/vim/.vim/plugged/vim-tmux-navigator
+++ b/vim/.vim/plugged/vim-tmux-navigator
--- a/vim/.vim/plugged/vimux
+++ b/vim/.vim/plugged/vimux
--- a/vim/.vim/prefs/google.vim
+++ b/vim/.vim/prefs/google.vim
@ -176,7 +176,8 @@ nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
 nnoremap <leader>s :call CitCObsession()<CR>
 nnoremap <leader>g :GoogleOutlineWindow<CR>

-nnoremap <leader>ps :PiperSelectActiveFiles<CR>
+" nnoremap <leader>ps :PiperSelectActiveFiles<CR>
+nnoremap <leader>ps :FzfHgFiles<CR>
 nnoremap <leader>pl :PiperLoadActiveAsBuffers<CR>
 nnoremap <leader>po :PiperOpenPath<CR>

--- a/vim/.vim/prefs/imp.vim
+++ b/vim/.vim/prefs/imp.vim
@ -4,7 +4,7 @@ set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/
 set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch

 Glug! glaive
-Glaive imp plugin[mappings] Suggest[default]=buffer,primp,csearch,prompt Report[default]=popupnotify
+Glaive imp plugin[mappings] Suggest[default]=buffer,csearch,prompt,primp Report[default]=popupnotify
 "
 " nnoremap <leader>csi :CsImporter<cr>
 nnoremap <leader>csi :ImpSuggest
--- a/vim/.vim/prefs/plug_prefs.vim
+++ b/vim/.vim/prefs/plug_prefs.vim
@ -10,15 +10,16 @@ omap <leader><tab> <plug>(fzf-maps-o)
 let g:fzf_preview_window = ['right:50%', 'ctrl-/']

 let g:fzf_command_prefix = 'Fzf'
-" use the same keybindings for fzf as in shell
-" nnoremap <silent> <c-s-t> :FzfHgFiles<CR>
-" nnoremap <silent> <c-s-f> :FzfHgRg<space>
-let s:hg_command = 'hg files 2>/dev/null'
+let s:hg_command = 'hg whatsout --template= -- '
+
+" command! -bang -nargs=* HgFiles
+"   \ call fzf#vim#grep(
+"   \   'git grep --line-number -- '.shellescape(<q-args>), 0,
+"   \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)

 command! -bang FzfHgFiles
 \ call fzf#run(fzf#wrap({
 \     'source': s:hg_command,
-\     'options': $FZF_DEFAULT_OPTS . " " . $FZF_CTRL_T_OPTS,
 \   }),
 \   <bang>0
 \ )
--- a/vim/.vim/prefs/plugins.vim
+++ b/vim/.vim/prefs/plugins.vim
@ -24,6 +24,7 @@ Plug 'sso://user/vintharas/telescope-codesearch.nvim'

 " UI EXTENSIONS
 Plug 'ntpeters/vim-better-whitespace'  "auto-set tab/space size
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'vim-airline/vim-airline'         " ...
 Plug 'vim-airline/vim-airline-themes'