fix: add linuxModules/darwinModules in builder

This commit is contained in:
winston 2024-08-13 01:55:03 +02:00
parent 4b656a99b5
commit dfee46eef3
Signed by: winston
GPG key ID: 3786770EDBC2B481
2 changed files with 42 additions and 35 deletions

View file

@ -14,14 +14,12 @@
system = "aarch64-darwin"; system = "aarch64-darwin";
username = "winston"; username = "winston";
isGraphical = true; isGraphical = true;
extraModules = [ inputs.nekowinston-nur.darwinModules.default ];
} }
{ {
host = "futomaki"; host = "futomaki";
system = "x86_64-linux"; system = "x86_64-linux";
username = "winston"; username = "winston";
isGraphical = true; isGraphical = true;
extraModules = [ inputs.nixos-cosmic.nixosModules.default ];
} }
{ {
host = "yuba"; host = "yuba";

View file

@ -43,17 +43,22 @@ rec {
else else
throw "Unsupported system"; throw "Unsupported system";
target = ldTernary "nixosConfigurations" "darwinConfigurations"; target = ldTernary "nixosConfigurations" "darwinConfigurations";
builder = with inputs; ldTernary nixpkgs.lib.nixosSystem darwin.lib.darwinSystem; builder = ldTernary inputs.nixpkgs.lib.nixosSystem inputs.darwin.lib.darwinSystem;
module = ldTernary "nixosModules" "darwinModules"; module = ldTernary "nixosModules" "darwinModules";
hostPlatform = ldTernary "linux" "darwin"; hostPlatform = ldTernary "linux" "darwin";
linuxModules = [ inputs.nixos-cosmic.nixosModules.default ];
darwinModules = [ inputs.nekowinston-nur.darwinModules.default ];
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
inherit (pkgs) lib;
inherit (pkgs.lib) mkOption types; inherit (pkgs.lib) mkOption types;
in in
{ {
${target}."${host}" = builder { ${target}."${host}" = builder {
inherit system; inherit system;
modules = [ modules =
[
{ {
options = { options = {
dotfiles = { dotfiles = {
@ -87,7 +92,11 @@ rec {
./common/${hostPlatform} ./common/${hostPlatform}
./${host} ./${host}
inputs.home-manager.${module}.home-manager inputs.home-manager.${module}.home-manager
] ++ [ (hmCommonConfig { inherit username; }) ] ++ extraModules; (hmCommonConfig { inherit username; })
]
++ lib.optionals pkgs.stdenv.isLinux linuxModules
++ lib.optionals pkgs.stdenv.isDarwin darwinModules
++ extraModules;
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };