project: rewrite

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/mk_home.nix b/lib/mk_home.nix
index 7abe42a..52acc96 100644
--- a/lib/mk_home.nix
+++ b/lib/mk_home.nix
@@ -1,20 +1,23 @@
 { self, home-manager, ... } @ inputs:
 
-username: hostname: system: nixpkgs: version:
+{ username, hostname, system, pkgs, version, extraModules }:
 let
   args = inputs;
-  entrypoint = "${self}/home/configurations/${username}@${hostname}.nix";
+  entrypoint = "${self}/home/${hostname}/${username}.nix";
 in
 home-manager.lib.homeManagerConfiguration {
   inherit username system;
   homeDirectory = "/home/${username}";
   stateVersion = version;
-  pkgs = nixpkgs.legacyPackages.${system};
+  pkgs = pkgs;
 
   configuration = { lib, ... }: {
     _module = { inherit args; };
+
+    profiles.base.enable = true;
+
     imports = [
       entrypoint
-    ] ++ __attrValues self.homeModules;
+    ] ++ lib.optionals (extraModules != null) extraModules;
   };
 }