Merge pull request #880 from jalseth/x13-amd

Add Thinkpad X13 Gen1 AMD variant

lenovo/thinkpad/x13/OLD-BEHAVIOUR-DEPRECATED.md

@@ -0,0 +1,12 @@
+# Thinkpad X13 Deprecations
+
+## Overview
+
+The X13 has multiple variants. Originally, the configs only supported Intel
+hardware.
+
+## How to update
+
+If you previously imported the module under `lenovo/thinkpad/x13`, you can now
+import `lenovo/thinkpad/x13/intel` instead. Users with the AMD variant should
+import `lenovo/thinkpad/x13/amd`.

lenovo/thinkpad/x13/amd/default.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ../common.nix
+    ../../../../common/cpu/amd
+  ];
+}

lenovo/thinkpad/x13/common.nix

@@ -0,0 +1,10 @@
+{ ... }: {
+  imports = [
+    ../.
+    ../../../common/pc/laptop/acpi_call.nix
+    ../../../common/pc/laptop/ssd
+  ];
+
+  # Somehow psmouse does not load automatically on boot for me
+  boot.initrd.kernelModules = [ "psmouse" ];
+}

lenovo/thinkpad/x13/default.nix

@@ -1,12 +1,8 @@
-{ ... }: {
-  # Reference to hardware: https://certification.ubuntu.com/hardware/202004-27844
-  imports = [
-    ../.
-    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
-    ../../../common/pc/laptop/ssd
+{
+  assertions = [
+    {
+      assertion = false;
+      message = "Importing the x13/ (default.nix) directly is deprecated! See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/x13/OLD-BEHAVIOUR-DEPRECATED.md for more details.";
+    }
   ];
-
-  # Somehow psmouse does not load automatically on boot for me
-  boot.initrd.kernelModules = [ "psmouse" ];
 }

lenovo/thinkpad/x13/intel/default.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  # Reference to hardware: https://certification.ubuntu.com/hardware/202004-27844
+  imports = [
+    ../common.nix
+    ../../../../common/cpu/intel
+  ];
+}

lenovo/thinkpad/x13/yoga/default.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }: {
   imports = [
-    ../.
+    ../intel
     ../../yoga.nix
   ];