Add nvim-cmp

flake.lock

@@ -81,11 +81,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1651074515,
+        "lastModified": 1651181254,
-        "narHash": "sha256-BrUxq9x1U4mKlkuNaPV2z4Y4JUt08QBgmEdX1t9pfVc=",
+        "narHash": "sha256-sodYdqg0V4ujYO13KRIW6ssdDWtgobcuG+XIz2G6ZbE=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "521e91e1c420bd5c94c35908181dbba81e58dd0f",
+        "rev": "188537efb32d02081c1821cb5b48fbcf59230732",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1651134098,
+        "lastModified": 1651220524,
-        "narHash": "sha256-ZtZYlLtbjrwBi9tySbQv5nvZGLB/JdLNJxrw77KHM9E=",
+        "narHash": "sha256-0IVRT6zLz0bOznPW3yoNnH25KccbMKtf0oq7OShZqJk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "f8da4440735486e194b704c34ad70e1372a6117d",
+        "rev": "1ea480d759c293743d56a6963ea07b8a56542ac7",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -332,11 +332,14 @@ in
       plugins = with pkgs.vimPlugins; [
         completion-nvim
         /* copilot-vim */
+        cmp-nvim-lsp
+        cmp-path
+        cmp-treesitter
         gitlinker-nvim
         gitsigns-nvim
         gruvbox-nvim
-        lightspeed-nvim
         lualine-nvim
+        nvim-cmp
         nvim-lspconfig
         nvim-tree-lua
         nvim-treesitter

home/nvim/lua/init.lua

@@ -113,18 +113,69 @@ vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<C
 vim.api.nvim_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 vim.api.nvim_set_keymap("n", "<space>", "za", { silent = true, noremap = true })
 
-require("lspconfig").ansiblels.setup({
+-------------------------------------------------------------------------------
+-- packer {{{1 -------------------------------------------------------------------
+-------------------------------------------------------------------------------
+require("packer").startup(function()
+	-- use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) 
+end)
+
+-------------------------------------------------------------------------------
+-- lsp {{{1 -------------------------------------------------------------------
+-------------------------------------------------------------------------------
+
+require'cmp'.setup {
+  sources = {
+    { name = 'nvim_lsp' },
+    { name = 'path' },
+    { name = 'treesitter' },
+  }
+}
+
+local lspconfig = require "lspconfig"
+
+local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+lspconfig.ansiblels.setup({
+  capabilities = capabilities,
   cmd = {os.getenv("HOME") .. "/.npm-packages/bin/ansible-language-server", "--stdio"};
 })
-require("lspconfig").bashls.setup({})
+
-require("lspconfig").gopls.setup({})
+lspconfig.bashls.setup({
-require("lspconfig").pyright.setup({})
+  capabilities = capabilities,
-require("lspconfig").rls.setup({})
+})
-require("lspconfig").rnix.setup({})
+
-require("lspconfig").solargraph.setup({})
+lspconfig.gopls.setup({
-require("lspconfig").terraformls.setup({})
+  capabilities = capabilities,
-require("lspconfig").tflint.setup({})
+})
-require("lspconfig").yamlls.setup({})
+
+lspconfig.pyright.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.rls.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.rnix.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.solargraph.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.terraformls.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.tflint.setup({
+  capabilities = capabilities,
+})
+
+lspconfig.yamlls.setup({
+  capabilities = capabilities,
+})
 
 vim.cmd([[autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()]])
 vim.cmd([[autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync()]])
@@ -132,14 +183,6 @@ vim.cmd([[autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync()]])
 vim.cmd([[autocmd BufWritePre *.rb lua vim.lsp.buf.formatting_sync()]])
 vim.cmd([[autocmd BufWritePre *.nix lua vim.lsp.buf.formatting_sync()]])
 
--------------------------------------------------------------------------------
--- packer {{{1 -------------------------------------------------------------------
--------------------------------------------------------------------------------
-require("packer").startup(function()
-	use({ "ms-jpq/coq_nvim", branch = "coq" }) -- main one
-	use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) -- 9000+ Snippets
-end)
-
 -------------------------------------------------------------------------------
 -- Plugins {{{1 ---------------------------------------------------------------
 -------------------------------------------------------------------------------