nixf-diagnose fixes

Author: zowoq

modules/darwin/community-builder/users.nix

@@ -541,7 +541,7 @@ let
 in
 {
   users.users = builtins.listToAttrs (
-    builtins.map (u: {
+    map (u: {
       inherit (u) name;
       value = {
         inherit (u) uid;
@@ -553,7 +553,7 @@ in
     }) users
   );
 
-  users.knownUsers = builtins.map (u: u.name) users;
+  users.knownUsers = map (u: u.name) users;
 
-  nix.settings.trusted-users = builtins.map (u: u.name) (builtins.filter (u: u.trusted) users);
+  nix.settings.trusted-users = map (u: u.name) (builtins.filter (u: u.trusted) users);
 }

modules/default.nix

@@ -18,7 +18,7 @@ let
         inherit type;
       }) onlyDirs;
 
-      nixPaths = builtins.removeAttrs (lib.mapAttrs' (
+      nixPaths = removeAttrs (lib.mapAttrs' (
         name: type:
         let
           nixName = builtins.match "(.*)\\.nix" name;
@@ -36,8 +36,7 @@ let
     in
     lib.optionalAttrs (builtins.pathExists path) (fn combined);
 
-  # deadnix: skip
-  modules = path: importDir path (lib.mapAttrs (_name: { path, type }: path));
+  modules = path: importDir path (lib.mapAttrs (_name: { path, ... }: path));
 in
 {
   flake = {

modules/nixos/backup.nix

@@ -42,7 +42,7 @@
     };
 
     services.borgbackup.jobs = builtins.listToAttrs (
-      builtins.map (backup: {
+      map (backup: {
         inherit (backup) name;
         value = {
           inherit (backup) paths startAt;
@@ -67,7 +67,7 @@
     );
 
     systemd.services = builtins.listToAttrs (
-      builtins.map (backup: {
+      map (backup: {
         name = "borgbackup-job-${backup.name}";
         value = {
           inherit (backup) after;

modules/nixos/common/users.nix

@@ -9,7 +9,7 @@ let
       userDirEntries = builtins.readDir usersDir;
       userFiles = builtins.filter onlyUserFiles (lib.attrNames userDirEntries);
     in
-    builtins.map toUserPath userFiles;
+    map toUserPath userFiles;
 in
 {
   imports = userImports;

modules/nixos/community-builder/users.nix

@@ -452,7 +452,7 @@ let
 in
 {
   users.users = builtins.listToAttrs (
-    builtins.map (u: {
+    map (u: {
       inherit (u) name;
       value = {
         isNormalUser = true;

modules/nixos/hydra.nix

@@ -72,7 +72,7 @@ in
       evaluator_max_memory_size = 4096
       evaluator_workers = 8
       max_concurrent_evals = 2
-      max_output_size = ${builtins.toString (8 * 1024 * 1024 * 1024)}
+      max_output_size = ${toString (8 * 1024 * 1024 * 1024)}
 
       github_client_id = Ov23ligaoPhIyuYCJ1pp
       github_client_secret_file = ${config.sops.secrets.hydra-github-client-secret.path}

users/lib.nix

@@ -14,8 +14,8 @@ in
     id:
     let
       chars = lib.stringToCharacters (builtins.substring 0 4 id);
-      n = builtins.map (c: lib.mod (ord c) 10) chars;
-      s = builtins.concatStringsSep "" (builtins.map builtins.toString n);
+      n = map (c: lib.mod (ord c) 10) chars;
+      s = builtins.concatStringsSep "" (map toString n);
     in
     assert builtins.stringLength id >= 4;
     assert builtins.length chars == 4;