diff --git a/flake.nix b/flake.nix
index d7ce810..ea6eb1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,23 +28,24 @@
   {
     # Apply darwin flake using:
     # $ darwin-rebuild switch --flake ~/.config/nix#tbl-macbook
-    darwinConfigurations."tbl-macbook" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations.${hostname} = nix-darwin.lib.darwinSystem {
       inherit system specialArgs;
       modules = [
+        ./modules/host-users.nix
+        ./modules/nix-core.nix
+        ./modules/system.nix
+        ./modules/apps.nix
+        ./modules/homebrew.nix
         home-manager.darwinModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.verbose = true;
-          home-manager.users.${username} = {
-            imports = [ ./modules/home-manager.nix ];
+          home-manager.extraSpecialArgs = {
+            inherit username;
           };
+          home-manager.users.${username} = import ./modules/home-manager.nix;
         }
-        ./modules/nix-core.nix
-        ./modules/system.nix
-        ./modules/host-users.nix
-        ./modules/apps.nix
-        ./modules/homebrew.nix
       ];
     };
     formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 630e37d..59e0100 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -1,8 +1,15 @@
-{ pkgs, ... }: 
+{ pkgs, username, ... }:
 {
+  home.username = username;
+  home.homeDirectory = "/Users/${username}";
+
   home.stateVersion = "25.05";
-  programs.home-manager.enable = true;    
-  home.packages = with pkgs; [];
+  programs.home-manager.enable = true;
+
+  home.packages = with pkgs; [
+    jdk23
+    git
+  ];
 
   home.file.".zshrc".source = ../dotfiles/.zshrc;
 
diff --git a/modules/host-users.nix b/modules/host-users.nix
index d4b2668..1f18e8f 100644
--- a/modules/host-users.nix
+++ b/modules/host-users.nix
@@ -4,7 +4,8 @@
   networking.computerName = hostname;
   system.defaults.smb.NetBIOSName = hostname;
 
-  users.users."${username}"= {
+  users.users.${username} = {
+    name = username;
     home = "/Users/${username}";
     description = username;
   };