From fa0dd9696f58b7526348de009f6ec3ab4fde426d Mon Sep 17 00:00:00 2001 From: kat witch Date: Sat, 7 Aug 2021 03:40:02 +0100 Subject: [PATCH] Moved hardware system to fancier importer --- config/profiles/hardware/default.nix | 16 ++++++---------- .../{ms-7b86 => ms-7b86-base}/default.nix | 0 .../hardware/{rm-310 => rm-310-base}/default.nix | 0 .../{v330-14arr => v330-14arr-base}/default.nix | 0 4 files changed, 6 insertions(+), 10 deletions(-) rename config/profiles/hardware/{ms-7b86 => ms-7b86-base}/default.nix (100%) rename config/profiles/hardware/{rm-310 => rm-310-base}/default.nix (100%) rename config/profiles/hardware/{v330-14arr => v330-14arr-base}/default.nix (100%) diff --git a/config/profiles/hardware/default.nix b/config/profiles/hardware/default.nix index f0c52bcf..238403c6 100644 --- a/config/profiles/hardware/default.nix +++ b/config/profiles/hardware/default.nix @@ -1,12 +1,7 @@ -rec { - ms-7b86-base = ./ms-7b86; - v330-14arr-base = ./v330-14arr; - rm-310-base = ./rm-310; - hcloud-imperative = ./hcloud-imperative; - ryzen = ./ryzen; - intel = ./intel; - amdgpu = ./amdgpu; - +let hardwareProfiles = { lib }: +let profiles = with profiles; lib.modList { + modulesDir = ./.; +} // { ms-7b86 = { imports = [ ms-7b86-base @@ -27,4 +22,5 @@ rec { intel ]; }; -} +}; in profiles; +in { __functor = self: hardwareProfiles; isModule = false; } diff --git a/config/profiles/hardware/ms-7b86/default.nix b/config/profiles/hardware/ms-7b86-base/default.nix similarity index 100% rename from config/profiles/hardware/ms-7b86/default.nix rename to config/profiles/hardware/ms-7b86-base/default.nix diff --git a/config/profiles/hardware/rm-310/default.nix b/config/profiles/hardware/rm-310-base/default.nix similarity index 100% rename from config/profiles/hardware/rm-310/default.nix rename to config/profiles/hardware/rm-310-base/default.nix diff --git a/config/profiles/hardware/v330-14arr/default.nix b/config/profiles/hardware/v330-14arr-base/default.nix similarity index 100% rename from config/profiles/hardware/v330-14arr/default.nix rename to config/profiles/hardware/v330-14arr-base/default.nix