flake: add nixf-diagnose to treefmt config

Checks nixd's diagnostic lints using libnixf.

flake/dev/devshell.nix

@@ -8,7 +8,6 @@
     {
       pkgs,
       config,
-      self',
       system,
       ...
     }:

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"
+          ];
         };
       };
 

flake/overlays.nix

@@ -2,12 +2,7 @@
 {
   imports = [ inputs.flake-parts.flakeModules.easyOverlay ];
   perSystem =
-    {
-      config,
-      pkgs,
-      final,
-      ...
-    }:
+    { config, ... }:
     {
       overlayAttrs = {
         nixvim = {

flake/wrappers.nix

@@ -5,7 +5,7 @@
 }:
 {
   perSystem =
-    { system, pkgs, ... }:
+    { system, ... }:
     {
       _module.args = {
         makeNixvimWithModule = import ../wrappers/standalone.nix {

modules/highlights.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 {
   options = {
     highlight = lib.mkOption {

plugins/by-name/barbar/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  options,
-  ...
-}:
+{ config, lib, ... }:
 with lib;
 let
   inherit (lib.nixvim)

plugins/by-name/bufferline/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  options,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules;

plugins/by-name/commentary/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "commentary";
   package = "vim-commentary";

plugins/by-name/copilot-lua/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;

plugins/by-name/coq-thirdparty/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...

plugins/by-name/diffview/default.nix

@@ -3,7 +3,6 @@
   helpers,
   config,
   pkgs,
-  options,
   ...
 }:
 with lib;

plugins/by-name/endwise/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "endwise";
   package = "vim-endwise";

plugins/by-name/firenvim/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  config,
-  options,
-  ...
-}:
+{ lib, config, ... }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) defaultNullOpts;

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;

plugins/by-name/helm/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "helm";
   package = "vim-helm";

plugins/by-name/hunk/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  config,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "hunk";
   package = "hunk-nvim";

plugins/by-name/idris2/default.nix

@@ -1,8 +1,4 @@
-{
-  helpers,
-  lib,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "idris2";
   package = "idris2-nvim";

plugins/by-name/lsp-lines/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 with lib;
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "lsp-lines";

plugins/by-name/lualine/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 let
   inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules;
   inherit (lib) types;

plugins/by-name/nix/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "nix";
   package = "vim-nix";

plugins/by-name/preview/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
-with lib;
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "preview";
   package = "Preview-nvim";
@@ -11,5 +6,5 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   hasSettings = false;
 
-  maintainers = [ maintainers.GaetanLepage ];
+  maintainers = [ lib.maintainers.GaetanLepage ];
 }

plugins/by-name/rest/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 let
   inherit (lib) mkRemovedOptionModule types;
   inherit (lib.nixvim) defaultNullOpts;

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 = {

plugins/by-name/rustaceanvim/settings-options.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  pkgs,
-}:
+{ lib, helpers }:
 with lib;
 {
   tools =

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";

plugins/by-name/timerly/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "timerly";
   package = "timerly";

plugins/by-name/treesitter-refactor/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...

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.";

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";

plugins/by-name/vim-surround/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  helpers,
-  ...
-}:
+{ lib, ... }:
 lib.nixvim.plugins.mkVimPlugin {
   name = "vim-surround";
   package = "vim-surround";

plugins/by-name/vimtex/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  pkgs,
-  ...
-}:
+{ lib, pkgs, ... }:
 with lib;
 lib.nixvim.plugins.mkVimPlugin {
   name = "vimtex";

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 ];
 }

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";

plugins/cmp/sources/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  helpers,
-  pkgs,
-  ...
-}@args:
+{ lib, pkgs, ... }:
 let
 
   # A list of most cmp source plugins, passed to mkCmpSourcePlugin.
@@ -183,7 +178,9 @@ let
     }
   ];
 
-  mkCmpSourcePlugin = import ./_mk-cmp-plugin.nix args;
+  mkCmpSourcePlugin = import ./_mk-cmp-plugin.nix {
+    inherit lib pkgs;
+  };
   pluginModules = builtins.map mkCmpSourcePlugin sources;
 in
 {

tests/extra-args.nix

@@ -12,7 +12,7 @@ let
     };
   generated = makeNixvimWithModule {
     module =
-      { regularArg, extraModule, ... }:
+      { extraModule, ... }:
       {
         _module.args = {
           regularArg = "regularValue";

tests/main.nix

@@ -4,8 +4,6 @@
   lib ? pkgs.lib,
   linkFarm,
   pkgs,
-  self,
-  system,
   pkgsForTest,
 }:
 let

tests/test-sources/modules/dependencies.nix

@@ -27,12 +27,7 @@ in
     };
 
   all =
-    {
-      lib,
-      pkgs,
-      options,
-      ...
-    }:
+    { lib, options, ... }:
     let
       enableDep = depName: depOption: {
         enable = isDepEnabled depName depOption.package.default;

tests/test-sources/plugins/pluginmanagers/lz-n.nix

@@ -64,7 +64,7 @@ in
     };
 
   example-multiple-plugin =
-    { pkgs, lib, ... }:
+    { pkgs, ... }:
     {
       extraPlugins =
         with pkgs.vimPlugins;