mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
fix nixosModule warning
This commit is contained in:
parent
70217a022f
commit
621c26fd90
1 changed files with 11 additions and 13 deletions
22
flake.nix
22
flake.nix
|
@ -27,12 +27,11 @@
|
|||
};
|
||||
};
|
||||
|
||||
in
|
||||
mods =
|
||||
{
|
||||
lib = { inherit forAllSystems hardware deploy; };
|
||||
|
||||
nixosModules =
|
||||
{ inherit pins; } //
|
||||
inherit pins;
|
||||
pkgs.nixpkgs.overlays = [ (_: mypkgs) ];
|
||||
} //
|
||||
nixpkgs.lib.mapAttrs'
|
||||
(name: type: {
|
||||
name = nixpkgs.lib.removeSuffix ".nix" name;
|
||||
|
@ -40,15 +39,14 @@
|
|||
})
|
||||
(builtins.readDir ./modules);
|
||||
|
||||
nixosModule = {
|
||||
imports = builtins.attrValues self.nixosModules;
|
||||
nixpkgs.overlays = [
|
||||
(_: mypkgs)
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
lib = { inherit forAllSystems hardware deploy; };
|
||||
|
||||
nixosModules = mods // { default.imports = builtins.attrValues mods; };
|
||||
|
||||
nixosConfigurations =
|
||||
import ./hosts nixpkgs hardware self.nixosModule;
|
||||
import ./hosts nixpkgs hardware self.nixosModules.default;
|
||||
|
||||
apps = forAllSystems (system:
|
||||
import lib/apps.nix nixpkgs.legacyPackages.${system});
|
||||
|
|
Loading…
Reference in a new issue