Stable modular build
This commit is contained in:
1 parent
e9df5d8c46
commit
d83255dc91
1 file changed
+33
-14
+33
-14
@@ -2,26 +2,45 @@
|
||||
, home-manager
|
||||
, nix-darwin
|
||||
}:
|
||||
let
|
||||
makeImports =
|
||||
{ attrs
|
||||
, home-manager-modules
|
||||
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
|
||||
++ [
|
||||
(import ./main.nix attrs)
|
||||
] ++ (if attrs.home-manager.enable then
|
||||
home-manager-modules
|
||||
else
|
||||
[ ]);
|
||||
in
|
||||
{
|
||||
makeNixOsModule = { system, configuration ? null, ... }@attrs:
|
||||
makeNixOsModule =
|
||||
{ system
|
||||
, configuration ? null
|
||||
, ...
|
||||
}@attrs:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
system = system;
|
||||
modules = (if (isNull configuration) then [ ] else [ configuration ]) ++
|
||||
(if attrs.home-manager.enable then
|
||||
[ home-manager.nixosModules.default ]
|
||||
else
|
||||
[ ]);
|
||||
modules = (makeImports {
|
||||
attrs = attrs;
|
||||
home-manager-modules = [ home-manager.nixosModules.default ];
|
||||
});
|
||||
};
|
||||
makeDarwinModule =
|
||||
{ system ? "x86_64-darwin", user, configuration ? null, ... }@attrs:
|
||||
{ system ? "x86_64-darwin"
|
||||
, user
|
||||
, configuration ? null
|
||||
, ...
|
||||
}@attrs:
|
||||
nix-darwin.lib.darwinSystem {
|
||||
modules = (import ./main.nix attrs)
|
||||
++ (if attrs.home-manager.enable then [
|
||||
home-manager.darwinModules.home-manager
|
||||
(import ./macos-home-manager.nix { user = user; })
|
||||
] else
|
||||
[ ])
|
||||
++ (if (isNull configuration) then [ configuration ] else [ ]) ++ [
|
||||
modules = (makeImports {
|
||||
attrs = attrs;
|
||||
home-manager-modules = [
|
||||
home-manager.darwinModules.home-manager
|
||||
(import ./macos-home-manager.nix { user = user; })
|
||||
];
|
||||
}) ++ [
|
||||
(import ./macos.nix {
|
||||
user = user;
|
||||
system = system;
|
||||
|
||||
Reference in new issue
Block a user