diff --git a/README.md b/README.md index c9b80cb9..6e9d9a92 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,9 @@ See code for all available configurations. | [Lenovo ThinkPad T14 AMD Gen 4](lenovo/thinkpad/t14/amd/gen4) | `` | `lenovo-thinkpad-t14-amd-gen4` | | [Lenovo ThinkPad T14 AMD Gen 5](lenovo/thinkpad/t14/amd/gen5) | `` | `lenovo-thinkpad-t14-amd-gen5` | | [Lenovo ThinkPad T14](lenovo/thinkpad/t14) | `` | `lenovo-thinkpad-t14` | -| [Lenovo ThinkPad T14 Intel Gen 6](lenovo/thinkpad/t14/intel/gen6) | `` | `lenovo-thinkpad-t14-intel-gen6` | +| [Lenovo ThinkPad T14 Intel Gen 1](lenovo/thinkpad/t14/intel/gen1) | `` | `lenovo-thinkpad-t14-intel-gen1` | +| [Lenovo ThinkPad T14 Intel Gen 1 (Nvidia)](lenovo/thinkpad/t14/intel/gen1/nvidia) | ``| `lenovo-thinkpad-t14-intel-gen1-nvidia` | +| [Lenovo ThinkPad T14 Intel Gen 6](lenovo/thinkpad/t14/intel/gen6) | `` | `lenovo-thinkpad-t14-intel-gen6` | | [Lenovo ThinkPad T14s AMD Gen 1](lenovo/thinkpad/t14s/amd/gen1) | `` | `lenovo-thinkpad-t14s-amd-gen1` | | [Lenovo ThinkPad T14s AMD Gen 4](lenovo/thinkpad/t14s/amd/gen4) | `` | `lenovo-thinkpad-t14s-amd-gen4` | | [Lenovo ThinkPad T14s](lenovo/thinkpad/t14s) | `` | `lenovo-thinkpad-t14s` | diff --git a/flake.nix b/flake.nix index 7cfe53df..d0c099c7 100644 --- a/flake.nix +++ b/flake.nix @@ -234,6 +234,8 @@ lenovo-thinkpad-t14-amd-gen3 = import ./lenovo/thinkpad/t14/amd/gen3; lenovo-thinkpad-t14-amd-gen4 = import ./lenovo/thinkpad/t14/amd/gen4; lenovo-thinkpad-t14-amd-gen5 = import ./lenovo/thinkpad/t14/amd/gen5; + lenovo-thinkpad-t14-intel-gen1 = import ./lenovo/thinkpad/t14/intel/gen1; + lenovo-thinkpad-t14-intel-gen1-nvidia = import ./lenovo/thinkpad/t14/intel/gen1/nvidia; lenovo-thinkpad-t14-intel-gen6 = import ./lenovo/thinkpad/t14/intel/gen6; lenovo-thinkpad-t14s = import ./lenovo/thinkpad/t14s; lenovo-thinkpad-t14s-amd-gen1 = import ./lenovo/thinkpad/t14s/amd/gen1; diff --git a/lenovo/thinkpad/t14/intel/gen1/default.nix b/lenovo/thinkpad/t14/intel/gen1/default.nix new file mode 100644 index 00000000..efe407d3 --- /dev/null +++ b/lenovo/thinkpad/t14/intel/gen1/default.nix @@ -0,0 +1,8 @@ +{ lib, config, ... }: +{ + imports = [ + ../../../../../common/cpu/intel/comet-lake + + ../. + ]; +} diff --git a/lenovo/thinkpad/t14/intel/gen1/nvidia/default.nix b/lenovo/thinkpad/t14/intel/gen1/nvidia/default.nix new file mode 100644 index 00000000..178b2254 --- /dev/null +++ b/lenovo/thinkpad/t14/intel/gen1/nvidia/default.nix @@ -0,0 +1,28 @@ +{ lib, config, ... }: +{ + imports = [ + ../../../../../../common/gpu/nvidia/pascal + ../../../../../../common/gpu/nvidia/prime-sync.nix + + ../. + ]; + hardware = { + graphics = { + enable = lib.mkDefault true; + enable32Bit = lib.mkDefault true; + }; + nvidia = { + powerManagement.enable = lib.mkDefault true; + modesetting.enable = lib.mkDefault true; + + dynamicBoost.enable = lib.mkForce false; # Dynamic boost is not supported on Pascal architeture + prime = { + # 00:02.0 VGA compatible controller: Intel Corporation CometLake-U GT2 [UHD Graphics] (rev 02) + intelBusId = lib.mkDefault "PCI:0:2:0"; + # 2d:00.0 3D controller: NVIDIA Corporation GP108M [GeForce MX330] (rev a1) + nvidiaBusId = lib.mkDefault "PCI:45:0:0"; + }; + }; + }; + services.thermald.enable = lib.mkDefault true; +}