From 0b8aaf3818943761e7effdec185127cf5cacbe9f Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Wed, 13 Nov 2024 17:20:50 +0100 Subject: [PATCH] Add separate platform profile parameter --- package.nix | 7 +++++-- platform/supermicro-h11ssw.nix | 2 +- platform/thinkpad-x1-extreme-gen5.nix | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.nix b/package.nix index d15a640..4e6f430 100644 --- a/package.nix +++ b/package.nix @@ -39,7 +39,8 @@ lib.makeOverridable ({ ], platformFirmware ? [ ], extraFirmware ? [ ], - profiles ? { }, + platformProfiles ? { }, + extraProfiles ? { }, ... }: @@ -61,7 +62,9 @@ let } + "/lib/firmware"; config = let - profileConfigs = builtins.readDir ./profile + profileConfigs = let + profiles = platformProfiles // extraProfiles; + in builtins.readDir ./profile |> lib.filterAttrs (name: type: type == "regular") |> builtins.attrNames |> map (lib.removeSuffix ".nix") diff --git a/platform/supermicro-h11ssw.nix b/platform/supermicro-h11ssw.nix index a06179b..a16f41d 100644 --- a/platform/supermicro-h11ssw.nix +++ b/platform/supermicro-h11ssw.nix @@ -1,6 +1,6 @@ { instSetArch = "znver2"; - profiles = { + platformProfiles = { physical = true; }; diff --git a/platform/thinkpad-x1-extreme-gen5.nix b/platform/thinkpad-x1-extreme-gen5.nix index efddc08..d790f3e 100644 --- a/platform/thinkpad-x1-extreme-gen5.nix +++ b/platform/thinkpad-x1-extreme-gen5.nix @@ -1,6 +1,6 @@ { instSetArch = "alderlake"; - profiles = { + platformProfiles = { physical = true; portable = true; wireless = true;