From 2c87a6475fba12c9eb04ccb7375da0e32da48dc1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 8 Mar 2025 12:14:01 -0600
Subject: [PATCH] flake-module: rename `homeManagerModules` to `homeModules`
 (#6406)

This reverts commit 066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe. After
further discussion, we want to maintain this as the naming scheme going
forward to be similar to standards that have been trying to be
implemented in naming configurations and modules.
---
 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 6b05c77f2..b314bef3c 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 `homeManagerModules`, `homeConfigurations`,
+        # Define `homeModules`, `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.homeManagerModules` and `flake.homeConfigurations`
+The flake module defines the `flake.homeModules` and `flake.homeConfigurations`
 options, allowing them to be properly merged if they are defined in multiple
 modules.
 
-If you are only defining `homeManagerModules` and/or `homeConfigurations` once in a
+If you are only defining `homeModules` 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 269add846..cc5f1551a 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -14,12 +14,12 @@ in {
           that you can reference them in this or another flake's `homeConfigurations`.
         '';
       };
-      homeManagerModules = mkOption {
+      homeModules = mkOption {
         type = types.lazyAttrsOf types.deferredModule;
         default = { };
         apply = mapAttrs (k: v: {
           _class = "homeManager";
-          _file = "${toString moduleLocation}#homeManagerModules.${k}";
+          _file = "${toString moduleLocation}#homeModules.${k}";
           imports = [ v ];
         });
         description = ''