Move integration-common.nix to nixos/common.nix

nixos/common.nix

@@ -0,0 +1,124 @@
+# This module is the common base for the NixOS and nix-darwin modules.
+# For OS-specific configuration, please edit nixos/default.nix or nix-darwin/default.nix instead.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.home-manager;
+
+  extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
+
+  hmModule' = types.submoduleWith {
+    specialArgs = {
+      lib = extendedLib;
+      osConfig = config;
+      modulesPath = builtins.toString ../modules;
+    } // cfg.extraSpecialArgs;
+    modules = [
+      ({ name, ... }: {
+        imports = import ../modules/modules.nix {
+          inherit pkgs;
+          lib = extendedLib;
+          useNixpkgsModule = !cfg.useGlobalPkgs;
+        };
+
+        config = {
+          submoduleSupport.enable = true;
+          submoduleSupport.externalPackageInstall = cfg.useUserPackages;
+
+          home.username = config.users.users.${name}.name;
+          home.homeDirectory = config.users.users.${name}.home;
+
+          # Make activation script use same version of Nix as system as a whole.
+          # This avoids problems with Nix not being in PATH.
+          home.extraActivationPath = [ config.nix.package ];
+        };
+      })
+    ] ++ cfg.sharedModules;
+  } // {
+    description = "Home Manager module";
+  };
+
+  # TODO: hack until https://github.com/NixOS/nixpkgs/pull/173621 lands
+  hmModule = hmModule' // {
+    substSubModules = m:
+      hmModule'.substSubModules m // {
+        inherit (hmModule') description;
+      };
+  };
+
+in {
+  options.home-manager = {
+    useUserPackages = mkEnableOption ''
+      installation of user packages through the
+      <option>users.users.&lt;name&gt;.packages</option> option
+    '';
+
+    useGlobalPkgs = mkEnableOption ''
+      using the system configuration's <literal>pkgs</literal>
+      argument in Home Manager. This disables the Home Manager
+      options <option>nixpkgs.*</option>
+    '';
+
+    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.
+      '';
+    };
+
+    extraSpecialArgs = mkOption {
+      type = types.attrs;
+      default = { };
+      example = literalExpression "{ inherit emacs-overlay; }";
+      description = ''
+        Extra <literal>specialArgs</literal> passed to Home Manager. This
+        option can be used to pass additional arguments to all modules.
+      '';
+    };
+
+    sharedModules = mkOption {
+      type = with types; listOf raw;
+      default = [ ];
+      example = literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]";
+      description = ''
+        Extra modules added to all users.
+      '';
+    };
+
+    verbose = mkEnableOption "verbose output on activation";
+
+    users = mkOption {
+      type = types.attrsOf hmModule;
+      default = { };
+      # Prevent the entire submodule being included in the documentation.
+      visible = "shallow";
+      description = ''
+        Per-user Home Manager configuration.
+      '';
+    };
+  };
+
+  config = mkIf (cfg.users != { }) {
+    warnings = flatten (flip mapAttrsToList cfg.users (user: config:
+      flip map config.warnings (warning: "${user} profile: ${warning}")));
+
+    assertions = flatten (flip mapAttrsToList cfg.users (user: config:
+      flip map config.assertions (assertion: {
+        inherit (assertion) assertion;
+        message = "${user} profile: ${assertion.message}";
+      })));
+
+    users.users = mkIf cfg.useUserPackages
+      (mapAttrs (username: usercfg: { packages = [ usercfg.home.path ]; })
+        cfg.users);
+
+    environment.pathsToLink = mkIf cfg.useUserPackages [ "/etc/profile.d" ];
+  };
+}

nixos/default.nix

@@ -11,7 +11,7 @@ let
   } // optionalAttrs cfg.verbose { VERBOSE = "1"; };
 
 in {
-  imports = [ ../integration-common.nix ];
+  imports = [ ./common.nix ];
 
   config = mkMerge [
     {