1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-27 12:09:45 +01:00

Merge branch 'NixOS:master' into master

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

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 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](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 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 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 15ach6h](lenovo/legion/15ach6h) | `<nixos-hardware/lenovo/legion/15ach6h>` |
| [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h) | `<nixos-hardware/lenovo/legion/15arh05h>` | | [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h) | `<nixos-hardware/lenovo/legion/15arh05h>` |

View file

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

View file

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

View file

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

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 ];
};
}

View file

@ -1,11 +1,16 @@
{ lib, config, ... }:
{ {
imports = [ imports = [
../../../common/cpu/intel
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../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 # fix lspci hanging with nouveau
# source https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803179/comments/149 # source https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803179/comments/149
"acpi_rev_override=1" "acpi_rev_override=1"
@ -18,5 +23,25 @@
# fix flicker # fix flicker
# source https://wiki.archlinux.org/index.php/Intel_graphics#Screen_flickering # source https://wiki.archlinux.org/index.php/Intel_graphics#Screen_flickering
"i915.enable_psr=0" "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;
};
} }

View file

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

View file

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

View file

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

View file

@ -151,6 +151,7 @@
lenovo-legion-16arha7 = import ./lenovo/legion/16arha7; lenovo-legion-16arha7 = import ./lenovo/legion/16arha7;
lenovo-legion-16ithg6 = import ./lenovo/legion/16ithg6; lenovo-legion-16ithg6 = import ./lenovo/legion/16ithg6;
lenovo-legion-16irx8h = import ./lenovo/legion/16irx8h; lenovo-legion-16irx8h = import ./lenovo/legion/16irx8h;
lenovo-legion-16irx9h = import ./lenovo/legion/16irx9h;
lenovo-legion-t526amr5 = import ./lenovo/legion/t526amr5; lenovo-legion-t526amr5 = import ./lenovo/legion/t526amr5;
lenovo-legion-y530-15ich = import ./lenovo/legion/15ich; lenovo-legion-y530-15ich = import ./lenovo/legion/15ich;
lenovo-thinkpad = import ./lenovo/thinkpad; lenovo-thinkpad = import ./lenovo/thinkpad;
@ -330,7 +331,7 @@
common-pc = import ./common/pc; common-pc = import ./common/pc;
common-pc-hdd = import ./common/pc/hdd; common-pc-hdd = import ./common/pc/hdd;
common-pc-laptop = import ./common/pc/laptop; 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-hdd = import ./common/pc/laptop/hdd;
common-pc-laptop-ssd = import ./common/pc/ssd; common-pc-laptop-ssd = import ./common/pc/ssd;
common-pc-ssd = import ./common/pc/ssd; common-pc-ssd = import ./common/pc/ssd;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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