diff --git a/after/plugin/conform.lua b/after/plugin/conform.lua
index 6c47234..1093311 100644
--- a/after/plugin/conform.lua
+++ b/after/plugin/conform.lua
@@ -2,10 +2,17 @@ local conform = require "conform"
 
 conform.setup {
   formatters_by_ft = {
-    rst = { "rstfmt" },
+    bash = { "shellcheck" },
+    javascript = { { "prettierd", "prettier" } },
+    just = { "just" },
+    lua = { "stylua" },
+    nix = { { "alejandra", "nixfmt" } },
+    php = { { "php_cs_fixer", "phpcbf" } },
+    terraform = { "terraform_fmt" },
+    yaml = { "yamlfmt" },
   },
 }
 
-conform.formatters.rstfmt = {
-  command = "rstfmt";
-}
+vim.keymap.set("n", "<leader>f", function()
+  conform.format { lsp_fallback = true, async = false, timeout_ms = 500 }
+end)
diff --git a/after/plugin/lint.lua b/after/plugin/lint.lua
new file mode 100644
index 0000000..f862107
--- /dev/null
+++ b/after/plugin/lint.lua
@@ -0,0 +1,19 @@
+local lint = require "lint"
+
+lint.linters_by_ft = {
+  dockerfile = { "hadolint" },
+  javascript = { "eslint_d" },
+  json = { "jsonlint" },
+  lua = { "luacheck" },
+  markdown = { "markdownlint" },
+  nix = { "nix" },
+  php = { "php", "phpcs", "phpstan" },
+}
+local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
+
+vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
+  group = lint_augroup,
+  callback = function()
+    lint.try_lint()
+  end,
+})
diff --git a/lua/opdavies/lsp/init.lua b/lua/opdavies/lsp/init.lua
index ea75ba3..34febb6 100644
--- a/lua/opdavies/lsp/init.lua
+++ b/lua/opdavies/lsp/init.lua
@@ -159,43 +159,3 @@ vim.diagnostic.config {
   update_in_insert = false,
   virtual_text = { spacing = 2 },
 }
-
-local conform = require "conform"
-
-conform.setup {
-  formatters_by_ft = {
-    bash = { "shellcheck" },
-    javascript = { { "prettierd", "prettier" } },
-    just = { "just" },
-    lua = { "stylua" },
-    nix = { { "alejandra", "nixfmt" } },
-    php = { { "php_cs_fixer", "phpcbf" } },
-    terraform = { "terraform_fmt" },
-    yaml = { "yamlfmt" },
-  },
-}
-
-vim.keymap.set("n", "<leader>f", function()
-  conform.format { lsp_fallback = true, async = false, timeout_ms = 500 }
-end)
-
-local lint = require "lint"
-
-lint.linters_by_ft = {
-  dockerfile = { "hadolint" },
-  javascript = { "eslint_d" },
-  json = { "jsonlint" },
-  lua = { "luacheck" },
-  markdown = { "markdownlint" },
-  nix = { "nix" },
-  php = { "php", "phpcs", "phpstan" },
-}
-
-local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true })
-
-vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
-  group = lint_augroup,
-  callback = function()
-    lint.try_lint()
-  end,
-})