diff --git a/flake/home-manager.nix b/flake/home-manager.nix
index 5a1fa87..0934065 100644
--- a/flake/home-manager.nix
+++ b/flake/home-manager.nix
@@ -40,6 +40,8 @@ let
   };
 
   mkHome = name: mkHomeCommon "${self}/hosts/homes/${name}";
+
+  mkNixosHome = name: mkHomeCommon "${self}/hosts/nixos/${name}/home.nix";
 in
 {
   hosts.homes = {
@@ -57,8 +59,18 @@ in
             # Default configuration
             ambroisie = system;
           };
+          homeManagerHomes = lib.mapAttrs mkHome allHomes;
+
+          filteredNixosHosts = lib.filterAttrs (_: v: v == system) hosts.nixos;
+          nixosHomes' = lib.mapAttrs mkNixosHome filteredNixosHosts;
+          nixosHomeUsername = (host: self.nixosConfigurations.${host}.config.my.user.name);
+          nixosHomes = lib.mapAttrs' (host: lib.nameValuePair "${nixosHomeUsername host}@${host}") nixosHomes';
         in
-        lib.mapAttrs mkHome allHomes;
+        lib.foldl' lib.mergeAttrs { }
+          [
+            homeManagerHomes
+            nixosHomes
+          ];
     };
   };
 }