mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
remove nixosModules.default
This commit is contained in:
parent
da2abb03d6
commit
97cea08fbc
1 changed files with 12 additions and 14 deletions
26
flake.nix
26
flake.nix
|
@ -33,7 +33,17 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
mods =
|
in
|
||||||
|
{
|
||||||
|
formatter = forAllSystems (system:
|
||||||
|
nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
|
||||||
|
|
||||||
|
lib = {
|
||||||
|
gen-ssh-config = import lib/gen-ssh-config.nix lib;
|
||||||
|
ssh-keys = import lib/ssh-keys.nix;
|
||||||
|
};
|
||||||
|
|
||||||
|
nixosModules =
|
||||||
{
|
{
|
||||||
inherit pins;
|
inherit pins;
|
||||||
inherit (impermanence.nixosModules) impermanence;
|
inherit (impermanence.nixosModules) impermanence;
|
||||||
|
@ -46,21 +56,9 @@
|
||||||
})
|
})
|
||||||
(builtins.readDir ./modules);
|
(builtins.readDir ./modules);
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
formatter = forAllSystems (system:
|
|
||||||
nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
|
|
||||||
|
|
||||||
lib = {
|
|
||||||
gen-ssh-config = import lib/gen-ssh-config.nix lib;
|
|
||||||
ssh-keys = import lib/ssh-keys.nix;
|
|
||||||
};
|
|
||||||
|
|
||||||
nixosModules = mods // { default.imports = builtins.attrValues mods; };
|
|
||||||
|
|
||||||
nixosConfigurations = builtins.mapAttrs
|
nixosConfigurations = builtins.mapAttrs
|
||||||
(_: lib.nixosSystem)
|
(_: lib.nixosSystem)
|
||||||
(import ./hosts self.nixosModules.default);
|
(import ./hosts { imports = builtins.attrValues self.nixosModules; });
|
||||||
|
|
||||||
packages = forAllSystems (system:
|
packages = forAllSystems (system:
|
||||||
mypkgs nixpkgs.legacyPackages.${system});
|
mypkgs nixpkgs.legacyPackages.${system});
|
||||||
|
|
Loading…
Reference in a new issue