From 1c3614cbc81e8b79b8da584e7db253b2eec4f340 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 9 Feb 2019 15:08:16 +0100
Subject: [PATCH] Clean up support code for Home Manager as a submodule

This removes the `nixosSubmodule` option in favor of a new option
`submoduleSupport.enable`. This name better indicates that the
submodule mode applies to both NixOS and nix-darwin.

(cherry picked from commit 2f372ab4d670c2b685a8f603d078cf3ddfa7e6cd)
---
 modules/misc/submodule-support.nix | 19 +++++++++++++++++++
 modules/modules.nix                | 11 +----------
 modules/programs/home-manager.nix  |  2 +-
 nix-darwin/default.nix             |  6 ++----
 nixos/default.nix                  |  6 ++----
 5 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 modules/misc/submodule-support.nix

diff --git a/modules/misc/submodule-support.nix b/modules/misc/submodule-support.nix
new file mode 100644
index 00000000..cffdcb9e
--- /dev/null
+++ b/modules/misc/submodule-support.nix
@@ -0,0 +1,19 @@
+{ lib, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.rycee ];
+
+  options.submoduleSupport = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      internal = true;
+      description = ''
+        Whether the Home Manager module system is used as a submodule
+        in, for example, NixOS or nix-darwin.
+      '';
+    };
+  };
+}
diff --git a/modules/modules.nix b/modules/modules.nix
index 2fed3a9b..b96cc319 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -3,9 +3,6 @@
 
   # Whether to enable module type checking.
 , check ? true
-
-  # Whether these modules are inside a NixOS submodule.
-, nixosSubmodule ? false
 }:
 
 with lib;
@@ -33,6 +30,7 @@ let
     (loadModule ./misc/nixpkgs.nix { })
     (loadModule ./misc/pam.nix { })
     (loadModule ./misc/qt.nix { })
+    (loadModule ./misc/submodule-support.nix { })
     (loadModule ./misc/version.nix { })
     (loadModule ./misc/xdg.nix { })
     (loadModule ./programs/afew.nix { })
@@ -129,17 +127,10 @@ let
   modules = map (getAttr "file") (filter (getAttr "condition") allModules);
 
   pkgsModule = {
-    options.nixosSubmodule = mkOption {
-      type = types.bool;
-      internal = true;
-      readOnly = true;
-    };
-
     config._module.args.baseModules = modules;
     config._module.args.pkgs = lib.mkDefault pkgs;
     config._module.check = check;
     config.lib = import ./lib { inherit lib; };
-    config.nixosSubmodule = nixosSubmodule;
     config.nixpkgs.system = mkDefault pkgs.system;
   };
 
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index 0990de85..cc76b011 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -32,7 +32,7 @@ in
     };
   };
 
-  config = mkIf (cfg.enable && !config.nixosSubmodule) {
+  config = mkIf (cfg.enable && !config.submoduleSupport.enable) {
     home.packages = [
       (import ../../home-manager {
         inherit pkgs;
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index c2ec350c..810b3e5e 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -7,12 +7,10 @@ let
   cfg = config.home-manager;
 
   hmModule = types.submodule ({name, ...}: {
-    imports = import ../modules/modules.nix {
-      inherit lib pkgs;
-      nixosSubmodule = true;
-    };
+    imports = import ../modules/modules.nix { inherit lib pkgs; };
 
     config = {
+      submoduleSupport.enable = true;
       home.username = config.users.users.${name}.name;
       home.homeDirectory = config.users.users.${name}.home;
     };
diff --git a/nixos/default.nix b/nixos/default.nix
index c101f5a9..b8cea735 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -7,12 +7,10 @@ let
   cfg = config.home-manager;
 
   hmModule = types.submodule ({name, ...}: {
-    imports = import ../modules/modules.nix {
-      inherit lib pkgs;
-      nixosSubmodule = true;
-    };
+    imports = import ../modules/modules.nix { inherit lib pkgs; };
 
     config = {
+      submoduleSupport.enable = true;
       home.username = config.users.users.${name}.name;
       home.homeDirectory = config.users.users.${name}.home;
     };