From 1a47ccf992792247a1a7c094066f463a00143e55 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sat, 30 Apr 2022 14:43:56 -0400
Subject: [PATCH] Cleanup completion

---
 common/packages.nix    |  2 +-
 home/nvim/lua/init.lua | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index 1c47d9d..c2c9a5b 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -115,7 +115,7 @@ in
         restic
 
         # infra tools
-        terraform-ls
+        /* terraform-ls */
         terraformer
         tflint
         tfsec
diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua
index 76eb1ef..1fbb295 100644
--- a/home/nvim/lua/init.lua
+++ b/home/nvim/lua/init.lua
@@ -117,7 +117,7 @@ require("packer").startup(function()
 end)
 
 -------------------------------------------------------------------------------
--- lsp {{{1 -------------------------------------------------------------------
+-- completion {{{1 -------------------------------------------------------------------
 -------------------------------------------------------------------------------
 
 local has_words_before = function()
@@ -134,8 +134,7 @@ cmp.setup {
     { name = 'path' },
     { name = 'treesitter' },
   },
-   mapping = {
-
+  mapping = {
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
@@ -157,10 +156,13 @@ cmp.setup {
         fallback()
       end
     end, { "i", "s" }),
-
-  },
+  }
 }
 
+-------------------------------------------------------------------------------
+-- lsp {{{1 -------------------------------------------------------------------
+-------------------------------------------------------------------------------
+
 local lspconfig = require "lspconfig"
 
 local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
@@ -207,6 +209,7 @@ lspconfig.solargraph.setup({
 })
 
 lspconfig.terraformls.setup({
+  filetypes={"terraform","tf","hcl"},
   capabilities = capabilities,
 })
 
@@ -218,13 +221,6 @@ 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()]])
-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()]])
-
-
 require'luasnip'.filetype_extend("go", {"go"})
 require'luasnip'.filetype_extend("ruby", {"rails"})