diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 089fa434..60c3abdd 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -15,8 +15,9 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "4063291e335e74e9ee2be04beb47d40b376312fa" },
+  "comment-box.nvim": { "branch": "main", "commit": "ca8b4c900915bc5c2ab22b93df30478b514341ba" },
   "compiler.nvim": { "branch": "main", "commit": "e7a8b34e8a48d57d50882ada13ab409a00d20471" },
-  "conform.nvim": { "branch": "master", "commit": "a4e84d56d5959dae685c5e22db202cd86b5b322b" },
+  "conform.nvim": { "branch": "master", "commit": "0e61fc88f725b4411e63b43470a397c6102534c7" },
   "crates.nvim": { "branch": "main", "commit": "6d779c7b85139d89d92a4a0bcf0afbdcf0cd961a" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "13378f67edc112bf0d043bc0c018f8923dc2198d" },
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 7b64dd04..6c61c4f8 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_whitespace",
     "plugins.extras.lang.ansible",
     "plugins.extras.lang.bash",
     "plugins.extras.lang.git",
@@ -56,6 +57,7 @@
     "plugins.extras.lang.sql",
     "plugins.extras.lang.web.html-css",
     "plugins.extras.lang.web.typescript-extended",
+    "plugins.extras.linting.cspell",
     "plugins.extras.linting.eslint-extended",
     "plugins.extras.linting.shellcheck",
     "plugins.extras.lsp.actions-preview",
@@ -68,6 +70,7 @@
     "plugins.extras.test.core",
     "plugins.extras.ui.breadcrumbs",
     "plugins.extras.ui.colorschemes.catppuccin",
+    "plugins.extras.ui.comment-box",
     "plugins.extras.ui.context",
     "plugins.extras.ui.highlight-undo",
     "plugins.extras.ui.number-toggle",
diff --git a/.config/nvim/lua/plugins/extras/formatting/rustfmt.lua b/.config/nvim/lua/plugins/extras/formatting/rustfmt.lua
index 5af05113..7c4c0528 100644
--- a/.config/nvim/lua/plugins/extras/formatting/rustfmt.lua
+++ b/.config/nvim/lua/plugins/extras/formatting/rustfmt.lua
@@ -1,10 +1,8 @@
 return {
-  {
-    "stevearc/conform.nvim",
-    opts = function(_, opts)
-      opts.formatters_by_ft.rust = opts.formatters_by_ft.rust or {}
-      table.insert(opts.formatters_by_ft.rust, "rustfmt")
-      return opts
-    end,
-  },
+  "stevearc/conform.nvim",
+  opts = function(_, opts)
+    opts.formatters_by_ft.rust = opts.formatters_by_ft.rust or {}
+    table.insert(opts.formatters_by_ft.rust, "rustfmt")
+    return opts
+  end,
 }
diff --git a/.config/nvim/lua/plugins/extras/formatting/trim_whitespace.lua b/.config/nvim/lua/plugins/extras/formatting/trim_whitespace.lua
new file mode 100644
index 00000000..8c941cc9
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/formatting/trim_whitespace.lua
@@ -0,0 +1,8 @@
+return {
+  "stevearc/conform.nvim",
+  opts = {
+    formatters_by_ft = {
+      ["_"] = { "trim_whitespace" },
+    },
+  },
+}