From 9611a50acc825e841de5eecd7d5f27ffe847cf7f Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 28 Jul 2021 14:36:41 -0400 Subject: just use tf --- lua/core/autocmds.lua | 6 +++--- lua/default-config.lua | 4 ++-- lua/plugins.lua | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lua') diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua index 9280da9e..f2399de5 100644 --- a/lua/core/autocmds.lua +++ b/lua/core/autocmds.lua @@ -36,9 +36,9 @@ lvim.autocommands = { -- { "VimLeavePre", "*", "set title set titleold=" }, }, _filetypechanges = { - { "BufWinEnter", ".tf", "setlocal filetype=hcl" }, - { "BufRead", "*.tf", "setlocal filetype=hcl" }, - { "BufNewFile", "*.tf", "setlocal filetype=hcl" }, + -- { "BufWinEnter", ".tf", "setlocal filetype=terraform" }, + -- { "BufRead", "*.tf", "setlocal filetype=terraform" }, + -- { "BufNewFile", "*.tf", "setlocal filetype=terraform" }, { "BufWinEnter", ".zsh", "setlocal filetype=sh" }, { "BufRead", "*.zsh", "setlocal filetype=sh" }, { "BufNewFile", "*.zsh", "setlocal filetype=sh" }, diff --git a/lua/default-config.lua b/lua/default-config.lua index 4b57dfde..0fc9ee4e 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -851,7 +851,7 @@ lvim.lang = { "typescriptreact", }, }, - hcl = { + tf = { formatter = { exe = "terraform_fmt", args = {}, @@ -860,7 +860,7 @@ lvim.lang = { lsp = { provider = "terraformls", setup = { - filetypes = { "terraform", "hcl", "tf" }, + filetypes = { "terraform", "tf" }, cmd = { DATA_PATH .. "/lspinstall/terraform/terraform-ls", "serve", diff --git a/lua/plugins.lua b/lua/plugins.lua index 11195acd..9555304a 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -150,7 +150,7 @@ return { config = function() vim.g.rooter_silent_chdir = 1 vim.g.rooter_patterns = { - ".git", + ".git/", "_darcs", ".hg", ".bzr", -- cgit v1.2.3