diff --git a/lua/core.lua b/lua/core.lua index 4955eca..10cbabb 100644 --- a/lua/core.lua +++ b/lua/core.lua @@ -16,3 +16,6 @@ opt.ignorecase = true opt.smartcase = true opt.smartindent = true opt.mouse = "i" + +-- completion for lua +opt.completeopt = 'menuone,noselect' diff --git a/lua/pluginList.lua b/lua/pluginList.lua index 7fe9b08..b742063 100644 --- a/lua/pluginList.lua +++ b/lua/pluginList.lua @@ -43,8 +43,8 @@ return require('packer').startup(function(use) use {'neovim/nvim-lspconfig', event = 'BufRead'} use { 'kabouzeid/nvim-lspinstall', - after = 'nvim-lspconfig', - config = function() require "plugins.lspinstall" end + config = function() require "plugins.lspinstall" end, + after = 'nvim-lspconfig' } use {'onsails/lspkind-nvim', after = 'nvim-lspconfig'} use {"ray-x/lsp_signature.nvim", after = 'nvim-lspconfig'} @@ -52,8 +52,10 @@ return require('packer').startup(function(use) use { 'ms-jpq/coq_nvim', branch = 'coq', - requires = {'ms-jpq/coq.artifacts', branch = 'artifacts'} + event = 'InsertEnter', + config = function() require "plugins.coq" end } + use {'ms-jpq/coq.artifacts', after = 'coq_nvim', branch = 'artifacts'} -- formating and editing use {"sbdchd/neoformat", cmd = "Neoformat"} @@ -89,7 +91,7 @@ return require('packer').startup(function(use) } use { "lukas-reineke/indent-blankline.nvim", - after = {"nvim-treesitter","nvim-base16"}, + after = {"nvim-treesitter", "nvim-base16"}, config = function() require "plugins.indent-blankline" end } diff --git a/lua/plugins/coq.lua b/lua/plugins/coq.lua new file mode 100644 index 0000000..b4de7f2 --- /dev/null +++ b/lua/plugins/coq.lua @@ -0,0 +1,3 @@ +vim.g.coq_settings = {auto_start = true, clients = {tabnine = {enabled = true}}} +local coq = require('coq') +vim.cmd('COQnow') diff --git a/lua/plugins/lspinstall.lua b/lua/plugins/lspinstall.lua index 1ed5d57..6e84b10 100644 --- a/lua/plugins/lspinstall.lua +++ b/lua/plugins/lspinstall.lua @@ -1,26 +1,15 @@ local function setup_servers() - require'lspinstall'.setup(coq.lsp_ensure_capabilities()) - local servers = require'lspinstall'.installed_servers() - for _, server in pairs(servers) do require'lspconfig'[server].setup {} end + require'lspinstall'.setup() + local servers = require'lspinstall'.installed_servers() + for _, server in pairs(servers) do + require'lspconfig'[server].setup{} + end end +setup_servers() -- Automatically reload after `:LspInstall ` so we don't have to restart neovim -require'lspinstall'.post_install_hook = function() - setup_servers() -- reload installed servers - vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server +require'lspinstall'.post_install_hook = function () + setup_servers() -- reload installed servers + vim.cmd("bufdo e") -- this triggers the FileType autocmd that starts the server end - --- setup coq.lua -local lsp = require 'lspconfig' -require("packer").loader("coq_nvim coq.artifacts") -vim.g.coq_settings = {auto_start = true, clients = {tabnine = {enabled = true}}} -local coq = require 'coq' -setup_servers() -lsp.gopls.setup(coq.lsp_ensure_capabilities({ - cmd = {"gopls", "serve"}, - settings = {gopls = {analyses = {unusedparams = true}, staticcheck = true}} -})) - --- load coq.lua -vim.cmd("COQnow -s") diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 67be660..d988947 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -79,6 +79,7 @@ _G.packer_plugins = { }, coq_nvim = { after = { "coq.artifacts" }, + config = { "\27LJ\1\2+\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\16plugins.coq\frequire\0" }, loaded = false, needs_bufread = true, path = "/home/juan/.local/share/nvim/site/pack/packer/opt/coq_nvim" @@ -229,10 +230,11 @@ vim.cmd [[augroup packer_load_aucmds]] vim.cmd [[au!]] -- Event lazy-loads time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufAdd * ++once lua require("packer.load")({'shade.nvim'}, { event = "BufAdd *" }, _G.packer_plugins)]] +vim.cmd [[au BufRead * ++once lua require("packer.load")({'nvim-treesitter', 'nvim-lspconfig', 'vim-sandwich'}, { event = "BufRead *" }, _G.packer_plugins)]] vim.cmd [[au FileType html,css ++once lua require("packer.load")({'emmet-vim'}, { event = "FileType html,css" }, _G.packer_plugins)]] vim.cmd [[au VimEnter * ++once lua require("packer.load")({'packer.nvim', 'nvim-base16'}, { event = "VimEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'nvim-treesitter', 'nvim-lspconfig', 'vim-sandwich'}, { event = "BufRead *" }, _G.packer_plugins)]] +vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'coq_nvim'}, { event = "InsertEnter *" }, _G.packer_plugins)]] +vim.cmd [[au BufAdd * ++once lua require("packer.load")({'shade.nvim'}, { event = "BufAdd *" }, _G.packer_plugins)]] time([[Defining lazy-load event autocommands]], false) vim.cmd("augroup END") if should_profile then save_profiles() end