diff --git a/lib/default.nix b/lib/default.nix index 6a74486..dbad2e9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -89,17 +89,22 @@ let } ); formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper); - systemPaths = - (readDir ../hosts) - |> mapAttrs ( - name: _: - self.nixosConfigurations.othalan.config.environment.systemPackages - |> map (pkg: { - name = pkg.name; - value = pkg; - }) - |> listToAttrs - ); + + hydraJobs = { + systemPackages = + (readDir ../hosts) + |> mapAttrs ( + hostname: _: + self.nixosConfigurations."${hostname}".config.environment.systemPackages + |> map (drv: { + name = drv.name; + value = drv; + }) + |> listToAttrs + ); + + inherit (self) packages; + }; }; in { diff --git a/lib/generators.nix b/lib/generators.nix index ba6e2a6..af5ff1a 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -49,22 +49,6 @@ let ] ++ (selfModules ''oizys'') ++ (nixosModules ''lix-module|sops-nix'') - ++ [ - ( - { ... }: - { - nixpkgs.overlays = [ - (final: prev: { - # override what the lix-module set - # make sure attic is using this lix - nix = inputs.self.${final.system}.lix; - }) - - ]; - } - ) - - ] ++ (hostFiles hostName); specialArgs = commonSpecialArgs // { diff --git a/pkgs/oizys/src/oizys/nix.nim b/pkgs/oizys/src/oizys/nix.nim index 857c7e5..77b970d 100644 --- a/pkgs/oizys/src/oizys/nix.nim +++ b/pkgs/oizys/src/oizys/nix.nim @@ -232,7 +232,7 @@ proc missingDrvNixEvalJobs*(): HashSet[NixEvalOutput] = for host in getHosts(): let (o, _) = runCmdCaptWithSpinner( - fmt"{cmd} {getFlake()}#systemPaths.{host}", + fmt"{cmd} {getFlake()}#hydraJobs.systemPackages.{host}", bb"running [b]nix-eval-jobs[/] for system path: " & host.bb("bold") ) output.add o