From 204731c0a69136c9cebcb54f1afecf5145e26bbe Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Thu, 23 May 2024 13:26:22 +0200 Subject: refactor(pkgs): Categorize into `by-name` shards This might not be the perfect way to organize a package set -- especially if the set is not nearly the size of nixpkgs -- but it is _at_ least a way of organization. --- pkgs/default.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'pkgs/default.nix') 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 -- cgit 1.4.1