diff --git a/vim/.vim/plugged/asyncrun.vim b/vim/.vim/plugged/asyncrun.vim
index aa8a99e..7ee75ae 160000
--- a/vim/.vim/plugged/asyncrun.vim
+++ b/vim/.vim/plugged/asyncrun.vim
@@ -1 +1 @@
-Subproject commit aa8a99e87e64276d52556f4d9d4f4a19afd37556
+Subproject commit 7ee75ae20c7d556f1febb6d1a5961e48766c9c0b
diff --git a/vim/.vim/plugged/cmp-buffer b/vim/.vim/plugged/cmp-buffer
index 62fc67a..3022dbc 160000
--- a/vim/.vim/plugged/cmp-buffer
+++ b/vim/.vim/plugged/cmp-buffer
@@ -1 +1 @@
-Subproject commit 62fc67a2b0205136bc3e312664624ba2ab4a9323
+Subproject commit 3022dbc9166796b644a841a02de8dd1cc1d311fa
diff --git a/vim/.vim/plugged/fzf.vim b/vim/.vim/plugged/fzf.vim
index c491d70..9ceac71 160000
--- a/vim/.vim/plugged/fzf.vim
+++ b/vim/.vim/plugged/fzf.vim
@@ -1 +1 @@
-Subproject commit c491d702b76c6b4918abb80be3cfb57d1b618ffa
+Subproject commit 9ceac718026fd39498d95ff04fa04d3e40c465d7
diff --git a/vim/.vim/plugged/java-syntax.vim b/vim/.vim/plugged/java-syntax.vim
index 1a5354f..9a3d76a 160000
--- a/vim/.vim/plugged/java-syntax.vim
+++ b/vim/.vim/plugged/java-syntax.vim
@@ -1 +1 @@
-Subproject commit 1a5354f955b033699b3cb66cc797f4c008213e5d
+Subproject commit 9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b
diff --git a/vim/.vim/plugged/linediff.vim b/vim/.vim/plugged/linediff.vim
index c7710db..c627858 160000
--- a/vim/.vim/plugged/linediff.vim
+++ b/vim/.vim/plugged/linediff.vim
@@ -1 +1 @@
-Subproject commit c7710dbc59881b038ca064b6c54fe482303e8304
+Subproject commit c627858c6dd280221df032bbe7f3899ec71e1aaa
diff --git a/vim/.vim/plugged/lspkind.nvim b/vim/.vim/plugged/lspkind.nvim
index 57e5b5d..c68b3a0 160000
--- a/vim/.vim/plugged/lspkind.nvim
+++ b/vim/.vim/plugged/lspkind.nvim
@@ -1 +1 @@
-Subproject commit 57e5b5dfbe991151b07d272a06e365a77cc3d0e7
+Subproject commit c68b3a003483cf382428a43035079f78474cd11e
diff --git a/vim/.vim/plugged/nerdcommenter b/vim/.vim/plugged/nerdcommenter
index 6d30ebc..2a0a05f 160000
--- a/vim/.vim/plugged/nerdcommenter
+++ b/vim/.vim/plugged/nerdcommenter
@@ -1 +1 @@
-Subproject commit 6d30ebcd428eb5a244229a125420a1e044b42b52
+Subproject commit 2a0a05ff983aa62d74ba868aadf89deb93dd5454
diff --git a/vim/.vim/plugged/nvim-cmp b/vim/.vim/plugged/nvim-cmp
index 706371f..2427d06 160000
--- a/vim/.vim/plugged/nvim-cmp
+++ b/vim/.vim/plugged/nvim-cmp
@@ -1 +1 @@
-Subproject commit 706371f1300e7c0acb98b346f80dad2dd9b5f679
+Subproject commit 2427d06b6508489547cd30b6e86b1c75df363411
diff --git a/vim/.vim/plugged/nvim-lsp-installer b/vim/.vim/plugged/nvim-lsp-installer
index ae913cb..23820a8 160000
--- a/vim/.vim/plugged/nvim-lsp-installer
+++ b/vim/.vim/plugged/nvim-lsp-installer
@@ -1 +1 @@
-Subproject commit ae913cb4fd62d7a84fb1582e11f2e15b4d597123
+Subproject commit 23820a878a5c2415bfd3b971d1fe3c79e4dd6763
diff --git a/vim/.vim/plugged/nvim-lspconfig b/vim/.vim/plugged/nvim-lspconfig
index da7461b..dc4dac8 160000
--- a/vim/.vim/plugged/nvim-lspconfig
+++ b/vim/.vim/plugged/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit da7461b596d70fa47b50bf3a7acfaef94c47727d
+Subproject commit dc4dac8fcb57cfd1cde0c04a28f3f9f3c51b4cf0
diff --git a/vim/.vim/plugged/nvim-treesitter b/vim/.vim/plugged/nvim-treesitter
index e9ab034..0289160 160000
--- a/vim/.vim/plugged/nvim-treesitter
+++ b/vim/.vim/plugged/nvim-treesitter
@@ -1 +1 @@
-Subproject commit e9ab0341394b41ac9fbd197b0a6ceaff3c4d9e51
+Subproject commit 0289160c963fac1d0330966a798acacf85a43a88
diff --git a/vim/.vim/plugged/nvim-web-devicons b/vim/.vim/plugged/nvim-web-devicons
index 2d02a56..9697285 160000
--- a/vim/.vim/plugged/nvim-web-devicons
+++ b/vim/.vim/plugged/nvim-web-devicons
@@ -1 +1 @@
-Subproject commit 2d02a56189e2bde11edd4712fea16f08a6656944
+Subproject commit 969728506c0175644a1d448f55e311ccdada7eaf
diff --git a/vim/.vim/plugged/plenary.nvim b/vim/.vim/plugged/plenary.nvim
index 31807ee..62dc2a7 160000
--- a/vim/.vim/plugged/plenary.nvim
+++ b/vim/.vim/plugged/plenary.nvim
@@ -1 +1 @@
-Subproject commit 31807eef4ed574854b8a53ae40ea3292033a78ea
+Subproject commit 62dc2a7acd2fb2581871a36c1743b29e26c60390
diff --git a/vim/.vim/plugged/telescope.nvim b/vim/.vim/plugged/telescope.nvim
index 8f80e82..30e2dc5 160000
--- a/vim/.vim/plugged/telescope.nvim
+++ b/vim/.vim/plugged/telescope.nvim
@@ -1 +1 @@
-Subproject commit 8f80e821085bdb4583e78ea685e68dc34209d360
+Subproject commit 30e2dc5232d0dd63709ef8b44a5d6184005e8602
diff --git a/vim/.vim/plugged/trouble.nvim b/vim/.vim/plugged/trouble.nvim
index da61737..929315e 160000
--- a/vim/.vim/plugged/trouble.nvim
+++ b/vim/.vim/plugged/trouble.nvim
@@ -1 +1 @@
-Subproject commit da61737d860ddc12f78e638152834487eabf0ee5
+Subproject commit 929315ea5f146f1ce0e784c76c943ece6f36d786
diff --git a/vim/.vim/plugged/ultisnips b/vim/.vim/plugged/ultisnips
index 1edcb40..1914ef2 160000
--- a/vim/.vim/plugged/ultisnips
+++ b/vim/.vim/plugged/ultisnips
@@ -1 +1 @@
-Subproject commit 1edcb40ce749c47d5da42ab02dcdf21f9279bfbb
+Subproject commit 1914ef242a5b6fc095abc4b2c7702d6697c69324
diff --git a/vim/.vim/plugged/vim-airline b/vim/.vim/plugged/vim-airline
index 61042e3..78abec3 160000
--- a/vim/.vim/plugged/vim-airline
+++ b/vim/.vim/plugged/vim-airline
@@ -1 +1 @@
-Subproject commit 61042e35024a133bb5af42850d3852d20ebcc4e1
+Subproject commit 78abec3b83b5fb1bef51fcdddbcbebd7d4293685
diff --git a/vim/.vim/plugged/vim-airline-themes b/vim/.vim/plugged/vim-airline-themes
index 55bad92..cc5d349 160000
--- a/vim/.vim/plugged/vim-airline-themes
+++ b/vim/.vim/plugged/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 55bad92d246a31e3425dfaf16b7eec657eab1fad
+Subproject commit cc5d3490c8f4c87d29d97df414941a9df8ceb390
diff --git a/vim/.vim/plugged/vim-android b/vim/.vim/plugged/vim-android
index b8b684f..8911f86 160000
--- a/vim/.vim/plugged/vim-android
+++ b/vim/.vim/plugged/vim-android
@@ -1 +1 @@
-Subproject commit b8b684f60a26a7208771fc39cbeb6a6421a19ea2
+Subproject commit 8911f86284315cd574e807424bcea62fd99c588a
diff --git a/vim/.vim/plugged/vim-fugitive b/vim/.vim/plugged/vim-fugitive
index 66a921b..dd8107c 160000
--- a/vim/.vim/plugged/vim-fugitive
+++ b/vim/.vim/plugged/vim-fugitive
@@ -1 +1 @@
-Subproject commit 66a921bbe38bea19f6b581c8a56d5a8a41209e35
+Subproject commit dd8107cabf5fe85df94d5eedcae52415e543f208
diff --git a/vim/.vim/plugged/vim-gitgutter b/vim/.vim/plugged/vim-gitgutter
index ded1194..f19b620 160000
--- a/vim/.vim/plugged/vim-gitgutter
+++ b/vim/.vim/plugged/vim-gitgutter
@@ -1 +1 @@
-Subproject commit ded11946c04aeab5526f869174044019ae9e3c32
+Subproject commit f19b6203191d69de955d91467a5707959572119b
diff --git a/vim/.vim/plugged/vim-go b/vim/.vim/plugged/vim-go
index b524371..22b2273 160000
--- a/vim/.vim/plugged/vim-go
+++ b/vim/.vim/plugged/vim-go
@@ -1 +1 @@
-Subproject commit b524371788bcdd87215c6e59ca4b2853553077a4
+Subproject commit 22b2273cfe562ac1c1af976ce77f18a3b1776f3c
diff --git a/vim/.vim/plugged/vim-helm b/vim/.vim/plugged/vim-helm
index 86a63d0..c2e7b85 160000
--- a/vim/.vim/plugged/vim-helm
+++ b/vim/.vim/plugged/vim-helm
@@ -1 +1 @@
-Subproject commit 86a63d007ffee156d759061850cda9d8daa8ea12
+Subproject commit c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb
diff --git a/vim/.vim/plugged/vim-javascript b/vim/.vim/plugged/vim-javascript
index 67a3435..c470ce1 160000
--- a/vim/.vim/plugged/vim-javascript
+++ b/vim/.vim/plugged/vim-javascript
@@ -1 +1 @@
-Subproject commit 67a3435bf670018ea0b561e018f28c966812cdf0
+Subproject commit c470ce1399a544fe587eab950f571c83cccfbbdc
diff --git a/vim/.vim/plugged/vim-markdown b/vim/.vim/plugged/vim-markdown
index 3a96439..c3f83eb 160000
--- a/vim/.vim/plugged/vim-markdown
+++ b/vim/.vim/plugged/vim-markdown
@@ -1 +1 @@
-Subproject commit 3a9643961233c2812816078af8bd1eaabc530dce
+Subproject commit c3f83ebb43b560af066d2a5d66bc77c6c05293b1
diff --git a/vim/.vim/plugged/vim-signify b/vim/.vim/plugged/vim-signify
index 69498f6..8bc268c 160000
--- a/vim/.vim/plugged/vim-signify
+++ b/vim/.vim/plugged/vim-signify
@@ -1 +1 @@
-Subproject commit 69498f6d49f3eeac06870012416dd9bf867b84f3
+Subproject commit 8bc268c79d4053c2f5ccaadcf0b666dd16ed3a58
diff --git a/vim/.vim/plugged/vim-snippets b/vim/.vim/plugged/vim-snippets
index c5d977c..faaa499 160000
--- a/vim/.vim/plugged/vim-snippets
+++ b/vim/.vim/plugged/vim-snippets
@@ -1 +1 @@
-Subproject commit c5d977c49211883b9241086874fe89c72ae378ca
+Subproject commit faaa499189c4ee3fe13860e675e2370d55e3e5dd
diff --git a/vim/.vim/plugged/vim-tmux-navigator b/vim/.vim/plugged/vim-tmux-navigator
index 9ca5bfe..afb45a5 160000
--- a/vim/.vim/plugged/vim-tmux-navigator
+++ b/vim/.vim/plugged/vim-tmux-navigator
@@ -1 +1 @@
-Subproject commit 9ca5bfe5bd274051b5dd796cc150348afc993b80
+Subproject commit afb45a55b452b9238159047ce7c6e161bd4a9907
diff --git a/vim/.vim/plugged/vimux b/vim/.vim/plugged/vimux
index 89604a4..616fcb4 160000
--- a/vim/.vim/plugged/vimux
+++ b/vim/.vim/plugged/vimux
@@ -1 +1 @@
-Subproject commit 89604a4464c3069dbe31f7bc8dd16a5fbc88a303
+Subproject commit 616fcb4799674a7a809b14ca2dc155bb6ba25788
diff --git a/vim/.vim/prefs/google.vim b/vim/.vim/prefs/google.vim
index 256ac62..4afbb49 100644
--- 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>
 
diff --git a/vim/.vim/prefs/imp.vim b/vim/.vim/prefs/imp.vim
index 3dd4aab..c240a72 100644
--- 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
diff --git a/vim/.vim/prefs/plug_prefs.vim b/vim/.vim/prefs/plug_prefs.vim
index 3763453..4f96adf 100644
--- 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
 \ )
diff --git a/vim/.vim/prefs/plugins.vim b/vim/.vim/prefs/plugins.vim
index 98b636c..693369a 100644
--- 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'