lib: remove usages of flip

Makes the code more consistent to read.
Usage in 9 places is rather inconsistent style.

lib/clanTest/flake-module.nix

@@ -26,7 +26,6 @@ in
 
       inherit (lib)
         filterAttrs
-        flip
         hasPrefix
         intersectAttrs
         mapAttrs'
@@ -58,16 +57,14 @@ in
       clanFlakeResult =
         if config.clan.test.fromFlake != null then importFlake config.clan.test.fromFlake else config.clan;
 
-      machineModules' = flip filterAttrs clanFlakeResult.nixosModules (
+      machineModules' = filterAttrs (
         name: _module: hasPrefix "clan-machine-" name
-      );
+      ) clanFlakeResult.nixosModules;
 
-      machineModules = flip mapAttrs' machineModules' (
-        name: machineModule: {
-          name = removePrefix "clan-machine-" name;
-          value = machineModule;
-        }
-      );
+      machineModules = mapAttrs' (name: machineModule: {
+        name = removePrefix "clan-machine-" name;
+        value = machineModule;
+      }) machineModules';
 
       machinesCross = lib.genAttrs [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ] (
         system:

lib/flakes.nix

@@ -23,7 +23,7 @@
         // {
           nodes =
             flakeLock.nodes
-            // (lib.flip lib.mapAttrs flakeInputs (
+            // (lib.mapAttrs (
               name: _:
               # remove follows and let 'nix flake lock' re-compute it later
               # (lib.removeAttrs flakeLock.nodes.${name} ["inputs"])
@@ -38,7 +38,7 @@
                   type = "path";
                 };
               }
-            ));
+            ) flakeInputs);
         };
       lockAttrs = inputsToPaths flakeLock;
     in

lib/modules/clan/module.nix

@@ -8,7 +8,6 @@
 }:
 let
   inherit (lib)
-    flip
     mapAttrs'
     ;
 
@@ -77,19 +76,15 @@ let
     config.outputs.moduleForMachine
   );
 
-  nixosModules = flip mapAttrs' nixosModules' (
-    name: machineModule: {
-      name = "clan-machine-${name}";
-      value = machineModule;
-    }
-  );
+  nixosModules = mapAttrs' (name: machineModule: {
+    name = "clan-machine-${name}";
+    value = machineModule;
+  }) nixosModules';
 
-  darwinModules = flip mapAttrs' darwinModules' (
-    name: machineModule: {
-      name = "clan-machine-${name}";
-      value = machineModule;
-    }
-  );
+  darwinModules = mapAttrs' (name: machineModule: {
+    name = "clan-machine-${name}";
+    value = machineModule;
+  }) darwinModules';
 
   nixosConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "nixos") configurations;
   darwinConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "darwin") configurations;

lib/modules/inventory/distributed-service/inventory-adapter.nix

@@ -159,6 +159,7 @@ in
       inherit
         servicesEval
         importedModuleWithInstances
+        # Exposed for testing
         grouped
         allMachines
         importedModulesEvaluated