diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 1e4758bd..558a0e44 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,4 +1,4 @@ --- [[ Keymaps ]] +-- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -- vim.keymap.set( required, required, required, not required) -- Set highlight on search, but clear on pressing in normal mode @@ -58,9 +58,9 @@ vim.keymap.set('n', 'k', ':m .-2==', { desc = 'Move line down in in -- Window management vim.keymap.set('n', '', '', { desc = 'Close window with ctrl+c' }) --- Markdown preview -vim.keymap.set('n', 'mp', ':Glow', { desc = 'Remap glow to show markdown preview' }) -vim.keymap.set('n', 'mq', ':Glow!', { desc = 'Remap glow to close markdown preview' }) +-- Markdown preview haven't setup this plugin +-- vim.keymap.set('n', 'mp', ':Glow', { desc = 'Remap glow to show markdown preview' }) +-- vim.keymap.set('n', 'mq', ':Glow!', { desc = 'Remap glow to close markdown preview' }) -- Save file vim.keymap.set({ 'i', 'v', 'n', 's' }, '', 'w', { desc = 'Save file' }) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 61376dc8..cff6c454 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -12,7 +12,6 @@ require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- Plugins with default values 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - 'APZelos/blamer.nvim', -- Show git blame 'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines -- One liners @@ -21,7 +20,7 @@ require('lazy').setup({ -- Plugins with custom values require 'plugins_config/which-key', -- Show created key bindings - require 'plugins_config/gitsigns', -- Manage git signs + require 'plugins_config/gitsigns', -- Manage git signs, blame require 'plugins_config/vim-fugitive', -- Manage git in nvim require 'plugins_config/telescope', -- Manage searches nicely require 'plugins_config/worktree', -- Manage worktrees from nvim diff --git a/lua/plugins_config/autocomplete.lua b/lua/plugins_config/autocomplete.lua index 71e6c6dd..806719f6 100644 --- a/lua/plugins_config/autocomplete.lua +++ b/lua/plugins_config/autocomplete.lua @@ -57,16 +57,15 @@ return { -- Autocompletion [''] = cmp.mapping.select_next_item(), -- Select the [p]revious item [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - -- Accept ([y]es) the completion. -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, diff --git a/lua/plugins_config/harpoon.lua b/lua/plugins_config/harpoon.lua index b44f5389..fbbbc14f 100644 --- a/lua/plugins_config/harpoon.lua +++ b/lua/plugins_config/harpoon.lua @@ -5,7 +5,6 @@ return { }, config = function() require('harpoon').setup {} - -- local harpoon = require('harpoon') local mark = require 'harpoon.mark' local ui = require 'harpoon.ui' -- diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index a22afb80..b3a21482 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -121,8 +121,8 @@ return { -- This may be unwanted, since they displace some of your code if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then map('th', function() - vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) - end, '[T]oggle Inlay [H]ints') + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, '[T]oggle Inlay [H]intsk ') end end, }) diff --git a/lua/plugins_config/worktree.lua b/lua/plugins_config/worktree.lua index ce28c13a..ddc1fab5 100644 --- a/lua/plugins_config/worktree.lua +++ b/lua/plugins_config/worktree.lua @@ -1,7 +1,8 @@ return { + 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim opts = { change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) autopush = true, - }, + }, }