foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-30 22:57:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

lib/env-builders: refactor

Browse Source
This commit is contained in:
Gabriel Arazas 2024-07-31 13:13:42 +08:00
parent 62211ef8eb
commit aeeb6a95f9
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/env-builders.nix
View File

@ -52,13 +52,13 @@ rec {
foodogsquaredUtils = import ./utils/nixos.nix { inherit lib; };
foodogsquaredModulesPath = builtins.toString nixosModules;
};
modules = extraModules ++ lib.singleton {
imports = [
nixosModules
../modules/nixos/_private
];
nixpkgs.hostPlatform = lib.mkForce system;
};
modules = extraModules ++ [
nixosModules
../modules/nixos/_private
({ lib, ... }: {
nixpkgs.hostPlatform = lib.mkForce system;
})
];
# Since we're setting it through nixpkgs.hostPlatform, we'll have to pass
# this as null.
@ -100,12 +100,11 @@ rec {
foodogsquaredModulesPath = builtins.toString homeModules;
};
configuration = { lib, ... }: {
imports = modules ++ lib.singleton {
imports = [
homeModules
../modules/home-manager/_private
];
};
imports = modules ++ [
homeModules
../modules/home-manager/_private
];
config = {
programs.home-manager.path = homeManagerSrc;
inherit (pkgs) overlays;
@ -130,11 +129,9 @@ rec {
specialArgs = specialArgs // {
foodogsquaredModulesPath = builtins.toString wrapperManagerModules;
};
modules = modules ++ lib.singleton {
imports = [
wrapperManagerModules
../modules/wrapper-manager/_private
];
};
modules = modules ++ [
wrapperManagerModules
../modules/wrapper-manager/_private
];
};
}