From 066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 3 Feb 2025 16:19:46 -0300 Subject: [PATCH] flake-module: rename `homeModules` to `homeManagerModules` (#6392) --- docs/manual/nix-flakes/flake-parts.md | 6 +++--- flake-module.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md index b314bef3c..6b05c77f2 100644 --- a/docs/manual/nix-flakes/flake-parts.md +++ b/docs/manual/nix-flakes/flake-parts.md @@ -22,7 +22,7 @@ you may wish to import Home Manager's flake module, inputs.home-manager.flakeModules.home-manager ]; flake = { - # Define `homeModules`, `homeConfigurations`, + # Define `homeManagerModules`, `homeConfigurations`, # `nixosConfigurations`, etc here }; # See flake.parts for more features, such as `perSystem` @@ -30,10 +30,10 @@ you may wish to import Home Manager's flake module, } ``` -The flake module defines the `flake.homeModules` and `flake.homeConfigurations` +The flake module defines the `flake.homeManagerModules` and `flake.homeConfigurations` options, allowing them to be properly merged if they are defined in multiple modules. -If you are only defining `homeModules` and/or `homeConfigurations` once in a +If you are only defining `homeManagerModules` and/or `homeConfigurations` once in a single module, flake-parts should work fine without importing `flakeModules.home-manager`. diff --git a/flake-module.nix b/flake-module.nix index cf421f9b1..c1b07ad0c 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -14,11 +14,11 @@ in { that you can reference them in this or another flake's `homeConfigurations`. ''; }; - homeModules = mkOption { + homeManagerModules = mkOption { type = types.lazyAttrsOf types.unspecified; default = { }; apply = mapAttrs (k: v: { - _file = "${toString moduleLocation}#homeModules.${k}"; + _file = "${toString moduleLocation}#homeManagerModules.${k}"; imports = [ v ]; }); description = ''