diff --git a/lib/default.nix b/lib/default.nix index 4b76c64d0..b99bd71ef 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,70 +1,32 @@ { lib }: { hm = (import ../modules/lib/stdlib-extended.nix lib).hm; + homeManagerConfiguration = { + check ? true, + extraSpecialArgs ? { }, + lib ? pkgs.lib, modules ? [ ], pkgs, - lib ? pkgs.lib, - extraSpecialArgs ? { }, - check ? true, - # Deprecated: - configuration ? null, - }@args: - let - msgForRemovedArg = '' - The 'homeManagerConfiguration' arguments + }: + import ../modules { + inherit + check + extraSpecialArgs + lib + pkgs + ; + configuration = + { ... }: + { + imports = modules ++ [ { programs.home-manager.path = "${../.}"; } ]; - - 'configuration', - - 'username', - - 'homeDirectory' - - 'stateVersion', - - 'extraModules', and - - 'system' + nixpkgs = { + config = lib.mkDefault pkgs.config; - have been removed. Instead use the arguments 'pkgs' and - 'modules'. See the 22.11 release notes for more: https://nix-community.github.io/home-manager/release-notes.xhtml#sec-release-22.11-highlights - ''; - - throwForRemovedArgs = - v: - let - used = builtins.filter (n: (args.${n} or null) != null) [ - "configuration" - "username" - "homeDirectory" - "stateVersion" - "extraModules" - "system" - ]; - msg = - msgForRemovedArg - + '' - - - Deprecated args passed: '' - + builtins.concatStringsSep " " used; - in - lib.throwIf (used != [ ]) msg v; - - in - throwForRemovedArgs ( - import ../modules { - inherit - pkgs - lib - check - extraSpecialArgs - ; - configuration = - { ... }: - { - imports = modules ++ [ { programs.home-manager.path = "${../.}"; } ]; - nixpkgs = { - config = lib.mkDefault pkgs.config; - inherit (pkgs) overlays; - }; + inherit (pkgs) overlays; }; - } - ); + }; + }; }