diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index cb0e991d6..beaa07cb3 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -36,7 +36,7 @@ outputs =
   let
     lib = nixpkgs.lib;
     system = "x86_64-linux";
-    user = import ./assets/flake/users/henrov.nix;
+    user = import ./generated/out_of_tree/users/henrov.nix;
     machines = [
       "traveldroid"
       "maindroid"
@@ -76,7 +76,7 @@ outputs =
       }
     );
 
-    devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
+    devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
       inherit (nixpkgs.legacyPackages.${system}) mkShell;
     };
   };
diff --git a/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix b/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix
new file mode 100644
index 000000000..c5d5b7e72
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/terminal_shell/devshell.nix
@@ -0,0 +1,7 @@
+{ mkShell, ... }:
+mkShell {
+  buildInputs = with import <nixpkgs> {}; [
+    nil
+    nixfmt-rfc-style
+  ];
+}
diff --git a/Droidnix/generated/out_of_tree/terminal_shell/top.nix b/Droidnix/generated/out_of_tree/terminal_shell/top.nix
new file mode 100644
index 000000000..745cb377b
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/terminal_shell/top.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  lib,
+  user,
+  inputs,
+  flakeRoot,
+  ...
+}:
+
+{
+  imports = [
+    ./devshell.nix
+    inputs.home-manager.nixosModules.home-manager
+  ];
+}
diff --git a/Droidnix/generated/out_of_tree/users/henrov.nix b/Droidnix/generated/out_of_tree/users/henrov.nix
new file mode 100644
index 000000000..e4c4c2eed
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/users/henrov.nix
@@ -0,0 +1,7 @@
+{
+  username = "henrov";
+  hashedPassword = "$6$ISAmsPLyFi7idYXr$VmZsq.zMsyh1irSkyDNqtorNXG0oEHbbMVqTii1t8bymvrQ5ZQmbdi4OiBNeNYe/huHGrojXM.3TST2fTLz0T.";
+  homeDirectory = "/home/henrov";
+  stateVersion = "25.11";
+  locale = "nl_NL.UTF-8";
+}
diff --git a/Droidnix/generated/out_of_tree/users/top.nix b/Droidnix/generated/out_of_tree/users/top.nix
new file mode 100644
index 000000000..1125f3e3f
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/users/top.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, lib, ... }:
+{
+  imports = [
+    ./user.nix
+  ];
+}
diff --git a/Droidnix/generated/out_of_tree/users/user.nix b/Droidnix/generated/out_of_tree/users/user.nix
new file mode 100644
index 000000000..81fa5f124
--- /dev/null
+++ b/Droidnix/generated/out_of_tree/users/user.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
+
+let
+  user = import ./henrov.nix;
+in
+{
+  home-manager.users.${user.username} = {
+    home.stateVersion = "25.11";
+    home.username = user.username;
+    home.homeDirectory = user.homeDirectory;
+    home.packages = with pkgs; [
+      direnv
+      git-extras
+    ];
+  };
+
+  # Ensure the user is in the necessary groups
+  users.users.${config.users.users.${user.username}.username} = {
+    extraGroups = [ "networkmanager" ];
+}