From 38b4cdc78e8c0a1f6f046f922bfd01e22c267501 Mon Sep 17 00:00:00 2001
From: Tine <tine@tjo.space>
Date: Thu, 29 Feb 2024 10:48:46 +0100
Subject: [PATCH] fix(nvim): lsp complete requires a snippet engine

---
 nix/home.nix              | 3 +++
 nvim/init.lua             | 2 ++
 nvim/lua/code_helpers.lua | 7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nix/home.nix b/nix/home.nix
index 406d3cf..58fd641 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -63,6 +63,9 @@
 
     # Lua
     stylua
+
+    # Services
+    flyctl
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/nvim/init.lua b/nvim/init.lua
index 33bd3b3..d59ca71 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -42,6 +42,8 @@ Plug("hrsh7th/cmp-path")
 Plug("hrsh7th/nvim-cmp")
 Plug("onsails/lspkind.nvim")
 Plug("folke/trouble.nvim")
+Plug("hrsh7th/vim-vsnip")
+Plug("hrsh7th/vim-vsnip-integ")
 
 vim.call("plug#end")
 
diff --git a/nvim/lua/code_helpers.lua b/nvim/lua/code_helpers.lua
index 4a26d53..aa7ccef 100644
--- a/nvim/lua/code_helpers.lua
+++ b/nvim/lua/code_helpers.lua
@@ -45,7 +45,7 @@ cmp.setup({
 	snippet = {
 		-- REQUIRED - you must specify a snippet engine
 		expand = function(args)
-			-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+			vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
 			-- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
 			-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
 			-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
@@ -137,8 +137,7 @@ require("mason-lspconfig").setup({
 		"docker_compose_language_service", -- docker-compose
 		"eslint", -- eslint
 		"elixirls", -- elixir
-		"golangci_lint_ls", -- golangci-lint
-		"gopls", -- gopls
+		"gopls", -- golang
 		"graphql", -- graphql
 		"html", -- html
 		"htmx", -- htmx
@@ -160,7 +159,7 @@ require("mason-lspconfig").setup({
 })
 
 require("mason-lspconfig").setup_handlers({
-	function(server_name) -- default handler (optional)
+	function(server_name)
 		require("lspconfig")[server_name].setup({
 			capabilities = require("cmp_nvim_lsp").default_capabilities(),
 		})