mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-11-23 11:29:42 +01:00
Merge branch 'master' of github.com:NixOS/nixos-hardware into microsoft/surface/firmware-surface-go
This commit is contained in:
mexisme
commit
77aa0ff827
5 changed files with 44 additions and 4 deletions
|
|
@ -39,7 +39,7 @@ There is also experimental flake support. In your `/etc/nixos/flake.nix` add the
|
|||
# ...
|
||||
modules = [
|
||||
# ...
|
||||
# add your model from this list: https://github.com/NixOS/nixos-hardware/blob/flakes/flake.nix
|
||||
# add your model from this list: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
|
||||
nixos-hardware.nixosModules.dell-xps-13-9380
|
||||
];
|
||||
};
|
||||
|
|
@ -53,12 +53,12 @@ There is also experimental flake support. In your `/etc/nixos/flake.nix` add the
|
|||
You can fetch the git repository directly:
|
||||
|
||||
```nix
|
||||
imports = [
|
||||
imports = [
|
||||
"${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/lenovo/thinkpad/x220"
|
||||
];
|
||||
```
|
||||
|
||||
Unlike the channel, this will update the git repository on a rebuild. However,
|
||||
Unlike the channel, this will update the git repository on a rebuild. However,
|
||||
you can easily pin to a particular revision if you desire more stability.
|
||||
|
||||
## List of Profiles
|
||||
|
|
@ -87,6 +87,7 @@ See code for all available configurations.
|
|||
| [Dell XPS 13 9380][] | `<nixos-hardware/dell/xps/13-9380>` |
|
||||
| [Dell XPS 15 7590][] | `<nixos-hardware/dell/xps/15-7590>` |
|
||||
| [Dell XPS 15 9550][] | `<nixos-hardware/dell/xps/15-9550>` |
|
||||
| [Dell XPS 15 9550, nvidia][] | `<nixos-hardware/dell/xps/15-9550/nvidia>` |
|
||||
| [Dell XPS 15 9560][] | `<nixos-hardware/dell/xps/15-9560>` |
|
||||
| [Dell XPS 15 9560, intel only][] | `<nixos-hardware/dell/xps/15-9560/intel>` |
|
||||
| [Dell XPS 15 9560, nvidia only][] | `<nixos-hardware/dell/xps/15-9560/nvidia>` |
|
||||
|
|
@ -116,6 +117,7 @@ See code for all available configurations.
|
|||
| Lenovo ThinkPad T480s | `<nixos-hardware/lenovo/thinkpad/t480s>` |
|
||||
| Lenovo ThinkPad T490 | `<nixos-hardware/lenovo/thinkpad/t490>` |
|
||||
| Lenovo ThinkPad T495 | `<nixos-hardware/lenovo/thinkpad/t495>` |
|
||||
| Lenovo ThinkPad X113 Yoga | `<nixos-hardware/lenovo/thinkpad/x13-yoga>` |
|
||||
| Lenovo ThinkPad X140e | `<nixos-hardware/lenovo/thinkpad/x140e>` |
|
||||
| Lenovo ThinkPad X220 | `<nixos-hardware/lenovo/thinkpad/x220>` |
|
||||
| Lenovo ThinkPad X230 | `<nixos-hardware/lenovo/thinkpad/x230>` |
|
||||
|
|
@ -156,6 +158,7 @@ See code for all available configurations.
|
|||
[Inverse Path USB armory]: inversepath/usbarmory
|
||||
[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen
|
||||
[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen
|
||||
[Lenovo ThinkPad X13 Yoga]: lenovo/thinkpad/x13-yoga
|
||||
[Lenovo ThinkPad X260]: lenovo/thinkpad/x260
|
||||
[Microsoft Surface Pro 3]: microsoft/surface-pro/3
|
||||
[Raspberry Pi 2]: raspberry-pi/2
|
||||
|
|
|
|||
|
|
@ -5,12 +5,19 @@ Most of this I presume also applies to the XPS 13 1530, the 13" variant.
|
|||
== Tested Hardware ==
|
||||
|
||||
* CPU: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz
|
||||
* RAM: 16 GB
|
||||
* RAM: 32 GB
|
||||
* HDD: 512 GiB SSD
|
||||
* Screen: 15" 4k (3840✕2160)
|
||||
* Graphics: NVIDIA Corporation GM107M, with Intel Graphics too.
|
||||
* Input: Touchscreen and trackpad.
|
||||
|
||||
== NVIDIA Offload ==
|
||||
|
||||
In order to run a program on the NVIDIA gpu, you can use the `nvidia-offload` function, for example:
|
||||
```
|
||||
nvidia-offload `nix-shell -p glxinfo --run 'glxgears'`
|
||||
```
|
||||
This is a short bash script that sets the proper environment variables and calls your command.
|
||||
|
||||
== Firmware Configuration ==
|
||||
|
||||
|
|
|
|||
15
dell/xps/15-9550/nvidia/default.nix
Normal file
15
dell/xps/15-9550/nvidia/default.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../default.nix
|
||||
../../../../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";
|
||||
};
|
||||
}
|
||||
|
|
@ -22,6 +22,7 @@
|
|||
dell-xps-13-9380 = import ./dell/xps/13-9380;
|
||||
dell-xps-15-7590 = import ./dell/xps/15-7590;
|
||||
dell-xps-15-9550 = import ./dell/xps/15-9550;
|
||||
dell-xps-15-9550-nvidia = import ./dell/xps/15-9550/nvidia;
|
||||
dell-xps-15-9560 = import ./dell/xps/15-9560;
|
||||
dell-xps-15-9560-intel = import ./dell/xps/15-9560/intel;
|
||||
dell-xps-15-9560-nvidia = import ./dell/xps/15-9560/nvidia;
|
||||
|
|
@ -61,6 +62,7 @@
|
|||
lenovo-thinkpad-x1-6th-gen = import ./lenovo/thinkpad/x1/6th-gen;
|
||||
lenovo-thinkpad-x1-7th-gen = import ./lenovo/thinkpad/x1/7th-gen;
|
||||
lenovo-thinkpad-x1-extreme = import ./lenovo/thinkpad/x1-extreme;
|
||||
lenovo-thinkpad-x13-yoga = import ./lenovo/thinkpad/x13-yoga;
|
||||
microsoft-surface = import ./microsoft/surface;
|
||||
microsoft-surface-pro-3 = import ./microsoft/surface-pro/3;
|
||||
pcengines-apu = import ./pcengines/apu;
|
||||
|
|
|
|||
13
lenovo/thinkpad/x13-yoga/default.nix
Normal file
13
lenovo/thinkpad/x13-yoga/default.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ config, lib, ... }: {
|
||||
imports = [
|
||||
../.
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop/acpi_call.nix
|
||||
../../../common/pc/laptop/ssd
|
||||
];
|
||||
|
||||
# automatic screen orientation
|
||||
hardware.sensor.iio.enable = true;
|
||||
|
||||
services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable;
|
||||
}
|
||||
Loading…
Reference in a new issue