[25.05] ci/treefmt: add nixf-diagnose

.git-blame-ignore-revs

@@ -273,3 +273,8 @@ a034fb50f79816c6738fb48b48503b09ea3b0132
 # nixfmt 1.0.0
 a46262ae77e4016fe5a4a390c4a39c0c1b266428 # !autorebase nix-shell --run treefmt
 aefcb0d50d1124314429a11ed6b7aaaedf2861c5 # !autorebase nix-shell --run treefmt
+
+# nixf-diagnose
+6c1e6f90d35932355fdee300b13136a8b7ec851c # !autorebase nix-shell --run treefmt
+1c6af9ba0a9667e10ad97f53d2cff663abc290c9 # !autorebase nix-shell --run treefmt
+5cbdb94f3aa2e7de13f3c0a67899ec17427b58ce # !autorebase nix-shell --run treefmt

ci/default.nix

@@ -87,6 +87,32 @@ let
           "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
         ];
 
+        programs.nixf-diagnose.enable = true;
+        settings.formatter.nixf-diagnose = {
+          # Ensure nixfmt cleans up after nixf-diagnose.
+          priority = -1;
+          options = [
+            "--auto-fix"
+            # Rule names can currently be looked up here:
+            # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
+            # TODO: Remove the following and fix things.
+            "--ignore=sema-unused-def-lambda-noarg-formal"
+            "--ignore=sema-unused-def-lambda-witharg-arg"
+            "--ignore=sema-unused-def-lambda-witharg-formal"
+            "--ignore=sema-unused-def-let"
+            # Keep this rule, because we have `lib.or`.
+            "--ignore=or-identifier"
+          ];
+          excludes = [
+            # Auto-generated; violates sema-extra-with
+            # Can only sensibly be removed when --auto-fix supports multiple fixes at once:
+            # https://github.com/inclyc/nixf-diagnose/issues/13
+            "pkgs/servers/home-assistant/component-packages.nix"
+            # https://github.com/nix-community/nixd/issues/708
+            "nixos/maintainers/scripts/azure-new/examples/basic/system.nix"
+          ];
+        };
+
         settings.formatter.editorconfig-checker = {
           command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
           options = [ "-disable-indent-size" ];

lib/customisation.nix

@@ -385,7 +385,7 @@ rec {
       outputs = drv.outputs or [ "out" ];
 
       commonAttrs =
-        drv // (listToAttrs outputsList) // ({ all = map (x: x.value) outputsList; }) // passthru;
+        drv // (listToAttrs outputsList) // { all = map (x: x.value) outputsList; } // passthru;
 
       outputToAttrListElement = outputName: {
         name = outputName;

lib/tests/modules/functionTo/submodule-options.nix

@@ -56,8 +56,9 @@ in
       default = lib.concatStringsSep " " (
         lib.concatLists (
           lib.mapAttrsToList (k: v: if k == "_module" then [ ] else [ (lib.showOption v.loc) ]) (
-            (options.fun.type.getSubOptions [ "fun" ])
+            options.fun.type.getSubOptions [ "fun" ]
           )
+
         )
       );
     };

lib/tests/systems.nix

@@ -155,9 +155,7 @@ lib.runTests (
       "x86_64-genode"
     ];
     testredox = mseteq redox [ "x86_64-redox" ];
-    testgnu = mseteq gnu (
-      linux # ++ kfreebsd ++ ...
-    );
+    testgnu = mseteq gnu linux; # ++ kfreebsd ++ ...
     testillumos = mseteq illumos [ "x86_64-solaris" ];
     testlinux = mseteq linux [
       "aarch64-linux"

lib/types.nix

@@ -831,7 +831,7 @@ let
                 loc: defs:
                 mapAttrs (n: v: v.value) (
                   filterAttrs (n: v: v ? value) (
-                    zipAttrsWith (name: defs: (mergeDefinitions (loc ++ [ name ]) elemType (defs)).optionalValue)
+                    zipAttrsWith (name: defs: (mergeDefinitions (loc ++ [ name ]) elemType defs).optionalValue)
                       # Push down position info.
                       (pushPositions defs)
                   )

nixos/lib/eval-config.nix

@@ -129,7 +129,7 @@ let
     in
     locatedModules ++ legacyModules;
 
-  noUserModules = evalModulesMinimal ({
+  noUserModules = evalModulesMinimal {
     inherit prefix specialArgs;
     modules =
       baseModules
@@ -138,7 +138,7 @@ let
         pkgsModule
         modulesModule
       ];
-  });
+  };
 
   # Extra arguments that are useful for constructing a similar configuration.
   modulesModule = {

nixos/lib/systemd-lib.nix

@@ -361,12 +361,13 @@ rec {
     }:
     let
       typeDir =
-        ({
+        {
           system = "system";
           initrd = "system";
           user = "user";
           nspawn = "nspawn";
-        }).${type};
+        }
+        .${type};
     in
     pkgs.runCommand "${type}-units"
       {

nixos/lib/testing/network.nix

@@ -104,9 +104,10 @@ let
           optionalString (
             config.networking.primaryIPAddress != ""
           ) "${config.networking.primaryIPAddress} ${hostnames}"
-          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address} ${hostnames}"
-          )
+          + optionalString (
+            config.networking.primaryIPv6Address != ""
+          ) "${config.networking.primaryIPv6Address} ${hostnames}"
+
         );
 
         virtualisation.qemu.options = qemuOptions;

nixos/modules/config/nix-remote-build.nix

@@ -241,7 +241,7 @@ in
               Invalid machine specifications:
           ''
           + "      "
-          + (concatStringsSep "\n      " (map (m: m.hostName) (filter (badMachine) cfg.buildMachines)));
+          + (concatStringsSep "\n      " (map (m: m.hostName) (filter badMachine cfg.buildMachines)));
         }
       ];
 

nixos/modules/config/terminfo.nix

@@ -8,7 +8,7 @@
 }:
 {
 
-  options = with lib; {
+  options = {
     environment.enableAllTerminfo = lib.mkOption {
       default = false;
       type = lib.types.bool;

nixos/modules/config/xdg/terminal-exec.nix

@@ -54,9 +54,9 @@ in
       etc = lib.mapAttrs' (
         desktop: terminals:
         # map desktop name such as GNOME to `xdg/gnome-xdg-terminals.list`, default to `xdg/xdg-terminals.list`
-        lib.nameValuePair (
-          "xdg/${if desktop == "default" then "" else "${lib.toLower desktop}-"}xdg-terminals.list"
-        ) { text = lib.concatLines terminals; }
+        lib.nameValuePair "xdg/${
+          if desktop == "default" then "" else "${lib.toLower desktop}-"
+        }xdg-terminals.list" { text = lib.concatLines terminals; }
       ) cfg.settings;
     };
   };

nixos/modules/hardware/opentabletdriver.nix

@@ -54,7 +54,7 @@ in
     boot.blacklistedKernelModules = cfg.blacklistedKernelModules;
 
     systemd.user.services.opentabletdriver =
-      with pkgs;
+
       lib.mkIf cfg.daemon.enable {
         description = "Open source, cross-platform, user-mode tablet driver";
         wantedBy = [ "graphical-session.target" ];

nixos/modules/hardware/video/nvidia.nix

@@ -333,7 +333,7 @@ in
     lib.mkIf cfg.enabled (
       lib.mkMerge [
         # Common
-        ({
+        {
           assertions = [
             {
               assertion = !(nvidiaEnabled && cfg.datacenter.enable);
@@ -388,7 +388,7 @@ in
             extraPackages32 = [ nvidia_x11.lib32 ];
           };
           environment.systemPackages = [ nvidia_x11.bin ];
-        })
+        }
 
         # X11
         (lib.mkIf nvidiaEnabled {
@@ -709,7 +709,7 @@ in
                 "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
 
             services = lib.mkMerge [
-              ({
+              {
                 nvidia-fabricmanager = {
                   enable = true;
                   description = "Start NVIDIA NVLink Management";
@@ -736,7 +736,7 @@ in
                     LimitCORE = "infinity";
                   };
                 };
-              })
+              }
               (lib.mkIf cfg.nvidiaPersistenced {
                 "nvidia-persistenced" = {
                   description = "NVIDIA Persistence Daemon";

nixos/modules/i18n/input-method/default.nix

@@ -112,7 +112,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     doc = ./default.md;
   };
 

nixos/modules/i18n/input-method/fcitx5.nix

@@ -127,7 +127,7 @@ in
       ++ lib.optionals (cfg.quickPhraseFiles != { }) [
         (pkgs.linkFarm "quickPhraseFiles" (
           lib.mapAttrs' (
-            name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value
+            name: value: lib.nameValuePair "share/fcitx5/data/quickphrase.d/${name}.mb" value
           ) cfg.quickPhraseFiles
         ))
       ];

nixos/modules/installer/cd-dvd/iso-image.nix

@@ -914,7 +914,7 @@ in
       let
         cfgFiles =
           cfg:
-          lib.optionals cfg.isoImage.showConfiguration ([
+          lib.optionals cfg.isoImage.showConfiguration [
             {
               source = cfg.boot.kernelPackages.kernel + "/" + cfg.system.boot.loader.kernelFile;
               target = "/boot/" + cfg.boot.kernelPackages.kernel + "/" + cfg.system.boot.loader.kernelFile;
@@ -923,7 +923,7 @@ in
               source = cfg.system.build.initialRamdisk + "/" + cfg.system.boot.loader.initrdFile;
               target = "/boot/" + cfg.system.build.initialRamdisk + "/" + cfg.system.boot.loader.initrdFile;
             }
-          ])
+          ]
           ++ lib.concatLists (
             lib.mapAttrsToList (_: { configuration, ... }: cfgFiles configuration) cfg.specialisation
           );

nixos/modules/installer/netboot/netboot-base.nix

@@ -3,8 +3,6 @@
 
 { lib, ... }:
 
-with lib;
-
 {
   imports = [
     ./netboot.nix

nixos/modules/profiles/headless.nix

@@ -3,8 +3,6 @@
 
 { lib, ... }:
 
-with lib;
-
 {
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;

nixos/modules/profiles/nix-builder-vm.nix

@@ -208,18 +208,18 @@ in
           ''
         );
 
-        run-builder = hostPkgs.writeShellScriptBin "run-builder" (''
+        run-builder = hostPkgs.writeShellScriptBin "run-builder" ''
           set -euo pipefail
           KEYS="''${KEYS:-./keys}"
           KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}
-        '');
+        '';
 
-        script = hostPkgs.writeShellScriptBin "create-builder" (''
+        script = hostPkgs.writeShellScriptBin "create-builder" ''
           set -euo pipefail
           export KEYS="''${KEYS:-./keys}"
           ${lib.getExe add-keys}
           ${lib.getExe run-builder}
-        '');
+        '';
 
       in
       script.overrideAttrs (old: {

nixos/modules/programs/atop.nix

@@ -16,7 +16,7 @@ in
 
   options = {
 
-    programs.atop = rec {
+    programs.atop = {
 
       enable = lib.mkEnableOption "Atop, a tool for monitoring system resources";
 

nixos/modules/programs/coolercontrol.nix

@@ -29,7 +29,7 @@ in
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       # Common
-      ({
+      {
         environment.systemPackages = with pkgs.coolercontrol; [
           coolercontrol-gui
         ];
@@ -46,7 +46,7 @@ in
             coolercontrold.wantedBy = [ "multi-user.target" ];
           };
         };
-      })
+      }
 
       # Nvidia support
       (lib.mkIf cfg.nvidiaSupport {

nixos/modules/programs/firefox.nix

@@ -149,7 +149,7 @@ in
     languagePacks = lib.mkOption {
       # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/
       type = lib.types.listOf (
-        lib.types.enum ([
+        lib.types.enum [
           "ach"
           "af"
           "an"
@@ -253,7 +253,7 @@ in
           "xh"
           "zh-CN"
           "zh-TW"
-        ])
+        ]
       );
       default = [ ];
       description = ''
@@ -285,15 +285,15 @@ in
       '';
     };
 
-    nativeMessagingHosts = ({
+    nativeMessagingHosts = {
       packages = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = [ ];
         description = ''
           Additional packages containing native messaging hosts that should be made available to Firefox extensions.
         '';
       };
-    })
+    }
     // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions);
   };
 

nixos/modules/programs/gamescope.nix

@@ -78,5 +78,5 @@ in
     environment.systemPackages = lib.mkIf (!cfg.capSysNice) [ gamescope ];
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }

nixos/modules/programs/nix-required-mounts.nix

@@ -80,7 +80,7 @@ in
     '';
     allowedPatterns =
       with lib.types;
-      lib.mkOption rec {
+      lib.mkOption {
         type = attrsOf Pattern;
         description = "The hook config, describing which paths to mount for which system features";
         default = { };

nixos/modules/programs/ssh.nix

@@ -380,8 +380,8 @@ in
         ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
         ExecStart =
           "${cfg.package}/bin/ssh-agent "
-          + lib.optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ")
-          + lib.optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ")
+          + lib.optionalString (cfg.agentTimeout != null) "-t ${cfg.agentTimeout} "
+          + lib.optionalString (cfg.agentPKCS11Whitelist != null) "-P ${cfg.agentPKCS11Whitelist} "
           + "-a %t/ssh-agent";
         StandardOutput = "null";
         Type = "forking";