From 941fbef86f558b9a39e6d1460ba5a34ecd72ebd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 19 Oct 2018 17:52:25 +0200 Subject: [PATCH] move acpi_call.nix and cpu-throttling-bug.nix to common folder --- {lenovo/thinkpad => common/pc/laptop}/acpi_call.nix | 0 {lenovo/thinkpad => common/pc/laptop}/cpu-throttling-bug.nix | 0 dell/xps/13-9370/default.nix | 4 ++-- lenovo/thinkpad/t450s/default.nix | 2 +- lenovo/thinkpad/t480s/default.nix | 4 ++-- lenovo/thinkpad/x1/6th-gen/default.nix | 4 ++-- lenovo/thinkpad/x230/default.nix | 2 +- lenovo/thinkpad/x260/default.nix | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename {lenovo/thinkpad => common/pc/laptop}/acpi_call.nix (100%) rename {lenovo/thinkpad => common/pc/laptop}/cpu-throttling-bug.nix (100%) diff --git a/lenovo/thinkpad/acpi_call.nix b/common/pc/laptop/acpi_call.nix similarity index 100% rename from lenovo/thinkpad/acpi_call.nix rename to common/pc/laptop/acpi_call.nix diff --git a/lenovo/thinkpad/cpu-throttling-bug.nix b/common/pc/laptop/cpu-throttling-bug.nix similarity index 100% rename from lenovo/thinkpad/cpu-throttling-bug.nix rename to common/pc/laptop/cpu-throttling-bug.nix diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index 06e339f..cd53acd 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -4,8 +4,8 @@ imports = [ ../../../common/cpu/intel/kaby-lake ../../../common/pc/laptop - ../../../lenovo/thinkpad/acpi_call.nix - ../../../lenovo/thinkpad/cpu-throttling-bug.nix + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix ]; # Force S3 sleep mode. See README.wiki for details. diff --git a/lenovo/thinkpad/t450s/default.nix b/lenovo/thinkpad/t450s/default.nix index 026332e..e623371 100644 --- a/lenovo/thinkpad/t450s/default.nix +++ b/lenovo/thinkpad/t450s/default.nix @@ -3,7 +3,7 @@ { imports = [ ../../../common/cpu/intel - ../acpi_call.nix + ../../../common/pc/laptop/acpi_call.nix ../. ]; } diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix index 2f4b8a9..3e079d5 100644 --- a/lenovo/thinkpad/t480s/default.nix +++ b/lenovo/thinkpad/t480s/default.nix @@ -3,8 +3,8 @@ { imports = [ ../../../common/cpu/intel - ../acpi_call.nix - ../cpu-throttling-bug.nix + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix ../. ]; } diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 4a10a23..9584bc7 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -7,8 +7,8 @@ { imports = [ ../. - ../../cpu-throttling-bug.nix - ../../acpi_call.nix + ../../../../common/pc/laptop/acpi_call.nix + ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 32e5c13..58b09f4 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -4,7 +4,7 @@ imports = [ ../. ../../../common/cpu/intel - ../acpi_call.nix + ../../../common/pc/laptop/acpi_call.nix ]; boot = { diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix index 46530ee..d64a530 100644 --- a/lenovo/thinkpad/x260/default.nix +++ b/lenovo/thinkpad/x260/default.nix @@ -1,8 +1,8 @@ { imports = [ ../. - ../acpi_call.nix ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix ]; # https://wiki.archlinux.org/index.php/TLP#Btrfs