From a23159e50dc1301104bb2e4bb3795fbd09a94f54 Mon Sep 17 00:00:00 2001
From: Julian Prein <julian@druck.dev>
Date: Wed, 3 Sep 2025 13:07:35 +0200
Subject: [PATCH] vim:keys: Merge fzf mappings

---
 .config/vim/vimrc.d/40-keys.vim | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.config/vim/vimrc.d/40-keys.vim b/.config/vim/vimrc.d/40-keys.vim
index 9718a8d..f5ee752 100644
--- a/.config/vim/vimrc.d/40-keys.vim
+++ b/.config/vim/vimrc.d/40-keys.vim
@@ -102,6 +102,14 @@ if (get(g:, 'loaded_fzf'))
 		nmap <leader>t <Cmd>Tags<CR>
 		nmap <leader>bt <Cmd>BTags<CR>
 	endif
+
+	" git files that `git status` lists
+	nmap <leader>gf <Cmd>GFiles?<CR>
+	" 'git log (log?)' and 'git log buffer '
+	map <leader>gll <Cmd>Commits<CR>
+	map <leader>glb <Cmd>BCommits<CR>
+	" TODO: <leader>glb should restrict the log to all staged files when called
+	" in .git/COMMIT_EDITMSG, maybe with an ftplugin?
 endif
 
 " Search for selected text.
@@ -195,15 +203,6 @@ if exists('g:loaded_gitgutter')
 	nmap ]h <Plug>(GitGutterNextHunk)zz
 endif
 
-if (get(g:, 'loaded_fzf'))
-	" git files that `git status` lists
-	nmap <leader>gf <Cmd>GFiles?<CR>
-	" 'git log (log?)' and 'git log buffer '
-	map <leader>gll <Cmd>Commits<CR>
-	map <leader>glb <Cmd>BCommits<CR>
-	" TODO: <leader>glb should restrict the log to all staged files when called
-	" in .git/COMMIT_EDITMSG, maybe with an ftplugin?
-endif
 
 " Y should behave like D & C does
 nnoremap Y y$