diff options
| -rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 8 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/cmp.lua | 64 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/options.lua | 2 |
4 files changed, 6 insertions, 70 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 018872d..15957e9 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -5,15 +5,7 @@ "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-commit": { "branch": "main", "commit": "5f7d19957012ba114da59f06c7e6a3adafb1751d" }, - "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, - "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, - "cmp-npm": { "branch": "main", "commit": "2337f109f51a09297596dd6b538b70ccba92b4e4" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" }, diff --git a/nvim/.config/nvim/lua/plugins/cmp.lua b/nvim/.config/nvim/lua/plugins/cmp.lua index 66eeca6..bdf6ea2 100644 --- a/nvim/.config/nvim/lua/plugins/cmp.lua +++ b/nvim/.config/nvim/lua/plugins/cmp.lua @@ -1,4 +1,3 @@ ----@diagnostic disable: missing-fields ---@type LazyPluginSpec local M = { "hrsh7th/nvim-cmp", @@ -7,24 +6,7 @@ local M = { "hrsh7th/cmp-buffer", "hrsh7th/cmp-path", "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-nvim-lsp-document-symbol", - "hrsh7th/cmp-nvim-lsp-signature-help", - "hrsh7th/cmp-nvim-lua", "hrsh7th/cmp-cmdline", - "Dosx001/cmp-commit", - "rcarriga/cmp-dap", - "davidsierradz/cmp-conventionalcommits", - { - "petertriho/cmp-git", - ft = "gitcommit", - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, - }, - { - "David-Kunz/cmp-npm", - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, - }, { "saadparwaiz1/cmp_luasnip", dependencies = { @@ -68,6 +50,7 @@ function M:config() border = "single", }), }, + ---@diagnostic disable-next-line: missing-fields formatting = { format = function(_, vim_item) vim_item.menu = nil @@ -84,63 +67,24 @@ function M:config() }), sources = { { name = "nvim_lsp" }, - { name = "nvim_lsp_signature_help" }, { name = "luasnip" }, { name = "path" }, }, }) - local cmd_mapping = cmp.mapping.preset.cmdline({ - ["<C-Space>"] = { c = cmp.mapping.complete({}) }, - ["<C-e>"] = { c = cmp.mapping.abort() }, - }) - cmp.setup.cmdline(":", { - mapping = cmd_mapping, + mapping = cmp.mapping.preset.cmdline(), sources = { - { name = "cmdline", max_item_count = 10 }, + { name = "cmdline" }, }, }) cmp.setup.cmdline({ "/", "?", "@" }, { - mapping = cmd_mapping, - sources = { - { name = "nvim_lsp_document_symbol", max_item_count = 10, group_index = 1 }, - { name = "buffer", keyword_length = 3, max_item_count = 10, group_index = 2 }, - }, - }) - - cmp.setup.filetype({ "tex", "bib", "markdown" }, { + mapping = cmp.mapping.preset.cmdline(), sources = { { name = "buffer", keyword_length = 3 }, }, }) - - cmp.setup.filetype("gitcommit", { - sources = { - { name = "git" }, - { name = "commit" }, - { name = "conventionalcommits" }, - }, - }) - - cmp.setup.filetype("json", { - sources = { - { name = "npm" }, - }, - }) - - cmp.setup.filetype("toml", { - sources = { - { name = "crates" }, - }, - }) - - cmp.setup.filetype("dap-repl", { - sources = { - { name = "dap" }, - }, - }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua b/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua index 035fb69..f1db2bc 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/capabilities.lua @@ -14,7 +14,7 @@ local M = { }) end, [ms.textDocument_signatureHelp] = function(bufnr) - vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, { + vim.keymap.set({ "n", "i" }, "<C-s>", vim.lsp.buf.signature_help, { buffer = bufnr, desc = "signature help", }) diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua index 727bfa6..522f7db 100644 --- a/nvim/.config/nvim/lua/tobyvin/options.lua +++ b/nvim/.config/nvim/lua/tobyvin/options.lua @@ -4,7 +4,7 @@ vim.g.maplocalleader = vim.g.mapleader vim.opt.background = "dark" vim.opt.breakindent = true vim.opt.colorcolumn = "+1" -vim.opt.completeopt = { "menuone", "noselect", "noinsert" } +vim.opt.completeopt = { "menuone", "noselect", "noinsert", "popup" } vim.opt.conceallevel = 2 vim.opt.cursorline = true vim.opt.diffopt = { "internal", "filler", "closeoff", "hiddenoff" } |