From fc2b1e29311b8680e73c102cb10b5ca048b22033 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Thu, 31 Jul 2025 10:19:35 +0200 Subject: [PATCH] Updates --- lazy-lock.json | 3 +- lua/plugins/cmp.lua | 122 ------------------------------------------- lua/plugins/init.lua | 1 + 3 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 lua/plugins/cmp.lua diff --git a/lazy-lock.json b/lazy-lock.json index 855a9d2..2b17856 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,6 @@ { "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" }, "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "deepl.vim": { "branch": "main", "commit": "59df8cc17bb28989ce562bf4712c724d23baadcd" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, @@ -20,7 +19,6 @@ "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "multicursor.nvim": { "branch": "1.0", "commit": "ffe2e402e85150516d096842f7be99fd1321a72b" }, "neoconf.nvim": { "branch": "main", "commit": "a7b03bc23971ea9d569da70e21817d9d49b78c19" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nvim-dap": { "branch": "master", "commit": "7523676a4be17644587aa47e4d42f6f7646d4727" }, "nvim-genghis": { "branch": "main", "commit": "cdf584d05ffc9d5c1f247079991552249e4f7487" }, "nvim-jdtls": { "branch": "master", "commit": "b69924ca90014fef485ee153571bdcbc1ece8c2e" }, @@ -61,6 +59,7 @@ "vim-nftables": { "branch": "master", "commit": "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff" }, "vim-pass": { "branch": "master", "commit": "601bdc138c736b36c695eebe68e31ce82bafdff0" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-textobj-comment": { "branch": "master", "commit": "58ae4571b76a5bf74850698f23d235eef991dd4b" }, "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua deleted file mode 100644 index d956bb1..0000000 --- a/lua/plugins/cmp.lua +++ /dev/null @@ -1,122 +0,0 @@ -return {} ---return { --- { --- "hrsh7th/nvim-cmp", --- -- load cmp on InsertEnter --- event = "InsertEnter", --- -- these dependencies will only be loaded when cmp loads --- -- dependencies are always lazy-loaded unless specified otherwise --- dependencies = { --- "hrsh7th/cmp-nvim-lsp", --- "hrsh7th/cmp-buffer", --- "hrsh7th/cmp-path", --- "hrsh7th/cmp-cmdline", --- -- 'hrsh7th/cmp-vsnip', --- -- 'hrsh7th/vim-vsnip', --- -- 'hrsh7th/vim-vsnip-integ', --- "L3MON4D3/LuaSnip", --- "saadparwaiz1/cmp_luasnip", --- "onsails/lspkind.nvim", --- { --- "zbirenbaum/copilot-cmp", --- dependencies = { --- "hrsh7th/nvim-cmp", --- { --- "zbirenbaum/copilot.lua", --- opts = { --- suggestion = { enabled = false }, --- panel = { enabled = false }, --- filetypes = { --- mail = false, --- text = false, --- }, --- }, --- }, --- }, --- config = function() --- require("copilot_cmp").setup() --- end, --- }, --- }, --- config = function() --- local cmp = require("cmp") --- local lspkind = require("lspkind") --- local luasnip = require("luasnip") --- local has_words_before = function() --- unpack = unpack or table.unpack --- local line, col = unpack(vim.api.nvim_win_get_cursor(0)) --- return col ~= 0 --- and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil --- end --- --- cmp.setup({ --- snippet = { --- expand = function(args) --- --vim.fn["vsnip#anonymous"](args.body) --- require("luasnip").lsp_expand(args.body) --- end, --- }, --- mapping = { --- [""] = cmp.mapping.confirm({ select = true }), --- [""] = cmp.mapping.scroll_docs(-4), --- [""] = cmp.mapping.scroll_docs(4), --- [""] = cmp.mapping.complete(), --- [""] = cmp.mapping.abort(), --- [""] = cmp.mapping.confirm({ --- behavior = cmp.ConfirmBehavior.Replace, --- select = true, --- }), --- [""] = cmp.mapping({ --- i = function(fallback) --- if cmp.visible() and cmp.get_active_entry() then --- cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) --- else --- fallback() --- end --- end, --- s = cmp.mapping.confirm({ select = true }), --- c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), --- }), --- [""] = cmp.mapping(function(fallback) --- if cmp.visible() then --- cmp.select_next_item() --- -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() --- -- they way you will only jump inside the snippet region --- elseif luasnip.expand_or_jumpable() then --- luasnip.expand_or_jump() --- elseif has_words_before() then --- cmp.complete() --- else --- fallback() --- end --- end, { "i", "s" }), --- [""] = cmp.mapping(function(fallback) --- if cmp.visible() then --- cmp.select_prev_item() --- elseif luasnip.jumpable(-1) then --- luasnip.jump(-1) --- else --- fallback() --- end --- end, { "i", "s" }), --- }, --- sources = cmp.config.sources({ --- { name = "nvim_lsp" }, --- { name = "luasnip" }, --- { name = "copilot" }, --- }, { --- { name = "buffer", option = { keyword_pattern = [[\k\+]] } }, --- --{ name = 'path' }, --- }), --- formatting = { --- format = lspkind.cmp_format({ --- mode = "symbol_text", -- show only symbol annotations --- maxwidth = 80, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters) --- ellipsis_char = "…", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first) --- symbol_map = { Copilot = "" }, --- }), --- }, --- }) --- end, --- }, ---} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index bea0ad6..d2f1ef8 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -5,6 +5,7 @@ return { "tpope/vim-surround", "tpope/vim-characterize", "tpope/vim-commentary", + "tpope/vim-sleuth", { "chrisgrieser/nvim-genghis", dependencies = "stevearc/dressing.nvim", opts = { trashCmd = "rm" } },