drop acpi_call from nixos-hardware

fixes https://github.com/NixOS/nixos-hardware/issues/1114 and tlp also no longer recommands it.
2025-11-03 16:57:14 +08:00 · 2024-12-02 12:29:38 +01:00
parent fe01780d35
commit c6c90887f8
56 changed files with 5 additions and 68 deletions
--- a/lenovo/thinkpad/a475/default.nix
+++ b/lenovo/thinkpad/a475/default.nix
@@ -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
--- a/lenovo/thinkpad/e14/default.nix
+++ b/lenovo/thinkpad/e14/default.nix
@@ -4,7 +4,6 @@
  imports = [
    ../.
    ../../../common/pc/laptop/ssd
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/l13/default.nix
+++ b/lenovo/thinkpad/l13/default.nix
@@ -2,7 +2,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
    ../.
  ];
--- a/lenovo/thinkpad/l14/default.nix
+++ b/lenovo/thinkpad/l14/default.nix
@@ -2,7 +2,6 @@
  imports = [
    ../.
    ../../../common/pc/laptop/ssd
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/p1/default.nix
+++ b/lenovo/thinkpad/p1/default.nix
@@ -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
  ];

--- a/lenovo/thinkpad/p14s/default.nix
+++ b/lenovo/thinkpad/p14s/default.nix
@@ -6,7 +6,6 @@

  imports = [
    ../.
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
  ];

--- a/lenovo/thinkpad/p50/default.nix
+++ b/lenovo/thinkpad/p50/default.nix
@@ -3,7 +3,6 @@
    ../../../common/gpu/nvidia/prime.nix
    ../../../common/gpu/nvidia/maxwell
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];

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

--- a/lenovo/thinkpad/p52/default.nix
+++ b/lenovo/thinkpad/p52/default.nix
@@ -4,7 +4,6 @@
    ../../../common/gpu/nvidia/prime.nix
    ../../../common/gpu/nvidia/pascal
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];

--- a/lenovo/thinkpad/p53/default.nix
+++ b/lenovo/thinkpad/p53/default.nix
@@ -2,7 +2,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];

--- a/lenovo/thinkpad/t14/default.nix
+++ b/lenovo/thinkpad/t14/default.nix
@@ -3,7 +3,6 @@
 {
  imports = [
    ../.
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
  ];

--- a/lenovo/thinkpad/t14s/default.nix
+++ b/lenovo/thinkpad/t14s/default.nix
@@ -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.
--- a/lenovo/thinkpad/t420/default.nix
+++ b/lenovo/thinkpad/t420/default.nix
@@ -3,6 +3,5 @@
    ../.
    ../tp-smapi.nix
    ../../../common/cpu/intel/sandy-bridge
-    ../../../common/pc/laptop/acpi_call.nix
  ];
 }
--- a/lenovo/thinkpad/t430/default.nix
+++ b/lenovo/thinkpad/t430/default.nix
@@ -2,7 +2,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot = {
--- a/lenovo/thinkpad/t440s/default.nix
+++ b/lenovo/thinkpad/t440s/default.nix
@@ -2,7 +2,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot = {
--- a/lenovo/thinkpad/t450s/default.nix
+++ b/lenovo/thinkpad/t450s/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t460/default.nix
+++ b/lenovo/thinkpad/t460/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t460p/default.nix
+++ b/lenovo/thinkpad/t460p/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t460s/default.nix
+++ b/lenovo/thinkpad/t460s/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t470s/default.nix
+++ b/lenovo/thinkpad/t470s/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t480/default.nix
+++ b/lenovo/thinkpad/t480/default.nix
@@ -3,7 +3,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/ssd
    ../.
  ];
--- a/lenovo/thinkpad/t480s/default.nix
+++ b/lenovo/thinkpad/t480s/default.nix
@@ -3,7 +3,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/ssd
    ../.
  ];
--- a/lenovo/thinkpad/t490/default.nix
+++ b/lenovo/thinkpad/t490/default.nix
@@ -2,7 +2,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];

@@ -25,7 +24,7 @@

    LABEL="pulseaudio_end"
    '';
-    
+
    throttled.enable = lib.mkDefault true;
  };
 }
--- a/lenovo/thinkpad/t495/default.nix
+++ b/lenovo/thinkpad/t495/default.nix
@@ -4,7 +4,6 @@
  imports = [
    ../.
    ../../../common/cpu/amd
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  # Force use of the thinkpad_acpi driver for backlight control.
--- a/lenovo/thinkpad/t520/default.nix
+++ b/lenovo/thinkpad/t520/default.nix
@@ -3,6 +3,5 @@
    ../.
    ../tp-smapi.nix
    ../../../common/cpu/intel/sandy-bridge
-    ../../../common/pc/laptop/acpi_call.nix
  ];
 }
--- a/lenovo/thinkpad/t550/default.nix
+++ b/lenovo/thinkpad/t550/default.nix
@@ -1,7 +1,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];
 }
--- a/lenovo/thinkpad/t590/default.nix
+++ b/lenovo/thinkpad/t590/default.nix
@@ -3,7 +3,6 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../.
  ];

--- a/lenovo/thinkpad/w520/default.nix
+++ b/lenovo/thinkpad/w520/default.nix
@@ -3,6 +3,5 @@
    ../.
    ../tp-smapi.nix
    ../../../common/cpu/intel/sandy-bridge
-    ../../../common/pc/laptop/acpi_call.nix
  ];
 }
--- a/lenovo/thinkpad/x1-nano/default.nix
+++ b/lenovo/thinkpad/x1-nano/default.nix
@@ -3,7 +3,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
  ];
 }
--- a/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/lenovo/thinkpad/x1/6th-gen/default.nix
@@ -10,7 +10,6 @@
  imports = [
    ../.
    ../../../../common/cpu/intel/kaby-lake
-    ../../../../common/pc/laptop/acpi_call.nix
    ../../../../common/pc/laptop/ssd
  ];

--- a/lenovo/thinkpad/x1/7th-gen/default.nix
+++ b/lenovo/thinkpad/x1/7th-gen/default.nix
@@ -2,7 +2,6 @@
 {
  imports = [
    ../.
-    ../../../../common/pc/laptop/acpi_call.nix
    ../../../../common/pc/laptop/ssd
  ];

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

--- a/lenovo/thinkpad/x230/default.nix
+++ b/lenovo/thinkpad/x230/default.nix
@@ -5,7 +5,6 @@
    ../.
    ../../../common/cpu/intel
    ../../../common/pc/laptop
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot = {
--- a/lenovo/thinkpad/x250/default.nix
+++ b/lenovo/thinkpad/x250/default.nix
@@ -2,6 +2,5 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
  ];
 }
--- a/lenovo/thinkpad/x260/default.nix
+++ b/lenovo/thinkpad/x260/default.nix
@@ -2,7 +2,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/x270/default.nix
+++ b/lenovo/thinkpad/x270/default.nix
@@ -2,7 +2,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/acpi_call.nix
    ../../../common/pc/laptop/ssd
  ];

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

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

--- a/lenovo/thinkpad/z/default.nix
+++ b/lenovo/thinkpad/z/default.nix
@@ -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
  ];