diff --git a/doc/installation.xml b/doc/installation.xml
index 4c5d1f73..3e1f75ab 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -313,5 +313,22 @@ home-manager.useUserPackages = true;
value in the future.
+
+
+
+ By default, Home Manager uses a private pkgs instance
+ that is configured via the options.
+ To instead use the global pkgs that is configured via
+ the system level options, set
+
+
+home-manager.useGlobalPkgs = true;
+
+
+ This saves an extra Nixpkgs evaluation, adds consistency, and removes the
+ dependency on NIX_PATH, which is otherwise used for
+ importing Nixpkgs.
+
+
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index ce6105d4..12d02174 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -10,11 +10,12 @@ let
hmModule = types.submoduleWith {
specialArgs = { lib = extendedLib; };
- modules = [(
- {name, ...}: {
+ modules = [
+ ({ name, ... }: {
imports = import ../modules/modules.nix {
inherit pkgs;
lib = extendedLib;
+ useNixpkgsModule = !cfg.useGlobalPkgs;
};
config = {
@@ -24,8 +25,8 @@ let
home.username = config.users.users.${name}.name;
home.homeDirectory = config.users.users.${name}.home;
};
- }
- )];
+ })
+ ];
};
in
@@ -38,6 +39,24 @@ in
option.
'';
+ useGlobalPkgs = mkEnableOption ''
+ using the system configuration's pkgs
+ argument in Home Manager. This disables the Home Manager
+ options
+ '';
+
+ backupFileExtension = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "backup";
+ description = ''
+ On activation move existing files by appending the given
+ file extension rather than exiting with an error.
+ '';
+ };
+
+ verbose = mkEnableOption "verbose output on activation";
+
users = mkOption {
type = types.attrsOf hmModule;
default = {};
@@ -77,7 +96,12 @@ in
system.activationScripts.postActivation.text =
concatStringsSep "\n" (mapAttrsToList (username: usercfg: ''
echo Activating home-manager configuration for ${username}
- sudo -u ${username} -i ${usercfg.home.activationPackage}/activate
+ sudo -u ${username} -i ${pkgs.writeShellScript "activation-${username}" ''
+ ${lib.optionalString (cfg.backupFileExtension != null)
+ "export HOME_MANAGER_BACKUP_EXT=${lib.escapeShellArg cfg.backupFileExtension}"}
+ ${lib.optionalString cfg.verbose "export VERBOSE=1"}
+ exec ${usercfg.home.activationPackage}/activate
+ ''}
'') cfg.users);
};
}