diff --git a/lua/lazyvim/plugins/extras/lang/toml.lua b/lua/lazyvim/plugins/extras/lang/toml.lua
new file mode 100644
index 00000000..0f164bdb
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/lang/toml.lua
@@ -0,0 +1,34 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      if type(opts.ensure_installed) == "table" then
+        vim.list_extend(opts.ensure_installed, { "toml" })
+      end
+    end,
+  },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "taplo" })
+    end,
+  },
+  {
+    "stevearc/conform.nvim",
+    opts = {
+      formatters_by_ft = {
+        toml = { "taplo" },
+      },
+    },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    ft = { "toml" },
+    opts = {
+      servers = {
+        taplo = {},
+      },
+    },
+  },
+}