Builder is working, kinda

flake.nix

@@ -28,24 +28,28 @@
           ...
         }:
         let
-            lib' = import ./lib { inherit (pkgs) lib; };
+          lib' = import ./lib.nix {
+            inherit (inputs.nix2container.packages.${system}) nix2container;
+            inherit (pkgs) lib;
+          };
         in
         {
           _module.args = {
             pkgs = import nixpkgs {
-                inherit system;
-                config.allowUnfree = true;
+              inherit system;
+              config.allowUnfree = true;
+              lib = lib';
             };
-            lib = lib';
           };
           packages =
             let
               inherit (pkgs) callPackage;
-              name = n: "registry.thehellings.com/greg/ci-images/${n}";
+              name = n: "src.thehellings.com/greg/${n}";
             in
             {
+              base = lib'.baseImage pkgs;
               bitwarden = callPackage ./img/bitwarden.nix { inherit name; };
-              builder = callPackage ./img/builder.nix { inherit name; };
+              builder = callPackage ./img/builder.nix { inherit name lib'; };
               immich = callPackage ./img/immich.nix { inherit name; };
               sword-container-builder = callPackage ./img/sword-container-builder.nix { inherit name; };
               vm-test = callPackage ./img/vm-test.nix { inherit name; };