From c6c90887f84c02ce9ebf33b95ca79ef45007bf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 2 Dec 2024 12:29:38 +0100 Subject: [PATCH] drop acpi_call from nixos-hardware fixes https://github.com/NixOS/nixos-hardware/issues/1114 and tlp also no longer recommands it. --- apple/imac/18-2/default.nix | 1 - apple/macbook-pro/14-1/default.nix | 5 ++--- asus/zephyrus/ga402x/shared.nix | 1 - common/pc/laptop/acpi_call.nix | 10 ---------- dell/xps/13-9300/default.nix | 1 - dell/xps/13-9370/default.nix | 1 - dell/xps/13-9380/default.nix | 1 - flake.nix | 2 +- focus/m2/gen1/default.nix | 2 +- hp/elitebook/830/g6/default.nix | 1 - hp/elitebook/845/g7/default.nix | 1 - hp/elitebook/845/g8/default.nix | 1 - hp/elitebook/845/g9/default.nix | 1 - lenovo/ideapad/15alc6/default.nix | 1 - lenovo/ideapad/15arh05/default.nix | 1 - lenovo/ideapad/slim-5/default.nix | 1 - lenovo/thinkpad/a475/default.nix | 1 - lenovo/thinkpad/e14/default.nix | 1 - lenovo/thinkpad/l13/default.nix | 1 - lenovo/thinkpad/l14/default.nix | 1 - lenovo/thinkpad/p1/default.nix | 1 - lenovo/thinkpad/p14s/default.nix | 1 - lenovo/thinkpad/p50/default.nix | 1 - lenovo/thinkpad/p51/default.nix | 1 - lenovo/thinkpad/p52/default.nix | 1 - lenovo/thinkpad/p53/default.nix | 1 - lenovo/thinkpad/t14/default.nix | 1 - lenovo/thinkpad/t14s/default.nix | 1 - lenovo/thinkpad/t420/default.nix | 1 - lenovo/thinkpad/t430/default.nix | 1 - lenovo/thinkpad/t440s/default.nix | 1 - lenovo/thinkpad/t450s/default.nix | 1 - lenovo/thinkpad/t460/default.nix | 1 - lenovo/thinkpad/t460p/default.nix | 1 - lenovo/thinkpad/t460s/default.nix | 1 - lenovo/thinkpad/t470s/default.nix | 1 - lenovo/thinkpad/t480/default.nix | 1 - lenovo/thinkpad/t480s/default.nix | 1 - lenovo/thinkpad/t490/default.nix | 3 +-- lenovo/thinkpad/t495/default.nix | 1 - lenovo/thinkpad/t520/default.nix | 1 - lenovo/thinkpad/t550/default.nix | 1 - lenovo/thinkpad/t590/default.nix | 1 - lenovo/thinkpad/w520/default.nix | 1 - lenovo/thinkpad/x1-nano/default.nix | 1 - lenovo/thinkpad/x1/6th-gen/default.nix | 1 - lenovo/thinkpad/x1/7th-gen/default.nix | 1 - lenovo/thinkpad/x13/common.nix | 1 - lenovo/thinkpad/x230/default.nix | 1 - lenovo/thinkpad/x250/default.nix | 1 - lenovo/thinkpad/x260/default.nix | 1 - lenovo/thinkpad/x270/default.nix | 1 - lenovo/thinkpad/x280/default.nix | 1 - lenovo/thinkpad/x390/default.nix | 1 - lenovo/thinkpad/z/default.nix | 1 - lenovo/yoga/7/14ARH7/shared.nix | 1 - 56 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 common/pc/laptop/acpi_call.nix diff --git a/apple/imac/18-2/default.nix b/apple/imac/18-2/default.nix index 0760823..4770e10 100644 --- a/apple/imac/18-2/default.nix +++ b/apple/imac/18-2/default.nix @@ -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) diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix index e2fb2ab..cec9e26 100644 --- a/apple/macbook-pro/14-1/default.nix +++ b/apple/macbook-pro/14-1/default.nix @@ -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 @@ -41,9 +40,9 @@ AttrKeyboardIntegration=internal ''; - # Wifi, CPU Microcode FW updates + # Wifi, CPU Microcode FW updates networking.enableB43Firmware = lib.mkDefault true; - hardware = { + hardware = { enableRedistributableFirmware = lib.mkDefault true; cpu.intel.updateMicrocode = lib.mkDefault true; }; diff --git a/asus/zephyrus/ga402x/shared.nix b/asus/zephyrus/ga402x/shared.nix index 02adb17..f106903 100644 --- a/asus/zephyrus/ga402x/shared.nix +++ b/asus/zephyrus/ga402x/shared.nix @@ -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 ]; diff --git a/common/pc/laptop/acpi_call.nix b/common/pc/laptop/acpi_call.nix deleted file mode 100644 index 76e4b27..0000000 --- a/common/pc/laptop/acpi_call.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/dell/xps/13-9300/default.nix b/dell/xps/13-9300/default.nix index 3ddd0cc..53828cf 100644 --- a/dell/xps/13-9300/default.nix +++ b/dell/xps/13-9300/default.nix @@ -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 ]; diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index 10362b3..31ca7c1 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -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. diff --git a/dell/xps/13-9380/default.nix b/dell/xps/13-9380/default.nix index b710ce8..df8b810 100644 --- a/dell/xps/13-9380/default.nix +++ b/dell/xps/13-9380/default.nix @@ -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. diff --git a/flake.nix b/flake.nix index 6eba0df..44bedb0 100644 --- a/flake.nix +++ b/flake.nix @@ -330,7 +330,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; diff --git a/focus/m2/gen1/default.nix b/focus/m2/gen1/default.nix index b6a2c78..0024102 100644 --- a/focus/m2/gen1/default.nix +++ b/focus/m2/gen1/default.nix @@ -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 ]; diff --git a/hp/elitebook/830/g6/default.nix b/hp/elitebook/830/g6/default.nix index b61b263..3b209b4 100644 --- a/hp/elitebook/830/g6/default.nix +++ b/hp/elitebook/830/g6/default.nix @@ -3,7 +3,6 @@ imports = [ ../../../../common/cpu/intel ../../../../common/pc/laptop - ../../../../common/pc/laptop/acpi_call.nix ../../../../common/pc/laptop/ssd ]; diff --git a/hp/elitebook/845/g7/default.nix b/hp/elitebook/845/g7/default.nix index 60afe6a..823bf40 100644 --- a/hp/elitebook/845/g7/default.nix +++ b/hp/elitebook/845/g7/default.nix @@ -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 ]; diff --git a/hp/elitebook/845/g8/default.nix b/hp/elitebook/845/g8/default.nix index 60afe6a..823bf40 100644 --- a/hp/elitebook/845/g8/default.nix +++ b/hp/elitebook/845/g8/default.nix @@ -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 ]; diff --git a/hp/elitebook/845/g9/default.nix b/hp/elitebook/845/g9/default.nix index 60afe6a..823bf40 100644 --- a/hp/elitebook/845/g9/default.nix +++ b/hp/elitebook/845/g9/default.nix @@ -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 ]; diff --git a/lenovo/ideapad/15alc6/default.nix b/lenovo/ideapad/15alc6/default.nix index a830c0b..386f272 100644 --- a/lenovo/ideapad/15alc6/default.nix +++ b/lenovo/ideapad/15alc6/default.nix @@ -5,7 +5,6 @@ ../../../common/cpu/amd ../../../common/gpu/amd ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/ssd ]; } diff --git a/lenovo/ideapad/15arh05/default.nix b/lenovo/ideapad/15arh05/default.nix index 87229c5..f021a2d 100644 --- a/lenovo/ideapad/15arh05/default.nix +++ b/lenovo/ideapad/15arh05/default.nix @@ -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 ]; diff --git a/lenovo/ideapad/slim-5/default.nix b/lenovo/ideapad/slim-5/default.nix index c71052d..02173bd 100644 --- a/lenovo/ideapad/slim-5/default.nix +++ b/lenovo/ideapad/slim-5/default.nix @@ -3,7 +3,6 @@ ../../../common/cpu/amd ../../../common/gpu/amd ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/ssd ]; } diff --git a/lenovo/thinkpad/a475/default.nix b/lenovo/thinkpad/a475/default.nix index 4f04453..dc89dc1 100644 --- 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 diff --git a/lenovo/thinkpad/e14/default.nix b/lenovo/thinkpad/e14/default.nix index a073b58..c6948b3 100644 --- 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 = [ diff --git a/lenovo/thinkpad/l13/default.nix b/lenovo/thinkpad/l13/default.nix index 449756b..dcf9a57 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/l14/default.nix b/lenovo/thinkpad/l14/default.nix index b3d031d..a59ec14 100644 --- 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 = [ diff --git a/lenovo/thinkpad/p1/default.nix b/lenovo/thinkpad/p1/default.nix index 4c68bdb..f26e01b 100644 --- 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 ]; diff --git a/lenovo/thinkpad/p14s/default.nix b/lenovo/thinkpad/p14s/default.nix index 401eba9..edaeda8 100644 --- 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 ]; diff --git a/lenovo/thinkpad/p50/default.nix b/lenovo/thinkpad/p50/default.nix index 625d7cb..62edb25 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix index 43c9b8d..38f5614 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/p52/default.nix b/lenovo/thinkpad/p52/default.nix index 2ca38ae..6c9ea67 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/p53/default.nix b/lenovo/thinkpad/p53/default.nix index 84e60fa..04fcb4b 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/t14/default.nix b/lenovo/thinkpad/t14/default.nix index b6fd228..fb42f2b 100644 --- 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 ]; diff --git a/lenovo/thinkpad/t14s/default.nix b/lenovo/thinkpad/t14s/default.nix index 182071a..0581b04 100644 --- 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. diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix index a3c7db4..3da15d0 100644 --- 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 ]; } diff --git a/lenovo/thinkpad/t430/default.nix b/lenovo/thinkpad/t430/default.nix index 47f2d6b..ddf5603 100644 --- 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 = { diff --git a/lenovo/thinkpad/t440s/default.nix b/lenovo/thinkpad/t440s/default.nix index ccfa9e5..2f0688a 100644 --- 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 = { diff --git a/lenovo/thinkpad/t450s/default.nix b/lenovo/thinkpad/t450s/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t460/default.nix b/lenovo/thinkpad/t460/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t460p/default.nix b/lenovo/thinkpad/t460p/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t470s/default.nix b/lenovo/thinkpad/t470s/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t480/default.nix b/lenovo/thinkpad/t480/default.nix index bfca912..3e840d5 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix index bfca912..3e840d5 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix index c20d213..f524223 100644 --- 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; }; } diff --git a/lenovo/thinkpad/t495/default.nix b/lenovo/thinkpad/t495/default.nix index ef50813..9ab382f 100644 --- 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. diff --git a/lenovo/thinkpad/t520/default.nix b/lenovo/thinkpad/t520/default.nix index a3c7db4..3da15d0 100644 --- 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 ]; } diff --git a/lenovo/thinkpad/t550/default.nix b/lenovo/thinkpad/t550/default.nix index 548f688..6b0a2f0 100644 --- 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 ../. ]; } diff --git a/lenovo/thinkpad/t590/default.nix b/lenovo/thinkpad/t590/default.nix index 3beea72..7dc21cd 100644 --- 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 ../. ]; diff --git a/lenovo/thinkpad/w520/default.nix b/lenovo/thinkpad/w520/default.nix index a3c7db4..3da15d0 100644 --- 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 ]; } diff --git a/lenovo/thinkpad/x1-nano/default.nix b/lenovo/thinkpad/x1-nano/default.nix index 68cd665..a842d43 100644 --- 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 ]; } diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 8375441..264faa6 100644 --- 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 ]; diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/lenovo/thinkpad/x1/7th-gen/default.nix index 1547e05..6dd02b8 100644 --- 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 ]; diff --git a/lenovo/thinkpad/x13/common.nix b/lenovo/thinkpad/x13/common.nix index e6f79fc..c45a7a6 100644 --- 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 ]; diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 995bb44..1e579b3 100644 --- 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 = { diff --git a/lenovo/thinkpad/x250/default.nix b/lenovo/thinkpad/x250/default.nix index 55ae209..870d9a8 100644 --- 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 ]; } diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix index 409986d..ac1c5f9 100644 --- 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 = [ diff --git a/lenovo/thinkpad/x270/default.nix b/lenovo/thinkpad/x270/default.nix index 726736f..8e09d2a 100644 --- 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 ]; diff --git a/lenovo/thinkpad/x280/default.nix b/lenovo/thinkpad/x280/default.nix index 880458e..5b6121a 100644 --- 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 ]; diff --git a/lenovo/thinkpad/x390/default.nix b/lenovo/thinkpad/x390/default.nix index 19a030c..d06a4ae 100644 --- 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 ]; diff --git a/lenovo/thinkpad/z/default.nix b/lenovo/thinkpad/z/default.nix index 020a159..5d8ba8a 100644 --- 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 ]; diff --git a/lenovo/yoga/7/14ARH7/shared.nix b/lenovo/yoga/7/14ARH7/shared.nix index 3bef447..98ea301 100644 --- a/lenovo/yoga/7/14ARH7/shared.nix +++ b/lenovo/yoga/7/14ARH7/shared.nix @@ -7,7 +7,6 @@ ../../../../common/cpu/amd/pstate.nix ../../../../common/gpu/amd ../../../../common/pc/laptop - ../../../../common/pc/laptop/acpi_call.nix ../../../../common/pc/ssd ];