From f78e30c7edb0e5b0dceb0877e85a61b0c4d37bf5 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Tue, 9 Mar 2021 19:34:35 +0100
Subject: [PATCH] vim: Remove Command-T, add Skim

---
 vim/after/ftplugin/go.vim |  1 +
 vimrc                     | 20 ++++++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 557f02f..00f908b 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -21,6 +21,7 @@ nnoremap <silent> dn :GoDebugNext<cr>
 nnoremap <silent> ds :GoDebugStep<cr>
 
 " Vim-Go configuration:
+let g:go_decls_mode = 'skim'
 let g:go_fmt_autosave = 0
 " Vim-Go seems to handle fix-on-save better than ALE:
 let g:go_imports_autosave = 1
diff --git a/vimrc b/vimrc
index 96d051f..45bfe24 100644
--- a/vimrc
+++ b/vimrc
@@ -157,18 +157,9 @@ inoremap <expr><C-]> pumvisible() ? "\<C-]>" : "\<Enter>"
 " vim-markdown configuration:
 let g:vim_markdown_conceal = 1
 
-" Command-T configuration:
-let switchbuf="usetab"
-map <leader>T :CommandTFlush<CR>
-map <Leader>r :CommandTMRU<CR>
-map <Leader>k :CommandTHelp<CR>
-map <Leader>c :CommandTCommand<CR>
-let g:CommandTFileScanner="git"
-let g:CommandTGitScanSubmodules=1
-let g:CommandTGitIncludeUntracked=1
-let g:CommandTMatchWindowAtTop=0
-let g:CommandTMaxHeight=20
-packadd! command-t
+" Skim configuration:
+nmap <leader>t :GFiles<cr>
+nmap <leader>b :Buffers<cr>
 
 " Lightline configuration:
 set laststatus=2
@@ -274,6 +265,11 @@ packadd! lightline.vim
 packadd! tmux-complete.vim
 packadd! vim-commentary
 packadd! vim-gitgutter
+" Requires both skim.vim plugin to be manually installed:
+" https://github.com/lotabout/skim/blob/master/plugin/skim.vim
+" and also this separate plugin, which is loaded here:
+" https://github.com/lotabout/skim.vim/blob/master/autoload/fzf/vim.vim
+packadd! skim.vim
 packadd! vim-go
 packadd! vim-surround
 packadd! vim-yaml-folds