From 6bd007ed86bf0a743371ebdee043ad4772e226a4 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 22 Jun 2022 22:09:56 +0200
Subject: [PATCH] feat(nvim): add terraform and bash language servers

---
 home-mandlm.nix                |  3 +++
 nvim/lua/plugins/lspconfig.lua |  3 +++
 nvim/lua/plugins/nvim-cmp.lua  | 11 +++++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index 96cd2d6..213b13b 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -28,6 +28,9 @@
       # LSP
       sumneko-lua-language-server
       rnix-lsp
+      terraform-ls
+      tflint
+      nodePackages.bash-language-server
     ];
 
     stateVersion = "22.05";
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 2605b11..5b459b0 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -45,6 +45,7 @@ local capabilities = vim.tbl_extend("keep", vim.lsp.protocol.make_client_capabil
 capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
 
 local servers = {
+    ["bashls"] = {},
     ["sumneko_lua"] = {
         Lua = {
             diagnostics = {
@@ -56,6 +57,8 @@ local servers = {
         },
     },
     ["rnix"] = {},
+    ["terraformls"] = {},
+    ["tflint"] = {},
 }
 
 local lspconfig = require("lspconfig")
diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua
index 35c47ae..b08ec32 100644
--- a/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/lua/plugins/nvim-cmp.lua
@@ -11,13 +11,16 @@ local luasnip = require("luasnip")
 cmp.setup({
     snippet = {
         expand = function(args)
-            require("luasnip").lsp_expand(args.body)
+            luasnip.lsp_expand(args.body)
         end
     },
     sources = require("cmp").config.sources({
-        { name = "nvim_lsp" }, { name = "luasnip" }, { name = "path" },
-        { name = "buffer" }, { name = "git" }, { name = "nvim-lua" },
-        { name = "calc" }
+        { name = "nvim_lsp" },
+        { name = "luasnip" },
+        { name = "path" },
+        { name = "buffer" },
+        { name = "nvim-lua" },
+        { name = "calc" },
     }),
     mapping = cmp.mapping.preset.insert({
         ['<C-b>'] = cmp.mapping.scroll_docs(-4),