From 49cb5fb3d34e718dabd025c6d8162a5a4413b521 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 30 Jun 2021 16:18:18 +0200 Subject: [PATCH 1/6] Add L13 Yoga --- README.md | 1 + flake.nix | 1 + lenovo/thinkpad/l13-yoga/default.nix | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 lenovo/thinkpad/l13-yoga/default.nix diff --git a/README.md b/README.md index f70a7050..24a8d6ec 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,7 @@ See code for all available configurations. | Lenovo ThinkPad E470 | `` | | Lenovo ThinkPad E495 | `` | | Lenovo ThinkPad L13 | `` | +| Lenovo ThinkPad L13 Yoga | `` | | Lenovo ThinkPad L14 (Intel) | ` | | Lenovo ThinkPad L14 (AMD) | ` | | Lenovo ThinkPad P1 | `` | diff --git a/flake.nix b/flake.nix index 5353d264..a7ad2a33 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470; lenovo-thinkpad-e495 = import ./lenovo/thinkpad/e495; lenovo-thinkpad-l13 = import ./lenovo/thinkpad/l13; + lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13-yoga; lenovo-thinkpad-l14-intel = import ./lenovo/thinkpad/l14/intel; lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd; lenovo-thinkpad-p1 = import ./lenovo/thinkpad/p1; diff --git a/lenovo/thinkpad/l13-yoga/default.nix b/lenovo/thinkpad/l13-yoga/default.nix new file mode 100644 index 00000000..b93e2fb1 --- /dev/null +++ b/lenovo/thinkpad/l13-yoga/default.nix @@ -0,0 +1,15 @@ +{ nixos, lib, pkgs, config, stdenv, ... }: +{ + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ]; + + services.throttled.enable = lib.mkDefault true; + + # automatic screen orientation + hardware.sensor.iio.enable = true; + + services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; +} From 6a77d708e731600948d9ad5d53338f103f243c70 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 1 Jul 2021 11:42:08 +0200 Subject: [PATCH 2/6] leovo/thinkpad/l13-yoga: Use L13's definition --- lenovo/thinkpad/l13-yoga/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lenovo/thinkpad/l13-yoga/default.nix b/lenovo/thinkpad/l13-yoga/default.nix index b93e2fb1..df95b14f 100644 --- a/lenovo/thinkpad/l13-yoga/default.nix +++ b/lenovo/thinkpad/l13-yoga/default.nix @@ -1,13 +1,9 @@ { nixos, lib, pkgs, config, stdenv, ... }: { imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix + ../l13 ]; - services.throttled.enable = lib.mkDefault true; - # automatic screen orientation hardware.sensor.iio.enable = true; From c076216644bcd1112a6e02094a81c2c461d7cbab Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 1 Jul 2021 13:52:08 +0200 Subject: [PATCH 3/6] lenovo/thinkpad: Refactor of yogas --- README.md | 4 ++-- flake.nix | 4 ++-- .../thinkpad/{l13-yoga/default.nix => l13/yoga.nix} | 6 ++---- lenovo/thinkpad/x13-yoga/default.nix | 13 ------------- lenovo/thinkpad/x13/yoga.nix | 8 ++++++++ lenovo/thinkpad/yoga.nix | 6 ++++++ 6 files changed, 20 insertions(+), 21 deletions(-) rename lenovo/thinkpad/{l13-yoga/default.nix => l13/yoga.nix} (64%) delete mode 100644 lenovo/thinkpad/x13-yoga/default.nix create mode 100644 lenovo/thinkpad/x13/yoga.nix create mode 100644 lenovo/thinkpad/yoga.nix diff --git a/README.md b/README.md index cb30dd3d..98609ab4 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ See code for all available configurations. | [Lenovo ThinkPad E470](lenovo/thinkpad/e470) | `` | | [Lenovo ThinkPad E495](lenovo/thinkpad/e495) | `` | | [Lenovo ThinkPad L13](lenovo/thinkpad/l13) | `` | -| [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13-yoga) | `` | +| [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13/yoga.nix) | `` | | [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel) | `` | | [Lenovo ThinkPad L14 (AMD)](lenovo/thinkpad/l14/amd) | `` | | [Lenovo ThinkPad P1](thinkpad/p1) | `` | @@ -125,7 +125,7 @@ See code for all available configurations. | [Lenovo ThinkPad T480s](lenovo/thinkpad/t480s) | `` | | [Lenovo ThinkPad T490](lenovo/thinkpad/t490) | `` | | [Lenovo ThinkPad T495](lenovo/thinkpad/t495) | `` | -| [Lenovo ThinkPad X113 Yoga](lenovo/thinkpad/x13-yoga) | `` | +| [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga.nix) | `` | | [Lenovo ThinkPad X140e](lenovo/thinkpad/x140e) | `` | | [Lenovo ThinkPad X200s](lenovo/thinkpad/x200s) | `` | | [Lenovo ThinkPad X220](lenovo/thinkpad/x220) | `` | diff --git a/flake.nix b/flake.nix index a7ad2a33..67349b32 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470; lenovo-thinkpad-e495 = import ./lenovo/thinkpad/e495; lenovo-thinkpad-l13 = import ./lenovo/thinkpad/l13; - lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13-yoga; + lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13-yoga/yoga.nix; lenovo-thinkpad-l14-intel = import ./lenovo/thinkpad/l14/intel; lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd; lenovo-thinkpad-p1 = import ./lenovo/thinkpad/p1; @@ -74,7 +74,7 @@ lenovo-thinkpad-x1-extreme = import ./lenovo/thinkpad/x1-extreme; lenovo-thinkpad-x1-extreme-gen2 = import ./lenovo/thinkpad/x1-extreme/gen2; lenovo-thinkpad-x13 = import ./lenovo/thinkpad/x13; - lenovo-thinkpad-x13-yoga = import ./lenovo/thinkpad/x13-yoga; + lenovo-thinkpad-x13-yoga = import ./lenovo/thinkpad/x13/yoga.nix; microsoft-surface = import ./microsoft/surface; microsoft-surface-pro-3 = import ./microsoft/surface-pro/3; pcengines-apu = import ./pcengines/apu; diff --git a/lenovo/thinkpad/l13-yoga/default.nix b/lenovo/thinkpad/l13/yoga.nix similarity index 64% rename from lenovo/thinkpad/l13-yoga/default.nix rename to lenovo/thinkpad/l13/yoga.nix index df95b14f..fb11aac5 100644 --- a/lenovo/thinkpad/l13-yoga/default.nix +++ b/lenovo/thinkpad/l13/yoga.nix @@ -1,11 +1,9 @@ { nixos, lib, pkgs, config, stdenv, ... }: { imports = [ - ../l13 + ./. + ../yoga.nix ]; - # automatic screen orientation - hardware.sensor.iio.enable = true; - services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; } diff --git a/lenovo/thinkpad/x13-yoga/default.nix b/lenovo/thinkpad/x13-yoga/default.nix deleted file mode 100644 index 2653910d..00000000 --- a/lenovo/thinkpad/x13-yoga/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, ... }: { - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/ssd - ]; - - # automatic screen orientation - hardware.sensor.iio.enable = true; - - services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; -} diff --git a/lenovo/thinkpad/x13/yoga.nix b/lenovo/thinkpad/x13/yoga.nix new file mode 100644 index 00000000..00a962ba --- /dev/null +++ b/lenovo/thinkpad/x13/yoga.nix @@ -0,0 +1,8 @@ +{ config, lib, ... }: { + imports = [ + ./. + ../yoga.nix + ]; + + services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; +} diff --git a/lenovo/thinkpad/yoga.nix b/lenovo/thinkpad/yoga.nix new file mode 100644 index 00000000..c624e1b6 --- /dev/null +++ b/lenovo/thinkpad/yoga.nix @@ -0,0 +1,6 @@ +{ config, lib, pkgs, ... }: + +{ + # automatic screen orientation + hardware.sensor.iio.enable = true; +} From f08cf2d7f7d48e97ba13e5554a9b0802a35fd080 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 1 Jul 2021 14:03:59 +0200 Subject: [PATCH 4/6] lenovo/thinkpad: #283 Use directory instead of file --- README.md | 4 ++-- flake.nix | 4 ++-- lenovo/thinkpad/l13/{yoga.nix => yoga/default.nix} | 4 ++-- lenovo/thinkpad/x13/{yoga.nix => yoga/default.nix} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename lenovo/thinkpad/l13/{yoga.nix => yoga/default.nix} (88%) rename lenovo/thinkpad/x13/{yoga.nix => yoga/default.nix} (87%) diff --git a/README.md b/README.md index 98609ab4..94bc34a7 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ See code for all available configurations. | [Lenovo ThinkPad E470](lenovo/thinkpad/e470) | `` | | [Lenovo ThinkPad E495](lenovo/thinkpad/e495) | `` | | [Lenovo ThinkPad L13](lenovo/thinkpad/l13) | `` | -| [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13/yoga.nix) | `` | +| [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13/yoga) | `` | | [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel) | `` | | [Lenovo ThinkPad L14 (AMD)](lenovo/thinkpad/l14/amd) | `` | | [Lenovo ThinkPad P1](thinkpad/p1) | `` | @@ -125,7 +125,7 @@ See code for all available configurations. | [Lenovo ThinkPad T480s](lenovo/thinkpad/t480s) | `` | | [Lenovo ThinkPad T490](lenovo/thinkpad/t490) | `` | | [Lenovo ThinkPad T495](lenovo/thinkpad/t495) | `` | -| [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga.nix) | `` | +| [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga) | `` | | [Lenovo ThinkPad X140e](lenovo/thinkpad/x140e) | `` | | [Lenovo ThinkPad X200s](lenovo/thinkpad/x200s) | `` | | [Lenovo ThinkPad X220](lenovo/thinkpad/x220) | `` | diff --git a/flake.nix b/flake.nix index 67349b32..b0b93f2a 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470; lenovo-thinkpad-e495 = import ./lenovo/thinkpad/e495; lenovo-thinkpad-l13 = import ./lenovo/thinkpad/l13; - lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13-yoga/yoga.nix; + lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13-yoga/yoga; lenovo-thinkpad-l14-intel = import ./lenovo/thinkpad/l14/intel; lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd; lenovo-thinkpad-p1 = import ./lenovo/thinkpad/p1; @@ -74,7 +74,7 @@ lenovo-thinkpad-x1-extreme = import ./lenovo/thinkpad/x1-extreme; lenovo-thinkpad-x1-extreme-gen2 = import ./lenovo/thinkpad/x1-extreme/gen2; lenovo-thinkpad-x13 = import ./lenovo/thinkpad/x13; - lenovo-thinkpad-x13-yoga = import ./lenovo/thinkpad/x13/yoga.nix; + lenovo-thinkpad-x13-yoga = import ./lenovo/thinkpad/x13/yoga; microsoft-surface = import ./microsoft/surface; microsoft-surface-pro-3 = import ./microsoft/surface-pro/3; pcengines-apu = import ./pcengines/apu; diff --git a/lenovo/thinkpad/l13/yoga.nix b/lenovo/thinkpad/l13/yoga/default.nix similarity index 88% rename from lenovo/thinkpad/l13/yoga.nix rename to lenovo/thinkpad/l13/yoga/default.nix index fb11aac5..3fb6f162 100644 --- a/lenovo/thinkpad/l13/yoga.nix +++ b/lenovo/thinkpad/l13/yoga/default.nix @@ -1,8 +1,8 @@ { nixos, lib, pkgs, config, stdenv, ... }: { imports = [ - ./. - ../yoga.nix + ../. + ../../yoga.nix ]; services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; diff --git a/lenovo/thinkpad/x13/yoga.nix b/lenovo/thinkpad/x13/yoga/default.nix similarity index 87% rename from lenovo/thinkpad/x13/yoga.nix rename to lenovo/thinkpad/x13/yoga/default.nix index 00a962ba..dfabfd41 100644 --- a/lenovo/thinkpad/x13/yoga.nix +++ b/lenovo/thinkpad/x13/yoga/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { imports = [ - ./. - ../yoga.nix + ../. + ../../yoga.nix ]; services.xserver.wacom.enable = lib.mkDefault config.services.xserver.enable; From 723e8f796c9f84cf949a67c854fb1bffd2130cb6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 1 Jul 2021 23:14:45 +0200 Subject: [PATCH 5/6] lenovo/thinkpad: Added x13-yoga for backwards-compability --- lenovo/thinkpad/x13-yoga/default.nix | 1 + 1 file changed, 1 insertion(+) create mode 120000 lenovo/thinkpad/x13-yoga/default.nix diff --git a/lenovo/thinkpad/x13-yoga/default.nix b/lenovo/thinkpad/x13-yoga/default.nix new file mode 120000 index 00000000..bc0296c1 --- /dev/null +++ b/lenovo/thinkpad/x13-yoga/default.nix @@ -0,0 +1 @@ +/home/vherrmann/repos/nixos-hardware/lenovo/thinkpad/x13/yoga/default.nix \ No newline at end of file From 19071fde4fb01201ebdb615ad2324a890608ccb3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 3 Jul 2021 09:17:31 +0200 Subject: [PATCH 6/6] lenovo/thinkpad/x13-yoga: Use relative symlink --- lenovo/thinkpad/x13-yoga/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x13-yoga/default.nix b/lenovo/thinkpad/x13-yoga/default.nix index bc0296c1..1674a694 120000 --- a/lenovo/thinkpad/x13-yoga/default.nix +++ b/lenovo/thinkpad/x13-yoga/default.nix @@ -1 +1 @@ -/home/vherrmann/repos/nixos-hardware/lenovo/thinkpad/x13/yoga/default.nix \ No newline at end of file +../x13/yoga/default.nix \ No newline at end of file