diff --git a/.config/nvim/lua/plugins/lsp/null-ls.lua b/.config/nvim/lua/plugins/lsp/null-ls.lua
index 67d5566..e51be85 100644
--- a/.config/nvim/lua/plugins/lsp/null-ls.lua
+++ b/.config/nvim/lua/plugins/lsp/null-ls.lua
@@ -8,15 +8,24 @@ local formatting = null_ls.builtins.formatting
 -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
 local diagnostics = null_ls.builtins.diagnostics
 
+local revive_conf = vim.fn.findfile(os.getenv("HOME") .. "/.revive.toml")
+local revive_args = { "-formatter", "json", "./..." }
+if revive_conf then
+	revive_args = { "-formatter", "json", "-config", revive_conf, "./..." }
+end
+
 null_ls.setup({
 	debug = false,
 	sources = {
-		formatting.black.with({ extra_args = { "--fast" } }),
+		formatting.black.with({
+			extra_args = { "--fast" },
+		}),
 		formatting.stylua,
 		formatting.prettier,
-		-- diagnostics.golangci_lint.with({ extra_args = { "--fast" } }),
-		diagnostics.cfn_lint,
 		diagnostics.hadolint,
 		diagnostics.markdownlint,
+		diagnostics.revive.with({
+			args = revive_args,
+		}),
 	},
 })
diff --git a/.revive.toml b/.revive.toml
new file mode 100644
index 0000000..0a3b81b
--- /dev/null
+++ b/.revive.toml
@@ -0,0 +1,32 @@
+ignoreGeneratedHeader = false
+severity = "warning"
+confidence = 0.8
+errorCode = 0
+warningCode = 0
+
+[rule.blank-imports]
+[rule.context-as-argument]
+[rule.context-keys-type]
+[rule.dot-imports]
+[rule.error-return]
+[rule.error-strings]
+[rule.error-naming]
+[rule.exported]
+    Disabled = true
+[rule.if-return]
+[rule.increment-decrement]
+[rule.var-naming]
+[rule.var-declaration]
+[rule.package-comments]
+    Disabled = true
+[rule.range]
+[rule.receiver-naming]
+[rule.time-naming]
+[rule.unexported-return]
+[rule.indent-error-flow]
+[rule.errorf]
+[rule.empty-block]
+[rule.superfluous-else]
+[rule.unused-parameter]
+[rule.unreachable-code]
+[rule.redefines-builtin-id]