diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 5fba540..c91488b 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -87,6 +87,10 @@ return require("packer").startup(function() "hrsh7th/cmp-omni", "petertriho/cmp-git", "hrsh7th/cmp-nvim-lsp-signature-help", + { + "zbirenbaum/copilot-cmp", + requires = { "zbirenbaum/copilot.lua" }, + }, { "hrsh7th/nvim-cmp", config = [[require('plugins.nvim-cmp')]], diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua index f99434d..81f939b 100644 --- a/lua/plugins/nvim-cmp.lua +++ b/lua/plugins/nvim-cmp.lua @@ -33,10 +33,6 @@ cmp.setup({ end, }), }, - experimental = { - ghost_text = true, - native_menu = false, - }, mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), @@ -69,33 +65,25 @@ cmp.setup({ end end, { "i", "s" }), }), + sources = cmp.config.sources({ - { - name = "nvim_lsp", - }, - { - name = "luasnip", - }, - { - name = "nvim_lsp_signature_help", - }, - { - name = "nvim_lua", - }, - { - name = "orgmode", - }, - }, { + { name = "copilot" }, + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "nvim_lsp_signature_help" }, + { name = "nvim_lua" }, + { name = "orgmode" }, + { name = "path" }, + { name = "buffer" }, + }), +}) - { name = "git" }, - }, { - { - name = "path", - }, +-- Set configuration for specific filetype. +cmp.setup.filetype("gitcommit", { + sources = cmp.config.sources({ + { name = "cmp_git" }, }, { - { - name = "buffer", - }, + { name = "buffer" }, }), }) @@ -124,3 +112,9 @@ cmp.setup.cmdline(":", { }) require("cmp_git").setup() + +require("copilot").setup({ + suggestion = { enabled = false }, + panel = { enabled = false }, +}) +require("copilot_cmp").setup()