eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-26 19:49:45 +01:00
Code Issues Releases Wiki Activity

Merge branch 'NixOS:master' into master

Browse source
This commit is contained in:
cgrohs20 2024-12-02 22:58:03 +00:00 committed by GitHub
commit 2aabc0afc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 47 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -199,7 +199,7 @@ See code for all available configurations.
| [Lenovo IdeaPad Z510](lenovo/ideapad/z510) | `<nixos-hardware/lenovo/ideapad/z510>` |
| [Lenovo IdeaPad Slim 5](lenovo/ideapad/slim-5) | `<nixos-hardware/lenovo/ideapad/slim-5>` |
| [Lenovo IdeaPad Slim 5 16iah8](lenovo/ideapad/16iah8) | `<nixos-hardware/lenovo/ideapad/16iah8` |
| [Lenovo IdeaPad 2-in-1 16ahp9](lenovo/ideapad/16ah09) | `<nixos-hardware/lenovo/ideapad/16ahp9` |
| [Lenovo IdeaPad 2-in-1 16ahp9](lenovo/ideapad/16ahp09) | `<nixos-hardware/lenovo/ideapad/16ahp9` |
| [Lenovo IdeaPad S145 15api](lenovo/ideapad/s145-15api) | `<nixos-hardware/lenovo/ideapad/s145-15api>` |
| [Lenovo Legion 5 15ach6h](lenovo/legion/15ach6h) | `<nixos-hardware/lenovo/legion/15ach6h>` |
| [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h) | `<nixos-hardware/lenovo/legion/15arh05h>` |

1
apple/imac/18-2/default.nix
View file

@ -10,7 +10,6 @@
../../../common/gpu/amd
../../../common/hidpi.nix
../../../common/pc/laptop/ssd
../../../common/pc/laptop/acpi_call.nix
];
# apple smc (TODO: check spi)

1
apple/macbook-pro/14-1/default.nix
View file

@ -9,7 +9,6 @@
../../../common/cpu/intel/kaby-lake
../../../common/hidpi.nix
../../../common/pc/laptop/ssd
../../../common/pc/laptop/acpi_call.nix
];
# Make the keyboard work in stage1, enable iommu

1
asus/zephyrus/ga402x/shared.nix
View file

@ -16,7 +16,6 @@ in {
../../../common/cpu/amd/pstate.nix
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/ssd
];

10
common/pc/laptop/acpi_call.nix
View file

@ -1,10 +0,0 @@
# acpi_call makes tlp work for newer thinkpads
{ config, lib, ... }:
{
boot = lib.mkIf config.services.tlp.enable {
kernelModules = [ "acpi_call" ];
extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
};
}

29
dell/precision/5530/default.nix
View file

@ -1,11 +1,16 @@
{ lib, config, ... }:
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/gpu/nvidia/pascal
../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel/coffee-lake
];
boot.kernelParams = [
boot = {
kernelParams = [
# fix lspci hanging with nouveau
# source https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803179/comments/149
"acpi_rev_override=1"
@ -18,5 +23,25 @@
# fix flicker
# source https://wiki.archlinux.org/index.php/Intel_graphics#Screen_flickering
"i915.enable_psr=0"
"nvidia_drm.modeset=1"
];
};
hardware = {
nvidia = {
open = lib.mkDefault false;
nvidiaSettings = lib.mkDefault true;
modesetting.enable = lib.mkDefault true;
package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.stable;
prime = {
intelBusId = lib.mkDefault "PCI:0:2:0";
nvidiaBusId = lib.mkDefault "PCI:1:0:0";
};
};
};
# This will save you money and possibly your life!
services = {
fwupd.enable = lib.mkDefault true;
thermald.enable = lib.mkDefault true;
};
}

1
dell/xps/13-9300/default.nix
View file

@ -7,7 +7,6 @@ in {
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/ssd
../sleep-resume/i2c-designware
];

1
dell/xps/13-9370/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
];
# Force S3 sleep mode. See README.wiki for details.

1
dell/xps/13-9380/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
];
# Force S3 sleep mode. See README.wiki for details.

3
flake.nix
View file

@ -151,6 +151,7 @@
lenovo-legion-16arha7 = import ./lenovo/legion/16arha7;
lenovo-legion-16ithg6 = import ./lenovo/legion/16ithg6;
lenovo-legion-16irx8h = import ./lenovo/legion/16irx8h;
lenovo-legion-16irx9h = import ./lenovo/legion/16irx9h;
lenovo-legion-t526amr5 = import ./lenovo/legion/t526amr5;
lenovo-legion-y530-15ich = import ./lenovo/legion/15ich;
lenovo-thinkpad = import ./lenovo/thinkpad;
@ -330,7 +331,7 @@
common-pc = import ./common/pc;
common-pc-hdd = import ./common/pc/hdd;
common-pc-laptop = import ./common/pc/laptop;
common-pc-laptop-acpi_call = import ./common/pc/laptop/acpi_call.nix;
common-pc-laptop-acpi_call = throw "common-pc-laptop-acpi_call has been removed because it is obsolete: https://github.com/NixOS/nixos-hardware/issues/1114";
common-pc-laptop-hdd = import ./common/pc/laptop/hdd;
common-pc-laptop-ssd = import ./common/pc/ssd;
common-pc-ssd = import ./common/pc/ssd;

2
focus/m2/gen1/default.nix
View file

@ -6,7 +6,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/turing
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
gc
../../../common/pc/laptop/ssd
];

1
hp/elitebook/830/g6/default.nix
View file

@ -3,7 +3,6 @@
imports = [
../../../../common/cpu/intel
../../../../common/pc/laptop
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
hp/elitebook/845/g7/default.nix
View file

@ -7,7 +7,6 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
hp/elitebook/845/g8/default.nix
View file

@ -7,7 +7,6 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
hp/elitebook/845/g9/default.nix
View file

@ -7,7 +7,6 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
lenovo/ideapad/15alc6/default.nix
View file

@ -5,7 +5,6 @@
../../../common/cpu/amd
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];
}

1
lenovo/ideapad/15arh05/default.nix
View file

@ -6,7 +6,6 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/turing
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/ideapad/slim-5/default.nix
View file

@ -3,7 +3,6 @@
../../../common/cpu/amd
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];
}

1
lenovo/thinkpad/a475/default.nix
View file

@ -4,7 +4,6 @@
../../../common/gpu/amd
../../../common/cpu/amd
../../../common/cpu/amd/pstate.nix
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/ssd
../../../common/pc/laptop/hdd
#../../../common/hidpi.nix #hidpi

1
lenovo/thinkpad/e14/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/laptop/acpi_call.nix
];
boot.kernelParams = [

1
lenovo/thinkpad/l13/default.nix
View file

@ -2,7 +2,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
../.
];

1
lenovo/thinkpad/l14/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/laptop/acpi_call.nix
];
boot.kernelParams = [

1
lenovo/thinkpad/p1/default.nix
View file

@ -4,7 +4,6 @@
# might need nvidia module but we don't know the PCI ids:
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
#../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/p14s/default.nix
View file

@ -6,7 +6,6 @@
imports = [
../.
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/p50/default.nix
View file

@ -3,7 +3,6 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/maxwell
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/p51/default.nix
View file

@ -4,7 +4,6 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/maxwell
../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/p52/default.nix
View file

@ -4,7 +4,6 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/pascal
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/p53/default.nix
View file

@ -2,7 +2,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/t14/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
../.
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/t14s/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
../.
../../../common/pc/laptop/acpi_call.nix
];
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.

1
lenovo/thinkpad/t420/default.nix
View file

@ -3,6 +3,5 @@
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}

1
lenovo/thinkpad/t430/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
];
boot = {

1
lenovo/thinkpad/t440s/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
];
boot = {

1
lenovo/thinkpad/t450s/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t460/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t460p/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t460s/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t470s/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t480/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/ssd
../.
];

1
lenovo/thinkpad/t480s/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/ssd
../.
];

1
lenovo/thinkpad/t490/default.nix
View file

@ -2,7 +2,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/t495/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../.
../../../common/cpu/amd
../../../common/pc/laptop/acpi_call.nix
];
# Force use of the thinkpad_acpi driver for backlight control.

1
lenovo/thinkpad/t520/default.nix
View file

@ -3,6 +3,5 @@
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}

1
lenovo/thinkpad/t550/default.nix
View file

@ -1,7 +1,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];
}

1
lenovo/thinkpad/t590/default.nix
View file

@ -3,7 +3,6 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../.
];

1
lenovo/thinkpad/w520/default.nix
View file

@ -3,6 +3,5 @@
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}

1
lenovo/thinkpad/x1-nano/default.nix
View file

@ -3,7 +3,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];
}

1
lenovo/thinkpad/x1/6th-gen/default.nix
View file

@ -10,7 +10,6 @@
imports = [
../.
../../../../common/cpu/intel/kaby-lake
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/x1/7th-gen/default.nix
View file

@ -2,7 +2,6 @@
{
imports = [
../.
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/x13/common.nix
View file

@ -1,7 +1,6 @@
{ ... }: {
imports = [
../.
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/x230/default.nix
View file

@ -5,7 +5,6 @@
../.
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
];
boot = {

1
lenovo/thinkpad/x250/default.nix
View file

@ -2,6 +2,5 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
];
}

1
lenovo/thinkpad/x260/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
];
boot.kernelParams = [

1
lenovo/thinkpad/x270/default.nix
View file

@ -2,7 +2,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/thinkpad/x280/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd/default.nix
];

1
lenovo/thinkpad/x390/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd/default.nix
];

1
lenovo/thinkpad/z/default.nix
View file

@ -5,7 +5,6 @@
../../../common/cpu/amd/pstate.nix
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];

1
lenovo/yoga/7/14ARH7/shared.nix
View file

@ -7,7 +7,6 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/ssd
];