Import modules directly

flake.nix

@@ -25,6 +25,13 @@
       ];
       domain = "odie.intranet";
     };
+
+    overlays = [
+      inputs.nixvim.overlays.default
+      inputs.neovim-nightly-overlay.overlays.default
+      inputs.nur.overlay
+      inputs.nixgl.overlay
+    ];
   in
     {
       nixosModules = {

hosts/vm/configuration.nix

@@ -24,8 +24,17 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    user.${vars.userName} = flakeLib.mkHomeConfiguration {
+    user.${vars.userName} = {
-      inherit nixpkgs vars outputs inputs flakeLib system profile modules;
+      modules = [
+        outputs.homeManagerModules.base
+        outputs.homeManagerModules.shell
+        outputs.homeManagerModules.dev
+        outputs.homeManagerModules.desktop
+      ];
+    };
+    extraSpecialArgs = {
+      inherit inputs outputs vars flakeLib;
+      inherit (inputs) nix-colors;
     };
   };
 

lib/mkHomeConfiguration.nix

@@ -7,22 +7,16 @@
   system,
   profile,
   modules ? [],
+  overlays ? [],
   ...
-}: let
+}:
-  overlays = [
+import profile {
-    inputs.nixvim.overlays.default
+  inherit inputs outputs modules;
-    inputs.neovim-nightly-overlay.overlays.default
+  extraSpecialArgs = {
-    inputs.nur.overlay
+    inherit inputs outputs vars flakeLib;
-    inputs.nixgl.overlay
+    inherit (inputs) nix-colors;
-  ];
+  };
-in
+  pkgs = flakeLib.mkPkgs {
-  import profile {
+    inherit nixpkgs system overlays;
-    inherit inputs outputs modules;
+  };
-    extraSpecialArgs = {
+}
-      inherit inputs outputs vars flakeLib;
-      inherit (inputs) nix-colors;
-    };
-    pkgs = flakeLib.mkPkgs {
-      inherit nixpkgs system overlays;
-    };
-  }