From ed6bba05aa22388181baa829a67423b7325aeede Mon Sep 17 00:00:00 2001 From: Zam Kokott Date: Thu, 6 Nov 2025 10:13:31 +0100 Subject: [PATCH] Remove comments and use default neovim comments, change pane split keybind, add GoBack, update neotree, update completions --- lazy-lock.json | 27 +++++++------ lua/plugins/comment.lua | 7 ---- lua/plugins/completions.lua | 75 +++++++++++++++++++------------------ lua/plugins/neotree.lua | 3 +- lua/vim-options.lua | 6 ++- 5 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 lua/plugins/comment.lua diff --git a/lazy-lock.json b/lazy-lock.json index ab600d1..d006e89 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,23 +1,22 @@ { - "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946" }, - "catppuccin": { "branch": "main", "commit": "94f6e8a06b6bb7b8e5529cf9f93adb4654534241" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "catppuccin": { "branch": "main", "commit": "234fc048de931a0e42ebcad675bf6559d75e23df" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f2fa60409630ec2d24acf84494fb55e1d28d593c" }, - "mason.nvim": { "branch": "main", "commit": "3671ab0d40aa5bd24b1686562bd0a23391ecf76a" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, - "none-ls.nvim": { "branch": "main", "commit": "3ce66bc62eb363f19cceeb1fae2e71ea2bede56d" }, + "lazy.nvim": { "branch": "main", "commit": "e6a8824858757ca9cd4f5ae1a72d845fa5c46a39" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "8cdd6b1940f333c1dd085526a9c45b30fb2dbf50" }, + "none-ls.nvim": { "branch": "main", "commit": "550197530c12b4838d685cf4e0d5eb4cca8d52c7" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, + "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, + "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" }, + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" } + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" } } diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua deleted file mode 100644 index e6b597d..0000000 --- a/lua/plugins/comment.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - 'numToStr/Comment.nvim', - opts = { - -- add any options here - }, - lazy = false, -} diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua index 9154a9a..45a822a 100644 --- a/lua/plugins/completions.lua +++ b/lua/plugins/completions.lua @@ -3,43 +3,46 @@ return { "hrsh7th/cmp-nvim-lsp" }, { - "L3MON4D3/LuaSnip", - dependencies = { - "saadparwaiz1/cmp_luasnip", + "L3MON4D3/LuaSnip", + version = "v2.*", -- Replace by the latest released major (first number of latest release) + -- install jsregexp (optional!). + build = "make install_jsregexp", + dependencies = { + "saadparwaiz1/cmp_luasnip", "rafamadriz/friendly-snippets", - }, - }, - { - "hrsh7th/nvim-cmp", - config = function() - local cmp = require("cmp") + }, + }, + { + "hrsh7th/nvim-cmp", + config = function() + local cmp = require("cmp") require("luasnip.loaders.from_vscode").lazy_load() - cmp.setup({ - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - require("luasnip").lsp_expand(args.body) -- For `luasnip` users. - end, - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, -- For luasnip users. - }, { - { name = "buffer" }, - }), - }) - end, - }, + cmp.setup({ + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + require("luasnip").lsp_expand(args.body) -- For `luasnip` users. + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, -- For luasnip users. + }, { + { name = "buffer" }, + }), + }) + end, + }, } diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua index 47b8f32..9398c1f 100644 --- a/lua/plugins/neotree.lua +++ b/lua/plugins/neotree.lua @@ -21,7 +21,8 @@ return { visible = false, show_hidden_count = true, hide_dotfiles = false, - hide_gitignored = false, + hide_gitignored = true, + hide_hidden = true, hide_by_name = { '.git', 'bin', diff --git a/lua/vim-options.lua b/lua/vim-options.lua index 0b452e0..8c1c3c4 100644 --- a/lua/vim-options.lua +++ b/lua/vim-options.lua @@ -12,11 +12,12 @@ vim.cmd("highlight NonText ctermbg=none") vim.o.winborder = 'rounded' vim.cmd.set("splitright") -vim.keymap.set("n", "v", function() +vim.keymap.set("n", "/", function() vim.cmd.vnew() end) -vim.keymap.set("n", "h", function() +vim.cmd.set("splitbelow") +vim.keymap.set("n", "-", function() vim.cmd.new() end) @@ -24,3 +25,4 @@ vim.api.nvim_set_keymap('n', '', ':wincmd k', { noremap = true, silent vim.api.nvim_set_keymap('n', '', ':wincmd h', { noremap = true, silent = true }); vim.api.nvim_set_keymap('n', '', ':wincmd j', { noremap = true, silent = true }); vim.api.nvim_set_keymap('n', '', ':wincmd l', { noremap = true, silent = true }); +vim.api.nvim_set_keymap('n', 'gb' , ':bnext', { noremap = true, silent = true });