fix nixosModule warning

This commit is contained in:
Sean Buckley 2022-06-14 22:52:14 -04:00
parent 70217a022f
commit 621c26fd90

View file

@ -27,12 +27,11 @@
}; };
}; };
in mods =
{ {
lib = { inherit forAllSystems hardware deploy; }; inherit pins;
pkgs.nixpkgs.overlays = [ (_: mypkgs) ];
nixosModules = } //
{ inherit pins; } //
nixpkgs.lib.mapAttrs' nixpkgs.lib.mapAttrs'
(name: type: { (name: type: {
name = nixpkgs.lib.removeSuffix ".nix" name; name = nixpkgs.lib.removeSuffix ".nix" name;
@ -40,15 +39,14 @@
}) })
(builtins.readDir ./modules); (builtins.readDir ./modules);
nixosModule = { in
imports = builtins.attrValues self.nixosModules; {
nixpkgs.overlays = [ lib = { inherit forAllSystems hardware deploy; };
(_: mypkgs)
]; nixosModules = mods // { default.imports = builtins.attrValues mods; };
};
nixosConfigurations = nixosConfigurations =
import ./hosts nixpkgs hardware self.nixosModule; import ./hosts nixpkgs hardware self.nixosModules.default;
apps = forAllSystems (system: apps = forAllSystems (system:
import lib/apps.nix nixpkgs.legacyPackages.${system}); import lib/apps.nix nixpkgs.legacyPackages.${system});