diff --git a/configuration.nix b/configuration.nix
index 68ce3fa..59db681 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -91,6 +91,7 @@
     cryptsetup
     man-pages
     man-pages-posix
+    home-manager
   ];
   documentation.dev.enable = true;
   programs.bash = {
diff --git a/flake.nix b/flake.nix
index e610704..5d76e6f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,26 +10,33 @@
     };
   };
 
-  outputs = { nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: {
-    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+  outputs = { nixpkgs, nixpkgs-stable, home-manager, ... }@inputs:
+    let
       system = "x86_64-linux";
-      modules = [
-        ./configuration.nix
-        {
-          nixpkgs.overlays = [
-            (final: prev: {
-              stable = import nixpkgs-stable {
-                system = prev.system;
-              };
-            })
-          ];
-        }
-        home-manager.nixosModules.home-manager {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.users.ahnwuoa = import ./home.nix;
-        }
-      ];
+      pkgs = nixpkgs.legacyPackages.${system};
+      overlays = {
+        nixpkgs.overlays = [
+          (final: prev: {
+            stable = import nixpkgs-stable {
+              system = prev.system;
+            };
+          })
+        ];
+      };
+    in {
+      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          ./configuration.nix
+          overlays
+        ];
+      };
+      homeConfigurations.ahnwuoa = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = [
+          ./home.nix
+          overlays
+        ];
+      };
     };
-  };
 }