diff --git a/modules/software/packages/extended.nix b/modules/software/packages/extended.nix
index 4f8bf47..c425183 100644
--- a/modules/software/packages/extended.nix
+++ b/modules/software/packages/extended.nix
@@ -36,7 +36,6 @@
     fzf
     fd
     qemu
-    home-manager
     dfc
     sops
 
diff --git a/modules/users/ranomier/home-manager.nix b/modules/users/ranomier/home-manager.nix
index f097950..2bd6b49 100644
--- a/modules/users/ranomier/home-manager.nix
+++ b/modules/users/ranomier/home-manager.nix
@@ -1,9 +1,4 @@
 {inArgs, pkgs, ...}: {
-  imports = [
-    inArgs.home-manager.nixosModules.home-manager
-  ];
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
   home-manager.users."ranomier" = {
 
     stylix.iconTheme = {
diff --git a/system_profiles/components/home-manager.nix b/system_profiles/components/home-manager.nix
new file mode 100644
index 0000000..42eeaba
--- /dev/null
+++ b/system_profiles/components/home-manager.nix
@@ -0,0 +1,10 @@
+{inArgs, pkgs, ...}: {
+  imports = [ inArgs.home-manager.nixosModules.home-manager ];
+
+  environment.systemPackages = [ pkgs.home-manager ];
+
+  home-manager = {
+    useUserPackages = true;
+    useGlobalPkgs = true;
+  };
+}
diff --git a/system_profiles/desktop.nix b/system_profiles/desktop.nix
index dc96afc..9c27f35 100644
--- a/system_profiles/desktop.nix
+++ b/system_profiles/desktop.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./components/home-manager.nix
     ./components/nix-defaults.nix
     #./components/nixpkgs-ng.nix