diff --git a/.config/nvim/after/plugin/keymap.lua b/.config/nvim/after/plugin/keymap.lua
index 1727542..3cbad35 100644
--- a/.config/nvim/after/plugin/keymap.lua
+++ b/.config/nvim/after/plugin/keymap.lua
@@ -27,3 +27,6 @@ vim.keymap.set('n', '<leader>gs', vim.cmd.Git, { noremap=true, silent=true })
 -- Move highlighted
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+-- Format
+vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua
index 3f17a8e..6bce0fe 100644
--- a/.config/nvim/after/plugin/lspconfig.lua
+++ b/.config/nvim/after/plugin/lspconfig.lua
@@ -24,7 +24,6 @@ local on_attach = function(client, bufnr)
     vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
     vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
     vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-    vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
 end
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
@@ -69,6 +68,11 @@ require'lspconfig'.elixirls.setup{
         "elixir-ls"
     },
 }
+
+require'lspconfig'.terraformls.setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
 vim.opt.completeopt = {"menu", "menuone", "noselect"}
 
 -- Set up nvim-cmp.
@@ -128,6 +132,7 @@ require("null-ls").setup({
         -- JavaScript
         require("null-ls").builtins.formatting.prettier,
         require("null-ls").builtins.diagnostics.eslint_d,
+        require("null-ls").builtins.code_actions.eslint_d,
         -- Python
         require("null-ls").builtins.formatting.black.with({ extra_args = {"--fast"}}),
         require("null-ls").builtins.formatting.isort,