refactor: rename utils to lib'

deploy/colmena.nix

@@ -5,20 +5,20 @@
 
 let
   inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
+  lib' = import ../lib { inherit lib; };
   # exclude hosts that need auto rollback (until `colmena` supports it) for
   # now, we use `deploy-rs` (which has magic rollback) for those (also see ./deploy-rs.nix)
   #
   # see <https://github.com/nix-community/colmena/issues/38>
   #     <https://github.com/nix-community/colmena/issues/344>
   hostnames = lib.filter (
-    hostname: !((utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false)
-  ) (utils.dirNames ../hosts);
+    hostname: !((lib'.hostMeta hostname).deploy.autoRollback or false)
+  ) lib'.nixosHosts;
 
   mkNode =
     hostname:
     let
-      meta = utils.hostMeta ../hosts/${hostname};
+      meta = lib'.hostMeta hostname;
       isArm = meta.system == "aarch64-linux";
     in
     {
@@ -40,13 +40,9 @@ inputs.colmena.lib.makeHive (
     meta = {
       nixpkgs = import inputs.nixpkgs { localSystem = "x86_64-linux"; };
       specialArgs = {
-        inherit inputs;
+        inherit inputs lib';
         outputs = self;
-        myUtils = utils;
-        paths = {
-          dots = ../dots;
-          hosts = ../hosts;
-        };
+        dotsPath = ../dots;
       };
     };
   }

deploy/deploy-rs.nix

@@ -5,18 +5,18 @@
 
 let
   inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
+  lib' = import ../lib { inherit lib; };
 
   # only include hosts that need auto rollback (until `colmena` supports it)
   # `colmena` is used for other hosts (see ./colmena.nix)
   hostnames = lib.filter (
-    hostname: (utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false
-  ) (utils.dirNames ../hosts);
+    hostname: (lib'.hostMeta hostname).deploy.autoRollback or false
+  ) lib'.nixosHosts;
 
   mkNode =
     hostname:
     let
-      meta = utils.hostMeta ../hosts/${hostname};
+      meta = lib'.hostMeta hostname;
     in
     {
       inherit hostname;