diff --git a/modules/capabilities/neovim/default.nix b/modules/capabilities/neovim/default.nix
index ea75ac8..9652253 100644
--- a/modules/capabilities/neovim/default.nix
+++ b/modules/capabilities/neovim/default.nix
@@ -48,6 +48,8 @@ in
           wl-clipboard
           # LSPs & Formatters
           stylua
+          taplo
+          yamlfmt
           lua-language-server
           nixd
           nix-doc
diff --git a/modules/capabilities/neovim/lua-config/lua/plugins/formatting.lua b/modules/capabilities/neovim/lua-config/lua/plugins/formatting.lua
index 14d6948..c7388c1 100644
--- a/modules/capabilities/neovim/lua-config/lua/plugins/formatting.lua
+++ b/modules/capabilities/neovim/lua-config/lua/plugins/formatting.lua
@@ -30,6 +30,8 @@ require("lz.n").load({
         formatters_by_ft = {
           lua = { "stylua" },
           python = { "ruff_fix", "ruff_format", "ruff_organize_imports" },
+          toml = { "taplo" },
+          yaml = { "yamlfmt" },
         },
         formatters = {
           stylua = {