extendedLib: attrsets.concatAttrs -> lib.mergeAttrsList

home/programs/ssh/pvv.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, extendedLib, ... }:
+{ pkgs, lib, ... }:
 let
   adminUser = "root";
   normalUser = "oysteikt";
@@ -88,16 +88,17 @@ let
     machines: pipe machines pipeline;
 in
   {
-    programs.ssh.matchBlocks = (extendedLib.attrsets.concatAttrs [
+    programs.ssh.matchBlocks = lib.mergeAttrsList [
       (convertMachinesWith convertNormalMachine normalMachines)
       (convertMachinesWith convertAdminMachine rootMachines)
-    ]) // {
-      "pvv-git git.pvv.ntnu.no" = {
-        hostname = "git.pvv.ntnu.no";
-        user = "gitea";
-        addressFamily = "inet";
-        port = 2222;
-        proxyJump = "pvv";
-      };
-    };
+      {
+        "pvv-git git.pvv.ntnu.no" = {
+          hostname = "git.pvv.ntnu.no";
+          user = "gitea";
+          addressFamily = "inet";
+          port = 2222;
+          proxyJump = "pvv";
+        };
+      }
+    ];
   }

lib/attrsets.nix

@@ -7,9 +7,6 @@ in rec {
   mapToAttrsWithConst = constant: items:
     listToAttrs (map (name: nameValuePair name constant) items);
 
-  # [AttrSet] -> AttrSet
-  concatAttrs = foldr (a: b: a // b) {};
-
   # (Int -> String -> a -> a) -> AttrSet -> AttrSet
   imap0Attrs = f: set:
     listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));