diff options
author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-23 13:26:22 +0200 |
---|---|---|
committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-23 13:26:22 +0200 |
commit | 204731c0a69136c9cebcb54f1afecf5145e26bbe (patch) | |
tree | fc9132e5dc74e4a8e1327cdd411839a90f9410aa /pkgs/default.nix | |
parent | refactor(sys): Modularize and move to `modules/system` or `pkgs` (diff) | |
download | nixos-config-204731c0a69136c9cebcb54f1afecf5145e26bbe.zip |
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.
Diffstat (limited to '')
-rw-r--r-- | pkgs/default.nix | 28 |
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 |