diff --git a/modules/default.nix b/modules/default.nix index 1154e63..2c099f2 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,6 @@ # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. -{ pkgs ? import { }, config ? null }: +{ pkgs ? import { }, home-manager ? import { }, config ? null }: with pkgs.lib; @@ -16,10 +16,11 @@ let rawModule = evalModules { modules = [ { + _module.args.home-manager = home-manager; _module.args.pkgs = mkDefault pkgs; } configModule - ] ++ import ./module-list.nix; + ] ++ import ./module-list.nix { inherit pkgs; }; }; failedAssertions = map (x: x.message) (filter (x: !x.assertion) rawModule.config.assertions); diff --git a/modules/home-manager.nix b/modules/home-manager.nix index b80c6b5..04d5a9b 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -1,24 +1,24 @@ # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, home-manager, ... }: with lib; let cfg = config.home-manager; - tryEval = builtins.tryEval ; + tryEval = builtins.tryEval (home-manager.path + "/modules/modules.nix"); assertionNixpkgs = types ? submoduleWith; assertionHomeManager = tryEval.success && builtins.functionArgs (import tryEval.value) ? useNixpkgsModule; assertion = assertionNixpkgs && assertionHomeManager; - extendedLib = import pkgs.lib; + extendedLib = import (home-manager.path + "/modules/lib/stdlib-extended.nix") pkgs.lib; hmModule = types.submoduleWith { specialArgs = { lib = extendedLib; }; modules = [ ({ name, ... }: { - imports = import { + imports = import (home-manager.path + "/modules/modules.nix") { inherit pkgs; lib = extendedLib; useNixpkgsModule = !cfg.useGlobalPkgs; diff --git a/modules/module-list.nix b/modules/module-list.nix index 737cc9b..082ebc5 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -1,5 +1,7 @@ # Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. +{ pkgs }: + [ ./build/activation.nix ./build/config.nix @@ -15,5 +17,5 @@ ./user.nix ./version.nix ./workaround-make.nix - + (pkgs.path + "/nixos/modules/misc/assertions.nix") ]