5 files changed,
109 insertions(+),
109 deletions(-)
Author:
Smirnov Oleksandr
ss2316544@gmail.com
Committed at:
2024-11-04 18:29:55 +0200
Parent:
7ac0eb3
M
lua/plugins/completion.lua
@@ -1,114 +1,112 @@
---@type LazySpec return { - { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - keys = { ":" }, - dependencies = { - "hrsh7th/cmp-buffer", - "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-path", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-cmdline", - { - "zbirenbaum/copilot-cmp", - dependencies = "copilot.lua", - enabled = true, - opts = {}, - }, + "hrsh7th/nvim-cmp", + event = "InsertEnter", + keys = { ":" }, + dependencies = { + "hrsh7th/cmp-buffer", + "saadparwaiz1/cmp_luasnip", + "hrsh7th/cmp-path", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-cmdline", + { + "zbirenbaum/copilot-cmp", + dependencies = "copilot.lua", + enabled = true, + opts = {}, }, - config = function() - local cmp = require "cmp" - local cmp_autopairs = require "nvim-autopairs.completion.cmp" + }, + config = function() + local cmp = require "cmp" + local cmp_autopairs = require "nvim-autopairs.completion.cmp" - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - ---@diagnostic disable-next-line: missing-fields - cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, { - sources = { { name = "buffer" }, { name = "luasnip" } }, - }) + cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) + ---@diagnostic disable-next-line: missing-fields + cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, { + sources = { { name = "buffer" }, { name = "luasnip" } }, + }) - ---@diagnostic disable-next-line: missing-fields - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = { { name = "path" }, { name = "cmdline" } }, - }) + ---@diagnostic disable-next-line: missing-fields + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = { { name = "path" }, { name = "cmdline" } }, + }) - cmp.setup { - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - window = {}, - ---@diagnostic disable-next-line: missing-fields - view = { entries = { follow_cursor = true } }, - experimental = { ghost_text = true }, - ---@diagnostic disable-next-line: missing-fields - formatting = { - format = function(_, vim_item) - vim_item.kind = ({ - Text = "", - Method = "", - Function = "", - Constructor = "", - Field = "", - Variable = "", - Class = "", - Interface = "", - Module = "", - Property = "", - Unit = "", - Value = "", - Enum = "", - Keyword = "", - Snippet = "", - Color = "", - File = "", - Reference = "", - Folder = "", - EnumMember = "", - Constant = "", - Struct = "", - Event = "", - Operator = "", - TypeParameter = "", - Copilot = "", - })[vim_item.kind] + cmp.setup { + snippet = { + expand = function(args) + require("luasnip").lsp_expand(args.body) + end, + }, + window = {}, + ---@diagnostic disable-next-line: missing-fields + view = { entries = { follow_cursor = true } }, + experimental = { ghost_text = true }, + ---@diagnostic disable-next-line: missing-fields + formatting = { + format = function(_, vim_item) + vim_item.kind = ({ + Text = "", + Method = "", + Function = "", + Constructor = "", + Field = "", + Variable = "", + Class = "", + Interface = "", + Module = "", + Property = "", + Unit = "", + Value = "", + Enum = "", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "", + Struct = "", + Event = "", + Operator = "", + TypeParameter = "", + Copilot = "", + })[vim_item.kind] - return vim_item - end, - }, - mapping = cmp.mapping.preset.insert { - ["<C-u>"] = cmp.mapping.scroll_docs(-4), - ["<C-d>"] = cmp.mapping.scroll_docs(4), - ["<C-Space>"] = cmp.mapping.complete {}, - ["<CR>"] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = false, - }, - ["<Tab>"] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, - ["<S-Tab>"] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, - }, - sources = cmp.config.sources { - { name = "copilot", group_index = 2, max_item_count = 3 }, - { name = "nvim_lsp", max_item_count = 12 }, - { name = "buffer", max_item_count = 4 }, - { name = "luasnip", max_item_count = 3 }, - { name = "path", max_item_count = 2 }, + return vim_item + end, + }, + mapping = cmp.mapping.preset.insert { + ["<C-u>"] = cmp.mapping.scroll_docs(-4), + ["<C-d>"] = cmp.mapping.scroll_docs(4), + ["<C-Space>"] = cmp.mapping.complete {}, + ["<CR>"] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Insert, + select = false, }, - } - end, - }, + ["<Tab>"] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + else + fallback() + end + end, + ["<S-Tab>"] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + end, + }, + sources = cmp.config.sources { + { name = "copilot", group_index = 2, max_item_count = 3 }, + { name = "nvim_lsp", max_item_count = 12 }, + { name = "buffer", max_item_count = 4 }, + { name = "luasnip", max_item_count = 3 }, + { name = "path", max_item_count = 2 }, + }, + } + end, }
M
lua/plugins/copilot.lua
@@ -1,4 +1,4 @@
----@type LazySpec[] +---@type LazySpec return { { "zbirenbaum/copilot.lua",
M
lua/plugins/core.lua
@@ -1,4 +1,4 @@
----@type LazySpec[] +---@type LazySpec return { "nvim-lua/plenary.nvim", "kyazdani42/nvim-web-devicons",
M
lua/plugins/git.lua
@@ -1,4 +1,4 @@
----@type LazySpec[] +---@type LazySpec return { { "lewis6991/gitsigns.nvim",
M
lua/plugins/gopher.lua
@@ -6,7 +6,9 @@ "olexsmir/gopher.nvim",
ft = "go", dev = true, cmd = "GoInstallDeps", - build = vim.cmd.GoInstallDeps, + build = function() + pcall(vim.cmd.GoInstallDeps) + end, dependencies = { { "williamboman/mason.nvim", cond = dev_deps, config = true }, },