diff --git a/init.lua b/init.lua index 093c5ff..dca4a04 100644 --- a/init.lua +++ b/init.lua @@ -19,6 +19,9 @@ require("paq")({ 'dstein64/vim-startuptime'; {'nvim-telescope/telescope-fzf-native.nvim', run='make'}; 'echasnovski/mini.nvim'; + 'hrsh7th/nvim-cmp'; + 'hrsh7th/cmp-buffer'; + 'hrsh7th/cmp-nvim-lsp'; }) require("colorscheme") require("config") diff --git a/lua/plugins.lua b/lua/plugins.lua index 471a34f..a03dade 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,5 +1,6 @@ local get_hex = require('cokeline/utils').get_hex --local coq = require "coq" +local cmp = require('cmp') -- local highlight = require "todo-comments.highlight" require("filetype").setup { @@ -8,25 +9,35 @@ require("filetype").setup { } } ---require("indent_blankline").setup { --- char = "|", --- buftype_exclude = {"terminal", "help"} ---} - ---require("coq_3p") { --- {src = "nvimlua", short_name = "nLUA"} ---} +cmp.setup({ + mapping = { + [''] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }), + [''] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }), + [''] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }), + [''] = cmp.config.disable, + [''] = cmp.mapping({ + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }), + [''] = cmp.mapping.confirm({ select = true }), + }, + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'buffer' } + }) +}) +local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) require'lspconfig'.clangd.setup{ - --coq.lsp_ensure_capabilities() + capabilities = capabilities } require'lspconfig'.denols.setup{ cmd = {'deno', 'lsp'}, - --coq.lsp_ensure_capabilities() + capabilities = capabilities } require'lspconfig'.vls.setup{ cmd = {'/usr/local/bin/vls'}, - --coq.lsp_ensure_capabilities() + capabilities = capabilities } local runtime_path = vim.split(package.path, ';') @@ -52,7 +63,7 @@ require'lspconfig'.sumneko_lua.setup { }, }, }, - --coq.lsp_ensure_capabilities(), + capabilities = capabilities } require('nvim-treesitter.configs').setup { @@ -62,7 +73,7 @@ require('nvim-treesitter.configs').setup { } } ---vim.cmd('COQnow -s') + local function filenameIfFileOpened() local filename = vim.fn.expand('%:t') @@ -152,6 +163,6 @@ require('cokeline').setup({ require('telescope').load_extension('fzf') -require('mini.completion').setup() +--require('mini.completion').setup() require('mini.cursorword').setup() require('mini.pairs').setup()