From 2e0a35a6cdcf1d01eb1fcba9ede1019cf7f595d4 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 14 Jul 2023 20:01:30 +0800 Subject: [PATCH] lib/images: add `pkgs` attribute for `mkUser` The nixpkgs is now assumed from the outside. This allows for the config to have more control with the nixpkgs to be imported with the home-manager configuration. --- lib/images.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/images.nix b/lib/images.nix index 24895e3c..b16f4c29 100644 --- a/lib/images.nix +++ b/lib/images.nix @@ -21,11 +21,10 @@ in }; # A wrapper around the home-manager configuration function. - mkUser = { system, extraModules ? [ ], extraArgs ? { }, home-manager-channel ? "home-manager", nixpkgs-channel ? "nixpkgs" }: + mkUser = { pkgs, system, extraModules ? [ ], extraArgs ? { }, home-manager-channel ? "home-manager" }: inputs."${home-manager-channel}".lib.homeManagerConfiguration { - inherit lib; + inherit lib pkgs; extraSpecialArgs = extraArgs; - pkgs = import inputs."${nixpkgs-channel}" { inherit system; }; modules = # Importing our custom home-manager modules. (import ../modules/home-manager { inherit lib; isInternal = true; })