From 56bb7c93b35ffb0d6a6f8dde01bc30d029893825 Mon Sep 17 00:00:00 2001 From: 4JX <79868816+4JX@users.noreply.github.com> Date: Wed, 23 Nov 2022 20:36:56 +0100 Subject: [PATCH 1/3] Add Lenovo Legion 5 Pro Gen 6 --- README.md | 1 + flake.nix | 1 + lenovo/legion/16ach6h/default.nix | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 lenovo/legion/16ach6h/default.nix diff --git a/README.md b/README.md index 528aa68..a239618 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ See code for all available configurations. | [Lenovo IdeaPad Z510](lenovo/ideapad/z510) | `` | | [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h) | `` | | [Lenovo Legion 7 Slim 15ach6](lenovo/legion/15ach6) | `` | +| [Lenovo Legion 5 Pro 16ach6h](lenovo/legion/16ach6h) | `` | | [Lenovo ThinkPad E14 (AMD)](lenovo/thinkpad/e14/amd) | `` | | [Lenovo ThinkPad E14 (Intel)](lenovo/thinkpad/e14/intel) | `` | | [Lenovo ThinkPad E470](lenovo/thinkpad/e470) | `` | diff --git a/flake.nix b/flake.nix index c18d993..602d2dc 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,7 @@ lenovo-ideapad-z510 = import ./lenovo/ideapad/z510; lenovo-legion-15ach6 = import ./lenovo/legion/15ach6; lenovo-legion-15arh05h = import ./lenovo/legion/15arh05h; + lenovo-legion-16ach6h = import ./lenovo/legion/16ach6h; lenovo-legion-16ithg6 = import ./lenovo/legion/16ithg6; lenovo-thinkpad = import ./lenovo/thinkpad; lenovo-thinkpad-e14-amd = import ./lenovo/thinkpad/e14/amd; diff --git a/lenovo/legion/16ach6h/default.nix b/lenovo/legion/16ach6h/default.nix new file mode 100644 index 0000000..fae288d --- /dev/null +++ b/lenovo/legion/16ach6h/default.nix @@ -0,0 +1,18 @@ +{ lib, config, ... }: +let kernelPackages = config.boot.kernelPackages; +in { + imports = [ + ../../../common/cpu/amd + ../../../common/gpu/amd + ../../../common/gpu/nvidia/prime.nix + ../../../common/pc/laptop + ../../../common/pc/laptop/ssd + ]; + + hardware.nvidia.prime = { + amdgpuBusId = "PCI:6:0:0"; + nvidiaBusId = "PCI:1:0:0"; + }; + + services.thermald.enable = lib.mkDefault true; +} From 776287c48330090d26d51c0f0d7dcedd9aeedf98 Mon Sep 17 00:00:00 2001 From: 4JX <79868816+4JX@users.noreply.github.com> Date: Thu, 24 Nov 2022 00:12:24 +0100 Subject: [PATCH 2/3] Add some data about the device used --- lenovo/legion/16ach6h/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 lenovo/legion/16ach6h/README.md diff --git a/lenovo/legion/16ach6h/README.md b/lenovo/legion/16ach6h/README.md new file mode 100644 index 0000000..cf489fa --- /dev/null +++ b/lenovo/legion/16ach6h/README.md @@ -0,0 +1,19 @@ +## Setup at the time of testing +``` +$ nix-info -m + - system: `"x86_64-linux"` + - host os: `Linux 6.0.9, NixOS, 22.11 (Raccoon), 22.11beta19.c9538a9b707` + - multi-user?: `yes` + - sandbox: `yes` + - version: `nix-env (Nix) 2.11.0` + - channels(root): `"nixos-22.11"` + - nixpkgs: `/nix/var/nix/profiles/per-user/root/channels/nixos` + ``` + ``` + $ lspci +... +01:00.0 VGA compatible controller: NVIDIA Corporation GA104M [GeForce RTX 3070 Mobile / Max-Q] (rev a1) +... +06:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Cezanne (rev c5) +... +``` \ No newline at end of file From b441875a5068472e8ee25e3ed237c0be271fa4e7 Mon Sep 17 00:00:00 2001 From: 4JX <79868816+4JX@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:39:20 +0100 Subject: [PATCH 3/3] Apply suggestion --- lenovo/legion/16ach6h/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lenovo/legion/16ach6h/default.nix b/lenovo/legion/16ach6h/default.nix index fae288d..db13b9f 100644 --- a/lenovo/legion/16ach6h/default.nix +++ b/lenovo/legion/16ach6h/default.nix @@ -1,6 +1,6 @@ -{ lib, config, ... }: -let kernelPackages = config.boot.kernelPackages; -in { +{ lib, ... }: + +{ imports = [ ../../../common/cpu/amd ../../../common/gpu/amd