flake: add nixf-diagnose to treefmt config

MattSturgeon · MattSturgeon · commit fe059cd39557 · 2025-10-01T00:42:40.000Z
Checks nixd's diagnostic lints using libnixf.
diff --git a/flake/dev/devshell.nix b/flake/dev/devshell.nix
@@ -8,7 +8,6 @@
     {
       pkgs,
       config,
-      self',
       system,
       ...
     }:
diff --git a/flake/dev/fmt.nix b/flake/dev/fmt.nix
@@ -5,7 +5,7 @@
   ];
 
   perSystem =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     {
       treefmt.config = {
         projectRootFile = "flake.nix";
@@ -15,6 +15,10 @@
           # keep-sorted start block=yes newline_separated=no
           isort.enable = true;
           keep-sorted.enable = true;
+          nixf-diagnose = {
+            enable = true;
+            priority = -1;
+          };
           nixfmt = {
             enable = true;
             package = pkgs.nixfmt-rfc-style;
@@ -30,6 +34,7 @@
           shfmt.enable = true;
           statix = {
             enable = true;
+            priority = -2;
             disabled-lints = [
               # We often use `nullable == true`
               "bool_comparison"
@@ -58,6 +63,14 @@
             "docs/gfm-alerts-to-admonitions/tests/**/*.yml"
           ];
           formatter.ruff-format.options = [ "--isolated" ];
+          formatter.nixf-diagnose.options = [
+            "--auto-fix"
+            "--ignore=sema-unused-def-lambda-witharg-formal"
+          ];
+          formatter.nixf-diagnose.excludes = [
+            # sema-unused-def-lambda-noarg-formal
+            "ci/rust-analyzer/default.nix"
+          ];
         };
       };
 
diff --git a/flake/overlays.nix b/flake/overlays.nix
@@ -2,12 +2,7 @@
 {
   imports = [ inputs.flake-parts.flakeModules.easyOverlay ];
   perSystem =
-    {
-      config,
-      pkgs,
-      final,
-      ...
-    }:
+    { config, ... }:
     {
       overlayAttrs = {
         nixvim = {
diff --git a/flake/wrappers.nix b/flake/wrappers.nix
@@ -5,7 +5,7 @@
 }:
 {
   perSystem =
-    { system, pkgs, ... }:
+    { system, ... }:
     {
       _module.args = {
         makeNixvimWithModule = import ../wrappers/standalone.nix {
diff --git a/modules/highlights.nix b/modules/highlights.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 {
   options = {
     highlight = lib.mkOption {
diff --git a/plugins/by-name/barbar/default.nix b/plugins/by-name/barbar/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  options,
-  ...
-}:
+{ config, lib, ... }:
 with lib;
 let
   inherit (lib.nixvim)
diff --git a/plugins/by-name/bufferline/default.nix b/plugins/by-name/bufferline/default.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  options,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules;
diff --git a/plugins/by-name/commentary/default.nix b/plugins/by-name/commentary/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "commentary";
   package = "vim-commentary";
diff --git a/plugins/by-name/copilot-lua/default.nix b/plugins/by-name/copilot-lua/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
diff --git a/plugins/by-name/coq-thirdparty/default.nix b/plugins/by-name/coq-thirdparty/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
diff --git a/plugins/by-name/diffview/default.nix b/plugins/by-name/diffview/default.nix
@@ -3,7 +3,6 @@
   helpers,
   config,
   pkgs,
-  options,
   ...
 }:
 with lib;
diff --git a/plugins/by-name/endwise/default.nix b/plugins/by-name/endwise/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "endwise";
   package = "vim-endwise";
diff --git a/plugins/by-name/firenvim/default.nix b/plugins/by-name/firenvim/default.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  options,
-  ...
-}:
+{ lib, config, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;
diff --git a/plugins/by-name/headlines/default.nix b/plugins/by-name/headlines/default.nix
@@ -1,16 +1,10 @@
-{
-  lib,
-  helpers,
-  config,
-  ...
-}:
-with lib;
+{ lib, config, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "headlines";
   package = "headlines-nvim";
   description = "A plugin that adds horizontal highlights for text filetypes, like markdown, orgmode, and neorg.";
 
-  maintainers = [ maintainers.GaetanLepage ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 
   settingsExample = {
     org.headline_highlights = false;
diff --git a/plugins/by-name/helm/default.nix b/plugins/by-name/helm/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "helm";
   package = "vim-helm";
diff --git a/plugins/by-name/hunk/default.nix b/plugins/by-name/hunk/default.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  config,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "hunk";
   package = "hunk-nvim";
diff --git a/plugins/by-name/idris2/default.nix b/plugins/by-name/idris2/default.nix
@@ -1,8 +1,4 @@
-{
-  helpers,
-  lib,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "idris2";
   package = "idris2-nvim";
diff --git a/plugins/by-name/lsp-lines/default.nix b/plugins/by-name/lsp-lines/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 with lib;
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "lsp-lines";
diff --git a/plugins/by-name/lualine/default.nix b/plugins/by-name/lualine/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 let
   inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules;
   inherit (lib) types;
diff --git a/plugins/by-name/nix/default.nix b/plugins/by-name/nix/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "nix";
   package = "vim-nix";
diff --git a/plugins/by-name/preview/default.nix b/plugins/by-name/preview/default.nix
@@ -1,15 +1,10 @@
-{
-  lib,
-  helpers,
-  ...
-}:
-with lib;
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "preview";
   package = "Preview-nvim";
   description = "Neovim wrapper around MD-TUI.";
 
   hasSettings = false;
 
-  maintainers = [ maintainers.GaetanLepage ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 }
diff --git a/plugins/by-name/rest/default.nix b/plugins/by-name/rest/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 let
   inherit (lib) mkRemovedOptionModule types;
   inherit (lib.nixvim) defaultNullOpts;
diff --git a/plugins/by-name/rustaceanvim/default.nix b/plugins/by-name/rustaceanvim/default.nix
@@ -2,7 +2,6 @@
   lib,
   helpers,
   config,
-  pkgs,
   ...
 }:
 with lib;
@@ -26,7 +25,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
     })
   ];
 
-  settingsOptions = import ./settings-options.nix { inherit lib helpers pkgs; };
+  settingsOptions = import ./settings-options.nix { inherit lib helpers; };
 
   settingsExample = {
     server = {
diff --git a/plugins/by-name/rustaceanvim/settings-options.nix b/plugins/by-name/rustaceanvim/settings-options.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  pkgs,
-}:
+{ lib, helpers }:
 with lib;
 {
   tools =
diff --git a/plugins/by-name/smart-splits/default.nix b/plugins/by-name/smart-splits/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "smart-splits";
   package = "smart-splits-nvim";
diff --git a/plugins/by-name/timerly/default.nix b/plugins/by-name/timerly/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "timerly";
   package = "timerly";
diff --git a/plugins/by-name/treesitter-refactor/default.nix b/plugins/by-name/treesitter-refactor/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
diff --git a/plugins/by-name/undotree/default.nix b/plugins/by-name/undotree/default.nix
@@ -1,11 +1,6 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 with lib;
-with lib.nixvim.plugins;
-mkVimPlugin {
+lib.nixvim.plugins.mkVimPlugin {
   name = "undotree";
   globalPrefix = "undotree_";
   description = "The undo history visualizer for Vim.";
diff --git a/plugins/by-name/vim-be-good/default.nix b/plugins/by-name/vim-be-good/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "vim-be-good";
   package = "vim-be-good";
diff --git a/plugins/by-name/vim-surround/default.nix b/plugins/by-name/vim-surround/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "vim-surround";
   package = "vim-surround";
diff --git a/plugins/by-name/vimtex/default.nix b/plugins/by-name/vimtex/default.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  pkgs,
-  ...
-}:
+{ lib, pkgs, ... }:
 with lib;
 lib.nixvim.plugins.mkVimPlugin {
   name = "vimtex";
diff --git a/plugins/by-name/wakatime/default.nix b/plugins/by-name/wakatime/default.nix
@@ -1,13 +1,8 @@
-{
-  lib,
-  helpers,
-  ...
-}:
-with lib;
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "wakatime";
   package = "vim-wakatime";
   description = "Vim plugin for WakaTime, a time tracking service for developers.";
 
-  maintainers = [ maintainers.GaetanLepage ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 }
diff --git a/plugins/by-name/yaml-schema-detect/default.nix b/plugins/by-name/yaml-schema-detect/default.nix
@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  options,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "yaml-schema-detect";
   package = "yaml-schema-detect-nvim";
diff --git a/plugins/cmp/sources/default.nix b/plugins/cmp/sources/default.nix
diff --git a/tests/extra-args.nix b/tests/extra-args.nix
diff --git a/tests/main.nix b/tests/main.nix
diff --git a/tests/test-sources/modules/dependencies.nix b/tests/test-sources/modules/dependencies.nix
diff --git a/tests/test-sources/plugins/pluginmanagers/lz-n.nix b/tests/test-sources/plugins/pluginmanagers/lz-n.nix

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`{`
`9`	`9`	`pkgs,`
`10`	`10`	`config,`
`11`		`- self',`
`12`	`11`	`system,`
`13`	`12`	`...`
`14`	`13`	`}:`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`imports = [ inputs.flake-parts.flakeModules.easyOverlay ];`
`4`	`4`	`perSystem =`
`5`		`- {`
`6`		`- config,`
`7`		`- pkgs,`
`8`		`- final,`
`9`		`- ...`
`10`		`- }:`
	`5`	`+ { config, ... }:`
`11`	`6`	`{`
`12`	`7`	`overlayAttrs = {`
`13`	`8`	`nixvim = {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`}:`
`6`	`6`	`{`
`7`	`7`	`perSystem =`
`8`		`- { system, pkgs, ... }:`
	`8`	`+ { system, ... }:`
`9`	`9`	`{`
`10`	`10`	`_module.args = {`
`11`	`11`	`makeNixvimWithModule = import ../wrappers/standalone.nix {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`lib,`
`3`		`- helpers,`
`4`	`3`	`config,`
`5`	`4`	`pkgs,`
`6`	`5`	`...`