Merge 'upstream' cleanup: refactor which-key configuration

lua/kickstart/plugins/which-key.lua

@@ -17,8 +17,7 @@ return {
   { -- Useful plugin to show you pending keybinds.
     'folke/which-key.nvim',
     event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    config = function() -- This is the function that runs, AFTER loading
-      require('which-key').setup {
+    opts = {
       icons = {
         -- set icon mappings to true if you have a Nerd Font
         mappings = vim.g.have_nerd_font,
@@ -54,11 +53,9 @@ return {
           F11 = '<F11>',
           F12 = '<F12>',
         },
-        },
-      }
 
         -- Document existing key chains
-      require('which-key').add {
+        spec = {
           { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
           { '<leader>d', group = '[D]ocument' },
           { '<leader>r', group = '[R]ename' },
@@ -66,8 +63,9 @@ return {
           { '<leader>w', group = '[W]orkspace' },
           { '<leader>t', group = '[T]oggle' },
           { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
-      }
-    end,
+        },
+      },
+    },
   },
 }
 -- vim: ts=2 sts=2 sw=2 et