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

modules: add combined output for (nixos|darwin)Modules

Browse source
This commit is contained in:
Nikodem Rabuliński 2025-02-24 12:23:47 +01:00
parent cd28907c9e
commit 033a7b4539
Signed by: nrabulinski
SSH key fingerprint: SHA256:AZZVyfKStaCo8sbJB+3Rr/CRrlym1oEgw7vMnynJeR8
2 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hosts/default.nix
View file

@ -29,30 +29,15 @@
baseNixos = inputs.nixpkgs.lib.nixosSystem { baseNixos = inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
inputs.agenix.nixosModules.age self.nixosModules.combined
inputs.disko.nixosModules.disko
inputs.mailserver.nixosModules.default
inputs.home-manager.nixosModules.home-manager
inputs.nvidia-patch.nixosModules.nvidia-patch
inputs.attic.nixosModules.atticd
inputs.lix-module.nixosModules.default
self.nixosModules.settei
sharedOptions sharedOptions
{
disabledModules = [
"services/networking/atticd.nix"
];
}
]; ];
specialArgs.configurationName = "base"; specialArgs.configurationName = "base";
}; };
baseDarwin = inputs.darwin.lib.darwinSystem { baseDarwin = inputs.darwin.lib.darwinSystem {
modules = [ modules = [
inputs.agenix.darwinModules.age self.darwinModules.combined
inputs.home-manager.darwinModules.home-manager
inputs.lix-module.nixosModules.default
self.darwinModules.settei
sharedOptions sharedOptions
]; ];
specialArgs.configurationName = "base"; specialArgs.configurationName = "base";

29
modules/default.nix
View file

@ -26,7 +26,24 @@ in
inherit (config) perInput; inherit (config) perInput;
isLinux = true; isLinux = true;
}; };
default = settei; combined = {
imports = [
settei
inputs.agenix.nixosModules.age
inputs.disko.nixosModules.disko
inputs.mailserver.nixosModules.default
inputs.home-manager.nixosModules.home-manager
inputs.nvidia-patch.nixosModules.nvidia-patch
inputs.attic.nixosModules.atticd
inputs.lix-module.nixosModules.default
{
disabledModules = [
"services/networking/atticd.nix"
];
}
];
};
default = combined;
}; };
flake.darwinModules = rec { flake.darwinModules = rec {
@ -34,6 +51,14 @@ in
inherit (config) perInput; inherit (config) perInput;
isLinux = false; isLinux = false;
}; };
default = settei; combined = {
imports = [
settei
inputs.agenix.darwinModules.age
inputs.home-manager.darwinModules.home-manager
inputs.lix-module.nixosModules.default
];
};
default = combined;
}; };
} }