diff --git a/flake.nix b/flake.nix
index 36f8b58..a6ed538 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,10 @@
         };
       };
 
-      homeConfigurations.josh = home-manager.lib.homeManagerConfiguration {
+      homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
+          specialArgs = {
+            inherit username;
+          };
         pkgs = nixpkgs.legacyPackages.${system};
         modules = [
           ./modules/home
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 930c5f4..d627c89 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -5,11 +5,11 @@
   imports = [
     ./direnv.nix
     ./fzf.nix
+    ./home.nix
     ./hyprland
     ./kitty.nix
     ./overlays.nix
     ./stylix.nix
-    ./system.nix
     ./vscodium.nix
     ./xdg.nix
     ./zsh
diff --git a/modules/home/home.nix b/modules/home/home.nix
new file mode 100644
index 0000000..a934d8e
--- /dev/null
+++ b/modules/home/home.nix
@@ -0,0 +1,11 @@
+{
+  username,
+  ...
+}:
+{
+  home = {
+    username = "${username}";
+    homeDirectory = "/home/${username}";
+    stateVersion = "25.11";
+  };
+}
\ No newline at end of file
diff --git a/modules/home/system.nix b/modules/home/system.nix
deleted file mode 100644
index 535c1d1..0000000
--- a/modules/home/system.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  ...
-}:
-{
-  system.stateVersion = "25.05";
-}
\ No newline at end of file