From 7f17d649cc60b3e480dfad935871cf9762ea91a8 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 15:33:27 +0200 Subject: [PATCH 1/6] Fix cpu-throttling service file reference --- lenovo/thinkpad/x1/6th-gen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 4fc8ece..1be069a 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -7,7 +7,7 @@ { imports = [ ../. - ../../cpu-throttling.nix + ../../cpu-throttling-bug.nix ../../acpi_call.nix ]; From 9939e5b3a491a230834794aad2d53c4f3e4365f1 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 15:34:06 +0200 Subject: [PATCH 2/6] Fix acpi override load As proposed by @garbas in #60 --- lenovo/thinkpad/x1/6th-gen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 1be069a..4a10a23 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -27,6 +27,6 @@ # "mem_sleep_default=deep" # ]; # boot.initrd.prepend = [ - # "/boot/acpi_override" + # "${/boot/acpi_override}" # ]; } From 19553733f0a558d7c939c05d38a28cfab3bea703 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:02:16 +0200 Subject: [PATCH 3/6] Add X1 profile to the README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 251ff0b..2ae1fe4 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ imports = [ | Supermicro A1SRi-2758F | `` | | Supermicro X10SLL-F | `` | | [Toshiba Chromebook 2 `swanky`][] | `` | +| [Lenovo ThinkPad X1 gen6][] | ``| [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 From e785e2a3cb8843b17863753938241216e66d16a2 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:04:47 +0200 Subject: [PATCH 4/6] Unfortunately all the table has to be modified to have the changes rendered correctly --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 2ae1fe4..b5fcb93 100644 --- a/README.md +++ b/README.md @@ -22,34 +22,34 @@ imports = [ ## Profiles -| Model | Path | -| --------------------------------- | ------------------------------------------ | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| [Dell XPS 15 9550][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| Lenovo ThinkPad X270 | `` | -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | +| Model | Path | +| --------------------------------- | -------------------------------------------- | +| [Acer Aspire 4810T][] | `` | +| Airis N990 | `` | +| Apple MacBook Air 4,X | `` | +| Apple MacBook Air 6,X | `` | +| [Apple MacBook Pro 10,1][] | `` | +| Apple MacBook Pro 12,1 | `` | +| [Dell XPS 15 9550][] | `` | +| [Inverse Path USB armory][] | `` | +| Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad X140e | `` | +| Lenovo ThinkPad X220 | `` | +| Lenovo ThinkPad X230 | `` | +| Lenovo ThinkPad X250 | `` | +| Lenovo ThinkPad X270 | `` | | [Lenovo ThinkPad X1 gen6][] | ``| +| [Microsoft Surface Pro 3][] | `` | +| PC Engines APU | `` | +| [Raspberry Pi 2][] | `` | +| [Samsung Series 9 NP900X3C][] | `` | +| [Purism Librem 13v3][] | `` | +| Supermicro A1SRi-2758F | `` | +| Supermicro X10SLL-F | `` | +| [Toshiba Chromebook 2 `swanky`][] | `` | [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 From b9bdfee8c3a6ff02b3b211892cfba7e60a7f9943 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:09:44 +0200 Subject: [PATCH 5/6] Fix table rendering. Add the target of the link to the X1 profile --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b5fcb93..b2742d0 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ imports = [ [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory +[Lenovo ThinkPad X1 gen6]: lenovo/thinkpad/x1/6th-gen [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c From 415f4f4747fa43ef8545f020d7fa30dc829f9f0e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 2 Sep 2018 08:47:48 +0000 Subject: [PATCH 6/6] ThinkPad X1 gen6 -> ThinkPad X1 (6th Gen) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2742d0..20c7a60 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ imports = [ | Lenovo ThinkPad X230 | `` | | Lenovo ThinkPad X250 | `` | | Lenovo ThinkPad X270 | `` | -| [Lenovo ThinkPad X1 gen6][] | ``| +| [Lenovo ThinkPad X1 (6th Gen)][] | ``| | [Microsoft Surface Pro 3][] | `` | | PC Engines APU | `` | | [Raspberry Pi 2][] | `` | @@ -55,7 +55,7 @@ imports = [ [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory -[Lenovo ThinkPad X1 gen6]: lenovo/thinkpad/x1/6th-gen +[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c