diff --git a/config/nvim/lua/nifoc/config/null_ls.lua b/config/nvim/lua/nifoc/config/null_ls.lua
index 7d1b630..902c324 100644
--- a/config/nvim/lua/nifoc/config/null_ls.lua
+++ b/config/nvim/lua/nifoc/config/null_ls.lua
@@ -4,11 +4,17 @@ local diagnostic_utils = require('nifoc.utils.diagnostic')
 
 null_ls.setup({
   sources = {
-    builtins.diagnostics.credo,
     builtins.formatting.fish_indent,
+    builtins.formatting.shfmt.with({extra_args = { '-i', '2' }}),
+
+    builtins.diagnostics.ansiblelint,
+    builtins.diagnostics.credo,
     builtins.diagnostics.hadolint,
     builtins.diagnostics.shellcheck.with({extra_args = { '-f', 'gcc', '-x' }}),
-    builtins.formatting.shfmt.with({extra_args = { '-i', '2' }}),
+    builtins.diagnostics.statix,
+
+    builtins.code_actions.shellcheck,
+    builtins.code_actions.statix,
   },
 
   on_attach = function(client, bufnr)
diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix
index 3aebb76..3e893de 100644
--- a/programs/nvim/default.nix
+++ b/programs/nvim/default.nix
@@ -31,9 +31,11 @@ in
       taplo-lsp
 
       # LSP Tools
+      ansible-lint
       hadolint
       shellcheck
       shfmt
+      statix
     ];
 
     plugins = with customPlugins; [