mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-11-09 18:47:02 +00:00
fix nixosModule warning
This commit is contained in:
parent
70217a022f
commit
621c26fd90
1 changed files with 11 additions and 13 deletions
24
flake.nix
24
flake.nix
|
@ -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});
|
||||||
|
|
Loading…
Reference in a new issue