From 92700888b7a0089fb21a2d2c5cfe5a3f18f01f48 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Fri, 26 Mar 2021 08:38:42 -0700 Subject: [PATCH] flake: update to use mkSuites and mkHosts --- flake.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 6c6e0a7..2af7520 100644 --- a/flake.nix +++ b/flake.nix @@ -40,15 +40,19 @@ inherit extern overrides; }; + suites = os.mkSuites { + suites = import ./suites; + users = os.mkProfileAttrs "${self}/users"; + profiles = os.mkProfileAttrs "${self}/profiles"; + userProfiles = os.mkProfileAttrs "${self}/users/profiles"; + }; + outputs = { - nixosConfigurations = - import ./hosts (nixos.lib.recursiveUpdate inputs { - inherit multiPkgs extern; - defaultSystem = "x86_64-linux"; - lib = nixos.lib.extend (final: prev: { - dev = self.lib; - }); - }); + nixosConfigurations = os.mkHosts { + dir = "${self}/hosts"; + overrides = import ./overrides; + inherit multiPkgs suites extern; + }; homeConfigurations = os.mkHomeConfigurations;