From 3f9e7bb4f24350e906d54ad634a50f7cc56282db Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 24 May 2024 14:00:43 +0200 Subject: fix(modules/system/nixpkgs): Remove duplicated `config` attr name --- modules/system/nixpkgs/default.nix | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'modules/system/nixpkgs/default.nix') 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;})); } -- cgit 1.4.1