From 13d6cbde4dc271aa35747c5cee4926280c330a26 Mon Sep 17 00:00:00 2001 From: mexisme Date: Mon, 22 Jul 2024 00:10:45 +1200 Subject: [PATCH] Create asus-zephyrus-ga402x-amdgpu and asus-zephyrus-ga402x-nvidia entries - Previous attr-set style providing "amdgpu" and "nvidia" is broken by PR #1046 - Add deprecation assertion for asus-zephyrus-ga402x --- asus/zephyrus/ga402x/default.nix | 19 +++++++------------ flake.nix | 2 ++ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/asus/zephyrus/ga402x/default.nix b/asus/zephyrus/ga402x/default.nix index 7e49eb6..a77e24d 100644 --- a/asus/zephyrus/ga402x/default.nix +++ b/asus/zephyrus/ga402x/default.nix @@ -1,15 +1,10 @@ -## When using from a Flake, you can access these via imports of the attr key, e.g: -# -# imports = [ -# nixos-hardware.nixosModules.asus-zephyrus-ga402x.amdgpu -# ]; -# -## or: -# imports = [ -# nixos-hardware.nixosModules.asus-zephyrus-ga402x.nvidia -# ]; +{ ... }: { - amdgpu = import ./amdgpu; - nvidia = import ./nvidia; + assertions = [ + { + assertion = false; + message = "Importing asus/zephyrus/ga402x/ (default.nix) directly is deprecated! #TODO: More details"; + } + ]; } diff --git a/flake.nix b/flake.nix index 64d4913..3754e48 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,8 @@ asus-zephyrus-ga401 = import ./asus/zephyrus/ga401; asus-zephyrus-ga402 = import ./asus/zephyrus/ga402; asus-zephyrus-ga402x = import ./asus/zephyrus/ga402x; + asus-zephyrus-ga402x-amdgpu = import ./asus/zephyrus/ga402x/amdgpu; + asus-zephyrus-ga402x-nvidia = import ./asus/zephyrus/ga402x/nvidia; asus-zephyrus-ga502 = import ./asus/zephyrus/ga502; asus-zephyrus-ga503 = import ./asus/zephyrus/ga503; asus-zephyrus-gu603h = import ./asus/zephyrus/gu603h;