1 files changed, 7 insertions, 37 deletions
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 8b5ae75e0fd..545b0114191 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,40 +1,10 @@
-{ runCommand, lib, bash, coreutils, findutils, gnused, less
+{ pkgs ? import <nixpkgs> { } }:
 
-  # Extra path to Home Manager. If set then this path will be tried
-  # before `$HOME/.config/nixpkgs/home-manager` and
-  # `$HOME/.nixpkgs/home-manager`.
-, path ? null
-}:
+rec {
+  home-manager = pkgs.callPackage ./home-manager { path = toString ./.; };
 
-let
+  install =
+    pkgs.callPackage ./home-manager/install.nix { inherit home-manager; };
 
-  pathStr = if path == null then "" else path;
-
-in
-
-runCommand
-  "home-manager"
-  {
-    preferLocalBuild = true;
-    allowSubstitutes = false;
-    meta = with lib; {
-      description = "A user environment configurator";
-      maintainers = [ maintainers.rycee ];
-      platforms = platforms.unix;
-      license = licenses.mit;
-    };
-  }
-  ''
-    install -v -D -m755  ${./home-manager} $out/bin/home-manager
-
-    substituteInPlace $out/bin/home-manager \
-      --subst-var-by bash "${bash}" \
-      --subst-var-by coreutils "${coreutils}" \
-      --subst-var-by findutils "${findutils}" \
-      --subst-var-by gnused "${gnused}" \
-      --subst-var-by less "${less}" \
-      --subst-var-by HOME_MANAGER_PATH '${pathStr}'
-
-    install -D -m755 ${./completion.bash} \
-      $out/share/bash-completion/completions/home-manager
-  ''
+  nixos = import ./nixos;
+}