diff --git a/modules/common/neovim/lua/settings.lua b/modules/common/neovim/lua/settings.lua
index dd5e34d..50448f1 100644
--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@@ -11,8 +11,22 @@ vim.filetype.add({
 })
 
 vim.api.nvim_create_autocmd("FileType", {
-    pattern = "*.eml",
+    pattern = "mail",
     callback = function()
         vim.o.wrapmargin = 79 -- Wrap text automatically
     end,
 })
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "markdown",
+    callback = function()
+        vim.o.formatoptions = vim.o.formatopions + "a"
+    end,
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "terraform",
+    callback = function()
+        vim.bo.commentstring = "# %s"
+    end,
+})