refactor package definition loading
1 file changed, 1 insertion(+), 12 deletions(-)
changed files
M default.nix → default.nix
@@ -15,16 +15,5 @@ # The `lib`, `modules`, and `overlays` names are special lib = import ./lib { inherit pkgs; }; # functions modules = import ./modules/nixos; # NixOS modules overlays = import ./overlays; # nixpkgs overlays - - fishPlugins = pkgs.lib.makeScope pkgs.fishPlugins.newScope ( - self: - pkgs.lib.packagesFromDirectoryRecursive { - inherit (pkgs.fishPlugins) callPackage; - directory = ./pkgs/scoped/fishPlugins; - } - ); } -// pkgs.lib.packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; - directory = ./pkgs/by-directory; -} +// (import ./pkgs { inherit pkgs; })