From e1b3e5a9c2f7e04740f7661b1a1dc7c70c4d8e36 Mon Sep 17 00:00:00 2001 From: sefidel Date: Mon, 12 Feb 2024 04:08:59 +0900 Subject: feat(flake): use lib functions to generate hydraJobs --- flake.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index d36a946..a58ba40 100644 --- a/flake.nix +++ b/flake.nix @@ -49,21 +49,15 @@ (self: super: { my = import ./lib { inherit inputs; lib = self; }; }); in { + lib = lib.my; + nixosConfigurations = import ./nixos inputs; homeConfigurations = import ./home inputs; colmena = self.lib.mkColmenaFromNixOSConfigurations self.nixosConfigurations; - lib = lib.my; - - hydraJobs = lib.mapAttrs' (name: pname: { - name = pname; - value = self.nixosConfigurations.${name}.config.system.build.toplevel; - }) (lib.genAttrs (builtins.attrNames self.nixosConfigurations) (name: "nixos-${name}")); - # // lib.mapAttrs' (name: pname: { - # name = pname; - # value = self.homeConfigurations.${name}.activationPackage; - # }) (lib.genAttrs (builtins.attrNames self.homeConfigurations) (name: "home-${name}")); + hydraJobs = self.lib.mkHydraFromNixOSConfigurations self.nixosConfigurations; + # // self.lib.mkHydraFromHomeConfigurations self.homeConfigurations; }; } -- cgit 1.4.1