diff --git a/flake.nix b/flake.nix
index 600df10..2153b8a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,12 @@
   };
 
   outputs =
-    { nixpkgs, ... }@inputs:
+    {
+      nixpkgs,
+      home-manager,
+      agenix,
+      ...
+    }@inputs:
     let
       commonSystem =
         {
@@ -31,7 +36,23 @@
           system ? "x86_64-linux",
         }:
         nixpkgs.lib.nixosSystem {
-          modules = [ ./hosts/${hostName}/configuration.nix ];
+          modules = [
+            ./hosts/${hostName}/configuration.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                users.${userName}.imports = [
+                  ./hosts/${hostName}/home.nix
+                ];
+                backupFileExtension = "backup";
+                extraSpecialArgs = {
+                  inherit userName;
+                };
+                useGlobalPkgs = true;
+                useUserPackages = true;
+              };
+            }
+          ];
           specialArgs = {
             inherit inputs;
             inherit hostName;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 4c05aa1..2d826a8 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -13,7 +13,6 @@ in
   # keep-sorted start
   agenix.enable = lib.mkDefault true;
   fonts.enable = lib.mkDefault true;
-  home-manager.enable = lib.mkDefault true;
   localisation.enable = lib.mkDefault true;
   network.enable = lib.mkDefault true;
   nh.enable = lib.mkDefault true;
diff --git a/modules/nixos/features/home-manager.nix b/modules/nixos/features/home-manager.nix
deleted file mode 100644
index f805586..0000000
--- a/modules/nixos/features/home-manager.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  hostName,
-  inputs,
-  lib,
-  userName,
-  ...
-}:
-let
-  feature = "home-manager";
-in
-{
-  config = lib.mkIf config.${feature}.enable {
-    home-manager = {
-      users.${userName} = import ../../../hosts/${hostName}/home.nix;
-      backupFileExtension = "backup";
-      extraSpecialArgs = {
-        inherit userName;
-      };
-      useGlobalPkgs = true;
-      useUserPackages = true;
-    };
-  };
-
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  options.${feature}.enable = lib.mkEnableOption "enables ${feature}";
-}