diff options
author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 14:00:43 +0200 |
---|---|---|
committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 14:00:43 +0200 |
commit | 3f9e7bb4f24350e906d54ad634a50f7cc56282db (patch) | |
tree | 492fe6cd80c1f4204bed9c47f1ac181c1fd30176 /modules/system/nixpkgs/default.nix | |
parent | fix(modules/system/networking): Enforce mutually exclusivity between networkd... (diff) | |
download | nixos-config-3f9e7bb4f24350e906d54ad634a50f7cc56282db.tar.gz nixos-config-3f9e7bb4f24350e906d54ad634a50f7cc56282db.zip |
fix(modules/system/nixpkgs): Remove duplicated `config` attr name
Diffstat (limited to 'modules/system/nixpkgs/default.nix')
-rw-r--r-- | modules/system/nixpkgs/default.nix | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/modules/system/nixpkgs/default.nix b/modules/system/nixpkgs/default.nix index ca28c7bd..eda3ac89 100644 --- a/modules/system/nixpkgs/default.nix +++ b/modules/system/nixpkgs/default.nix @@ -1,13 +1,9 @@ { lib, config, - myPkgs, - pkgs, ... -}: let +} @ args: let cfg = config.soispha.nixpkgs; - - myPkgsOverlay = self: super: myPkgs; in { options.soispha.nixpkgs = { enable = lib.mkEnableOption "Nixpkgs config"; @@ -17,24 +13,5 @@ in { type = lib.types.str; }; }; - config = { - nixpkgs = lib.mkIf cfg.enable { - hostPlatform = cfg.systemName; - config = { - hostSystem = cfg.systemName; - overlays = [ - myPkgsOverlay - ]; - 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 - ]; - }; - }; - }; - }; + config = lib.mkIf cfg.enable (import ./config.nix (args // {inherit cfg;})); } |