diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index 8535edf2..c1c07dc1 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -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; } diff --git a/integration-common.nix b/nixos/common.nix similarity index 95% rename from integration-common.nix rename to nixos/common.nix index ff833828..dab12059 100644 --- a/integration-common.nix +++ b/nixos/common.nix @@ -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; diff --git a/nixos/default.nix b/nixos/default.nix index 7b1af604..f8a5d642 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -11,7 +11,7 @@ let } // optionalAttrs cfg.verbose { VERBOSE = "1"; }; in { - imports = [ ../integration-common.nix ]; + imports = [ ./common.nix ]; config = mkMerge [ {