Move integration-common.nix
to nixos/common.nix
This commit is contained in:
parent
69e804839e
commit
586ac1fd58
|
@ -7,7 +7,7 @@ let
|
|||
cfg = config.home-manager;
|
||||
|
||||
in {
|
||||
imports = [ ../integration-common.nix ];
|
||||
imports = [ ../nixos/common.nix ];
|
||||
|
||||
config = mkMerge [
|
||||
{ home-manager.extraSpecialArgs.darwinConfig = config; }
|
||||
|
|
|
@ -9,17 +9,17 @@ let
|
|||
|
||||
cfg = config.home-manager;
|
||||
|
||||
extendedLib = import ./modules/lib/stdlib-extended.nix pkgs.lib;
|
||||
extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
|
||||
|
||||
hmModule' = types.submoduleWith {
|
||||
specialArgs = {
|
||||
lib = extendedLib;
|
||||
osConfig = config;
|
||||
modulesPath = builtins.toString ./modules;
|
||||
modulesPath = builtins.toString ../modules;
|
||||
} // cfg.extraSpecialArgs;
|
||||
modules = [
|
||||
({ name, ... }: {
|
||||
imports = import ./modules/modules.nix {
|
||||
imports = import ../modules/modules.nix {
|
||||
inherit pkgs;
|
||||
lib = extendedLib;
|
||||
useNixpkgsModule = !cfg.useGlobalPkgs;
|
|
@ -11,7 +11,7 @@ let
|
|||
} // optionalAttrs cfg.verbose { VERBOSE = "1"; };
|
||||
|
||||
in {
|
||||
imports = [ ../integration-common.nix ];
|
||||
imports = [ ./common.nix ];
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue