diff --git a/modules/common/neovim/config/lsp.nix b/modules/common/neovim/config/lsp.nix
index 167ed09..c75c443 100644
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@@ -88,7 +88,7 @@
         rust = [ "rustfmt" ];
         sh = [ "shfmt" ];
         terraform = if config.terraform then [ "terraform_fmt" ] else [ ];
-        hcl = if config.terraform then [ "terraform_fmt" ] else [ ];
+        hcl = [ "hcl" ];
       };
       formatters = {
         lua.command = "${pkgs.stylua}/bin/stylua";
@@ -105,6 +105,7 @@
           ];
         };
         terraform_fmt.command = if config.terraform then "${pkgs.terraform}/bin/terraform" else "";
+        hcl.command = "${pkgs.hclfmt}/bin/hclfmt";
       };
     };
 
diff --git a/modules/common/neovim/lua/settings.lua b/modules/common/neovim/lua/settings.lua
index 50448f1..fc19816 100644
--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@@ -20,7 +20,7 @@ vim.api.nvim_create_autocmd("FileType", {
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "markdown",
     callback = function()
-        vim.o.formatoptions = vim.o.formatopions + "a"
+        vim.o.formatoptions = vim.o.formatoptions .. "a"
     end,
 })