diff --git a/neovim/config/diagnostics.lua b/neovim/config/diagnostics.lua
index d09ad3f..366a246 100644
--- a/neovim/config/diagnostics.lua
+++ b/neovim/config/diagnostics.lua
@@ -16,3 +16,8 @@ vim.diagnostic.config({
     },
   },
 })
+
+-- Nvim already binds ]d / [d to jump and <C-W>d to show the diagnostic under
+-- the cursor; these put the same actions on <leader> so which-key lists them.
+vim.keymap.set('n', '<leader>dd', vim.diagnostic.open_float, { desc = 'Show diagnostic' })
+vim.keymap.set('n', '<leader>dq', vim.diagnostic.setqflist, { desc = 'Diagnostics to quickfix' })
diff --git a/neovim/config/plugins/gitsigns.lua b/neovim/config/plugins/gitsigns.lua
index 58df528..f1f352e 100644
--- a/neovim/config/plugins/gitsigns.lua
+++ b/neovim/config/plugins/gitsigns.lua
@@ -1,55 +1,58 @@
 vim.pack.add({ 'https://github.com/lewis6991/gitsigns.nvim' })
 
-require('gitsigns').setup({
-  on_attach = function(bufnr)
-    local gitsigns = require('gitsigns')
+local gitsigns = require('gitsigns')
 
-    local function map(mode, lhs, rhs, desc)
-      vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
-    end
+gitsigns.setup()
 
-    -- Navigation, falling back to vim's own diff motions in diff mode
-    map('n', ']c', function()
-      if vim.wo.diff then
-        vim.cmd.normal({ ']c', bang = true })
-      else
-        gitsigns.nav_hunk('next')
-      end
-    end, 'Next git hunk')
+-- Mapped globally rather than from on_attach. Gitsigns attaches asynchronously,
+-- after which-key has already built its keymap tree for the buffer, and
+-- which-key only rebuilds that on BufReadPost/BufNew/LspAttach - so
+-- buffer-local maps added later never show up in its popup. The gitsigns API
+-- no-ops in buffers it hasn't attached to, so global maps are safe.
+local function map(mode, lhs, rhs, desc)
+  vim.keymap.set(mode, lhs, rhs, { desc = desc })
+end
 
-    map('n', '[c', function()
-      if vim.wo.diff then
-        vim.cmd.normal({ '[c', bang = true })
-      else
-        gitsigns.nav_hunk('prev')
-      end
-    end, 'Previous git hunk')
+-- Navigation, falling back to vim's own diff motions in diff mode
+map('n', ']c', function()
+  if vim.wo.diff then
+    vim.cmd.normal({ ']c', bang = true })
+  else
+    gitsigns.nav_hunk('next')
+  end
+end, 'Next git hunk')
 
-    -- Actions
-    map('n', '<leader>hs', gitsigns.stage_hunk, 'Stage hunk')
-    map('n', '<leader>hr', gitsigns.reset_hunk, 'Reset hunk')
+map('n', '[c', function()
+  if vim.wo.diff then
+    vim.cmd.normal({ '[c', bang = true })
+  else
+    gitsigns.nav_hunk('prev')
+  end
+end, 'Previous git hunk')
 
-    map('v', '<leader>hs', function()
-      gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
-    end, 'Stage selected hunk')
+-- Actions
+map('n', '<leader>hs', gitsigns.stage_hunk, 'Stage hunk')
+map('n', '<leader>hr', gitsigns.reset_hunk, 'Reset hunk')
 
-    map('v', '<leader>hr', function()
-      gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
-    end, 'Reset selected hunk')
+map('v', '<leader>hs', function()
+  gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+end, 'Stage selected hunk')
 
-    map('n', '<leader>hS', gitsigns.stage_buffer, 'Stage buffer')
-    map('n', '<leader>hR', gitsigns.reset_buffer, 'Reset buffer')
-    map('n', '<leader>hp', gitsigns.preview_hunk, 'Preview hunk')
-    map('n', '<leader>hd', gitsigns.diffthis, 'Diff against index')
+map('v', '<leader>hr', function()
+  gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
+end, 'Reset selected hunk')
 
-    map('n', '<leader>hb', function()
-      gitsigns.blame_line({ full = true })
-    end, 'Blame line')
+map('n', '<leader>hS', gitsigns.stage_buffer, 'Stage buffer')
+map('n', '<leader>hR', gitsigns.reset_buffer, 'Reset buffer')
+map('n', '<leader>hp', gitsigns.preview_hunk, 'Preview hunk')
+map('n', '<leader>hd', gitsigns.diffthis, 'Diff against index')
 
-    map('n', '<leader>hq', gitsigns.setqflist, 'Hunks to quickfix')
+map('n', '<leader>hb', function()
+  gitsigns.blame_line({ full = true })
+end, 'Blame line')
 
-    -- Toggles
-    map('n', '<leader>tb', gitsigns.toggle_current_line_blame, 'Toggle line blame')
-    map('n', '<leader>td', gitsigns.toggle_deleted, 'Toggle deleted lines')
-  end,
-})
+map('n', '<leader>hq', gitsigns.setqflist, 'Hunks to quickfix')
+
+-- Toggles
+map('n', '<leader>tb', gitsigns.toggle_current_line_blame, 'Toggle line blame')
+map('n', '<leader>td', gitsigns.toggle_deleted, 'Toggle deleted lines')
diff --git a/neovim/config/plugins/which-key.lua b/neovim/config/plugins/which-key.lua
index 0eb1d9c..2b6bf9e 100644
--- a/neovim/config/plugins/which-key.lua
+++ b/neovim/config/plugins/which-key.lua
@@ -4,8 +4,9 @@ local wk = require('which-key')
 
 wk.setup()
 
--- Names for the gitsigns prefixes, so the popup groups them sensibly
+-- Names for the <leader> prefixes, so the popup groups them sensibly
 wk.add({
+  { '<leader>d', group = 'diagnostics' },
   { '<leader>h', group = 'hunks' },
   { '<leader>t', group = 'toggles' },
 })