Merge pull request #5 from marctalcott/main2

upgraded everything and then fixed broken code

lua/plugins/plugins.lua

@@ -1,4 +1,5 @@
-return {
+return 
+{
   -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
   'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
 
@@ -48,28 +49,58 @@ return {
   --  config = function() ... end
 
   { -- Useful plugin to show you pending keybinds.
-    'folke/which-key.nvim',
+  'folke/which-key.nvim',
-    event = 'VimEnter', -- Sets the loading event to 'VimEnter'
+  event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    config = function() -- This is the function that runs, AFTER loading
+  opts = {
-      require('which-key').setup()
+    icons = {
+      -- set icon mappings to true if you have a Nerd Font
+      mappings = vim.g.have_nerd_font,
+      -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
+      -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
+      keys = vim.g.have_nerd_font and {} or {
+        Up = '<Up> ',
+        Down = '<Down> ',
+        Left = '<Left> ',
+        Right = '<Right> ',
+        C = '<C-…> ',
+        M = '<M-…> ',
+        D = '<D-…> ',
+        S = '<S-…> ',
+        CR = '<CR> ',
+        Esc = '<Esc> ',
+        ScrollWheelDown = '<ScrollWheelDown> ',
+        ScrollWheelUp = '<ScrollWheelUp> ',
+        NL = '<NL> ',
+        BS = '<BS> ',
+        Space = '<Space> ',
+        Tab = '<Tab> ',
+        F1 = '<F1>',
+        F2 = '<F2>',
+        F3 = '<F3>',
+        F4 = '<F4>',
+        F5 = '<F5>',
+        F6 = '<F6>',
+        F7 = '<F7>',
+        F8 = '<F8>',
+        F9 = '<F9>',
+        F10 = '<F10>',
+        F11 = '<F11>',
+        F12 = '<F12>',
+      },
+    },
 
-      -- Document existing key chains
+    -- Document existing key chains
-      require('which-key').register {
+    spec = {
-        ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
+      { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
-        ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+      { '<leader>d', group = '[D]ocument' },
-        ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
+      { '<leader>r', group = '[R]ename' },
-        ['<leader>f'] = { name = '[S]earch', _ = 'which_key_ignore' },
+      { '<leader>f', group = '[S]earch' },
-        ['<leader>p'] = { name = '[P]roject-Workspace', _ = 'which_key_ignore' },
+      { '<leader>p', group = '[P]roject Workspace' },
-        ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
+      { '<leader>t', group = '[T]oggle' },
-        ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
+      { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
-        ['<leader>w'] = { name = '[W]indow', _ = 'which_key_ignore' },
+    },
-      }
-      -- visual mode
-      require('which-key').register({
-        ['<leader>h'] = { 'Git [H]unk' },
-      }, { mode = 'v' })
-    end,
   },
+},
 
   -- NOTE: Plugins can specify dependencies.
   --
@@ -672,24 +703,5 @@ return {
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
   -- { import = 'custom.plugins' },
-}, {
-  ui = {
-    -- If you are using a Nerd Font: set icons to an empty table which will use the
-    -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
-    icons = vim.g.have_nerd_font and {} or {
-      cmd = '⌘',
-      config = '🛠',
-      event = '📅',
-      ft = '📂',
-      init = '⚙',
-      keys = '🗝',
-      plugin = '🔌',
-      runtime = '💻',
-      require = '🌙',
-      source = '📄',
-      start = '🚀',
-      task = '📌',
-      lazy = '💤 ',
-    },
-  },
 }
+

markdown-preview.nvim

@@ -0,0 +1 @@
+Subproject commit a923f5fc5ba36a3b17e289dc35dc17f66d0548ee