From c665e72754de8a5eb662ee40657d82c2ea01f125 Mon Sep 17 00:00:00 2001 From: marctalcott Date: Mon, 23 Sep 2024 07:27:51 -0400 Subject: [PATCH] upgraded everything and then fixed broken code --- ...-preview-nvim.lua => markdown-preview.lua} | 0 lua/plugins/plugins.lua | 94 +++++++++++-------- markdown-preview.nvim | 1 + 3 files changed, 54 insertions(+), 41 deletions(-) rename lua/plugins/{markdown-preview-nvim.lua => markdown-preview.lua} (100%) create mode 160000 markdown-preview.nvim diff --git a/lua/plugins/markdown-preview-nvim.lua b/lua/plugins/markdown-preview.lua similarity index 100% rename from lua/plugins/markdown-preview-nvim.lua rename to lua/plugins/markdown-preview.lua diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index f24aa17c..ad5f5bdb 100644 --- a/lua/plugins/plugins.lua +++ b/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', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - config = function() -- This is the function that runs, AFTER loading - require('which-key').setup() + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + opts = { + 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 = ' ', + Down = ' ', + Left = ' ', + Right = ' ', + C = ' ', + M = ' ', + D = ' ', + S = ' ', + CR = ' ', + Esc = ' ', + ScrollWheelDown = ' ', + ScrollWheelUp = ' ', + NL = ' ', + BS = ' ', + Space = ' ', + Tab = ' ', + F1 = '', + F2 = '', + F3 = '', + F4 = '', + F5 = '', + F6 = '', + F7 = '', + F8 = '', + F9 = '', + F10 = '', + F11 = '', + F12 = '', + }, + }, - -- Document existing key chains - require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['f'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['p'] = { name = '[P]roject-Workspace', _ = 'which_key_ignore' }, - ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, - ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]indow', _ = 'which_key_ignore' }, - } - -- visual mode - require('which-key').register({ - ['h'] = { 'Git [H]unk' }, - }, { mode = 'v' }) - end, + -- Document existing key chains + spec = { + { 'c', group = '[C]ode', mode = { 'n', 'x' } }, + { 'd', group = '[D]ocument' }, + { 'r', group = '[R]ename' }, + { 'f', group = '[S]earch' }, + { 'p', group = '[P]roject Workspace' }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + }, }, +}, -- 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 = '💤 ', - }, - }, } + diff --git a/markdown-preview.nvim b/markdown-preview.nvim new file mode 160000 index 00000000..a923f5fc --- /dev/null +++ b/markdown-preview.nvim @@ -0,0 +1 @@ +Subproject commit a923f5fc5ba36a3b17e289dc35dc17f66d0548ee