aboutsummaryrefslogtreecommitdiffstats
path: root/pkgs/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix28
1 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 38c58a95..200cc752 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,24 +1,12 @@
{
- lib,
- system,
- overlays ? [],
+ pkgs,
sysLib,
- homeConfig,
- nixosConfig,
}: let
- additionalPackages = (import ./pkgs) {inherit homeConfig nixosConfig sysLib;};
- complete_overlays = overlays ++ additionalPackages;
-in {
- # TODO: inheriting system here is discouraged, localSystem or hostSystem should be inspected
- inherit system;
- overlays = complete_overlays;
- config = {
- # TODO: this fails because of the root tempsize, which should be increased
- # contentAddressedByDefault = true;
-
- allowUnfreePredicate = pkg:
- builtins.elem (lib.getName pkg) [
- "pypemicro" # required by pynitrokey
- ];
+ files = import ./by-name-overlay.nix {
+ inherit pkgs sysLib;
+ inherit (pkgs) lib;
+ baseDirectory =
+ ./by-name;
};
-}
+in
+ files