diff --git a/Droidnix/assets/flake/users/user.nix b/Droidnix/assets/flake/users/user.nix
index f778cefb1..f33db0dd5 100644
--- a/Droidnix/assets/flake/users/user.nix
+++ b/Droidnix/assets/flake/users/user.nix
@@ -3,7 +3,6 @@
   pkgs,
   lib,
   inputs,
-  flakeRoot,
   ...
 }:
 
@@ -11,11 +10,13 @@ let
   user = import ./henrov.nix;
 in
 {
-  config = {
-    # User-specific configurations
-    home-manager.users.${user.username} = {
-      enable = true;
-      homeDirectory = user.homeDirectory;
-    };
+  home-manager.users.${user.username} = {
+    home.stateVersion = "25.11";
+    home.username = user.username;
+    home.homeDirectory = user.homeDirectory;
+    home.packages = with pkgs; [
+      direnv
+      git-extras
+    ];
   };
 }
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index 6c54ac388..29be6bae2 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -49,39 +49,32 @@
           inherit system;
           modules = [
             # Import machine-specific configurations
-            ./assets/flake/machines/traveldroid/top.nix
+            ./machine.nix
 
             # Catppuccin theme module
             inputs.catppuccin.nixosModules.catppuccin
 
             # Anchoring all the other nixes
             ./generated/top.nix
+
+            # Home Manager module
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user inputs; };
+            }
           ];
-          specialArgs = {
-            inherit user inputs;
-            flakeRoot = ./.;
-          };
+          specialArgs = { inherit user inputs; };
         }
       );
 
-      # Home Manager configurations for each user/machine
-      homeConfigurations = lib.genAttrs (map (machine: user.username + "@" + machine) machines) (
+      homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
         userMachine:
-        let
-          parts = lib.splitString "@" userMachine;
-          username = builtins.elemAt parts 0;
-          machine = builtins.elemAt parts 1;
-        in
         home-manager.lib.homeManagerConfiguration {
           inherit system;
-          configuration = import ./user.nix {
-            inherit inputs user;
-            pkgs = import nixpkgs { inherit system; };
-          };
-          extraSpecialArgs = {
-            inherit user inputs;
-            flakeRoot = ./.;
-          };
+          configuration = import ./user.nix { inherit inputs user; };
+          extraSpecialArgs = { inherit user inputs; };
         }
       );