diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 1278d7b6..b973f596 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -88,7 +88,7 @@
   "nvim-recorder": { "branch": "main", "commit": "daaae505862e816a7efe578e22d6f3d10cd7a2e6" },
   "nvim-scissors": { "branch": "main", "commit": "7e3f33ad7495a0d8632a690d35c74e1b38d85ba1" },
   "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" },
-  "nvim-treesitter": { "branch": "master", "commit": "5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9" },
+  "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
   "nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 6c61c4f8..0501f55c 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -47,6 +47,7 @@
     "plugins.extras.formatting.isort",
     "plugins.extras.formatting.prettier",
     "plugins.extras.formatting.rustfmt",
+    "plugins.extras.formatting.trim_newlines",
     "plugins.extras.formatting.trim_whitespace",
     "plugins.extras.lang.ansible",
     "plugins.extras.lang.bash",
diff --git a/.config/nvim/lua/plugins/extras/formatting/trim_newlines.lua b/.config/nvim/lua/plugins/extras/formatting/trim_newlines.lua
new file mode 100644
index 00000000..3a5761e0
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/formatting/trim_newlines.lua
@@ -0,0 +1,8 @@
+return {
+  "stevearc/conform.nvim",
+  opts = function(_, opts)
+    opts.formatters_by_ft["_"] = opts.formatters_by_ft["_"] or {}
+    table.insert(opts.formatters_by_ft["_"], "trim_newlines")
+    return opts
+  end,
+}