From 7a372ed81256ce5d6aa608be9bebe173ab4e042e Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 18 Jan 2022 17:38:31 +0900 Subject: project: rewrite --- lib/mk_home.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/mk_home.nix') 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; }; } -- cgit 1.4.1