diff --git a/flake.nix b/flake.nix
index 194cf63..514e9cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,10 +49,6 @@
             ./systems/NOlaptop.nix
             ./users/tao.nix
             home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-            }
             ./extras/uwuraid.nix
             ./extras/dev.nix
             ./extras/gaming.nix
diff --git a/users/tao.nix b/users/tao.nix
index 7927292..6a18b86 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }: {
+{ pkgs, ... }: {
   users.users.tao.packages = with pkgs; [
     leetcode-cli
     typst-fmt
@@ -116,7 +116,9 @@
   # home-manager.useUserPackages = true;
   #   home-manager.users.tao = import ./users/tao.nix;
   # }
-  home-manager.users.tao = { pkgs, ... }: {
-    home.stateversion = "23.11";
-  };
+  # home.username = "tao";
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.users.tao = import ./tao/home.nix;
 }
diff --git a/users/tao/home.nix b/users/tao/home.nix
new file mode 100644
index 0000000..a4aae70
--- /dev/null
+++ b/users/tao/home.nix
@@ -0,0 +1,5 @@
+{
+  home.username = "tao";
+  home.homeDirectory = "/home/tao";
+  home.stateVersion = "23.11";
+}