Merge pull request #192 from hoppla20/master

This commit is contained in:
Jörg Thalheim 2020-10-12 04:53:07 +02:00 committed by GitHub
commit 55acbf7497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions

View file

@ -94,6 +94,7 @@ See code for all available configurations.
| [Google Pixelbook][] | `<nixos-hardware/google/pixelbook>` |
| [Inverse Path USB armory][] | `<nixos-hardware/inversepath/usbarmory>` |
| Lenovo IdeaPad Z510 | `<nixos-hardware/lenovo/ideapad/z510>` |
| Lenovo ThinkPad E470 | `<nixos-hardware/lenovo/thinkpad/e470>`
| Lenovo ThinkPad E495 | `<nixos-hardware/lenovo/thinkpad/e495>` |
| Lenovo ThinkPad L13 | `<nixos-hardware/lenovo/thinkpad/l13>` |
| Lenovo ThinkPad P53 | `<nixos-hardware/lenovo/thinkpad/p53>` |
@ -159,5 +160,5 @@ See code for all available configurations.
## How to contribute a new device profile
1. Add your device profile expression in the appropriate directory
2. Link it in the table in README.md
2. Link it in the table in README.md and in flake.nix
3. Run ./tests/run.py to test it. The test script script will parse all the profiles from the README.md

View file

@ -28,6 +28,7 @@
google-pixelbook = import ./google/pixelbook;
inversepath-usbarmory = import ./inversepath/usbarmory;
lenovo-ideapad-z510 = import ./lenovo/ideapad/z510;
lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470;
lenovo-thinkpad-e495 = import ./lenovo/thinkpad/e495;
lenovo-thinkpad-l13 = import ./lenovo/thinkpad/l13;
lenovo-thinkpad-p53 = import ./lenovo/thinkpad/p53;

View file

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }:
{
imports = [
../.
../../../common/cpu/intel/kaby-lake
../../../common/gpu/nvidia.nix
];
hardware.nvidia.prime = {
# Bus ID of the Intel GPU.
intelBusId = lib.mkDefault "PCI:0:2:0";
# Bus ID of the NVIDIA GPU.
nvidiaBusId = lib.mkDefault "PCI:1:0:0";
};
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.6") pkgs.linuxPackages_latest;
}