diff --git a/home/vim/after/plugin/mappings/fugitive.vim b/home/vim/after/plugin/mappings/fugitive.vim
deleted file mode 100644
index 934f00e..0000000
--- a/home/vim/after/plugin/mappings/fugitive.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Visual bindings for merging diffs as in normal mode
-xnoremap dp :diffput<cr>
-xnoremap do :diffget<cr>
-
-" Open status window
-nnoremap <Leader>gs :Gstatus<CR>
-" Open diff view of current buffer: the up/left window is the current index
-nnoremap <Leader>gd :Gdiffsplit!<CR>
-" Open current file log in new tab, populate its location list with history
-nnoremap <Leader>gl :sp<CR><C-w>T:Gllog --follow -- %:p<CR>
diff --git a/home/vim/after/plugin/mappings/fzf.vim b/home/vim/after/plugin/mappings/fzf.vim
index 6bf4a44..fa98f0c 100644
--- a/home/vim/after/plugin/mappings/fzf.vim
+++ b/home/vim/after/plugin/mappings/fzf.vim
@@ -1,5 +1,13 @@
-" Only git-tracked files, Vim needs to be in a Git repository
-nnoremap <Leader>ff :GFiles<CR>
+lua << EOF
+local wk = require("which-key")
 
-" Currently open buffers
-nnoremap <Leader>fb :Buffers<CR>
+local keys = {
+    f = {
+        name = "Fuzzy finder",
+        b = { "<cmd>Buffers<CR>", "Open buffers" },
+        f = { "<cmd>GFiles<CR>", "Git tracked files" },
+    },
+}
+
+wk.register(keys, { prefix = "<leader>" })
+EOF
diff --git a/home/vim/after/plugin/mappings/git.vim b/home/vim/after/plugin/mappings/git.vim
new file mode 100644
index 0000000..677abd0
--- /dev/null
+++ b/home/vim/after/plugin/mappings/git.vim
@@ -0,0 +1,20 @@
+lua << EOF
+local wk = require("which-key")
+
+local keys = {
+    d = {
+        name = "Merging diff hunks",
+        o = { "<cmd>diffget<CR>", "Use this buffer's change", mode="x" },
+        p = { "<cmd>diffput<CR>", "Accept other buffer change", mode="x" },
+    },
+    ["<leader>g"] = {
+        name = "Git",
+        d = { "<cmd>Gdiffsplit<CR>", "Current buffer diff" },
+        l = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
+        m = { "<Plug>(git-messenger)", "Current line blame" },
+        s = { "<cmd>Gstatus<CR>", "Status" },
+    },
+}
+
+wk.register(keys)
+EOF
diff --git a/home/vim/after/plugin/mappings/misc.vim b/home/vim/after/plugin/mappings/misc.vim
index fc2ed3d..d09410a 100644
--- a/home/vim/after/plugin/mappings/misc.vim
+++ b/home/vim/after/plugin/mappings/misc.vim
@@ -1,5 +1,10 @@
-" Run make silently, then skip the 'Press ENTER to continue'
-noremap <Leader>m :silent! :make! \| :redraw!<CR>
+lua << EOF
+local wk = require("which-key")
 
-" Remove search-highlighting
-noremap <Leader><Leader> :nohls<CR>
+local keys = {
+    m = { "<cmd>silent! :make! | :redraw!<CR>", "Run make" },
+    ["<leader>"] = { "<cmd>nohls<CR>", "Clear search highlight" },
+}
+
+wk.register(keys, { prefix = "<leader>" })
+EOF
diff --git a/home/vim/after/plugin/mappings/qf.vim b/home/vim/after/plugin/mappings/qf.vim
index 6c98759..e2eb8a7 100644
--- a/home/vim/after/plugin/mappings/qf.vim
+++ b/home/vim/after/plugin/mappings/qf.vim
@@ -1,3 +1,13 @@
-" Toggle quick-fix and location lists
-nmap <Leader>tf <Plug>(qf_qf_toggle)
-nmap <Leader>tl <Plug>(qf_loc_toggle)
+lua << EOF
+local wk = require("which-key")
+
+local keys = {
+    ["t"] = {
+        name = "Toggle",
+        f = { "<Plug>(qf_qf_toggle)", "Toggle quickfix list" },
+        l = { "<Plug>(qf_loc_toggle)", "Toggle location list" },
+    },
+}
+
+wk.register(keys, { prefix = "<leader>" })
+EOF