nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Migrate to nilla #11

Merged
nrabulinski merged 32 commits from experiments/nilla into main 2025-06-02 19:34:49 +02:00
Conversation 0 Commits 32 Files changed 50 +11 -29
1 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cde0371741 - Show all commits

40
hosts/default.nix
View file

@ -26,28 +26,14 @@ in
settei = inputs.self;
};
};
baseNixos = inputs.nixpkgs.lib.nixosSystem {
modules = [
config.nixosModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
};
baseDarwin = inputs.darwin.lib.darwinSystem {
modules = [
config.darwinModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
};
in
{
nixos =
name: module:
baseNixos.extendModules {
inputs.nixpkgs.lib.nixosSystem {
modules = [
config.nixosModules.combined
sharedOptions
module
config.extraHostConfigs.${name} or { }
];
@ -56,18 +42,14 @@ in
darwin =
name: module:
let
eval = baseDarwin._module.args.extendModules {
modules = [
module
config.extraHostConfigs.${name} or { }
];
specialArgs.configurationName = name;
};
in
eval
// {
system = eval.config.system.build.toplevel;
inputs.darwin.lib.darwinSystem {
modules = [
config.darwinModules.combined
sharedOptions
module
config.extraHostConfigs.${name} or { }
];
specialArgs.configurationName = name;
};
};
}