Merge pull request #82 from NixOS/travis-test-build

copy of #81

CODEOWNERS

@@ -1,4 +1,5 @@
 beagleboard/pocketbeagle @yegortimoshenko
+dell/xps/13-9370 @moredread
 lenovo/thinkpad/x230 @makefu @yegortimoshenko
 lenovo/thinkpad/x250 @Mic92
 pcengines/apu @yegortimoshenko

README.md

@@ -31,6 +31,7 @@ imports = [
 | [Apple MacBook Pro 10,1][]        | `<nixos-hardware/apple/macbook-pro/10-1>`    |
 | Apple MacBook Pro 12,1            | `<nixos-hardware/apple/macbook-pro/12-1>`    |
 | BeagleBoard PocketBeagle          | `<nixos-hardware/beagleboard/pocketbeagle>`  |
+| [Dell XPS 13 9370][]              | `<nixos-hardware/dell/xps/13-9370>`          |
 | [Dell XPS 15 9550][]              | `<nixos-hardware/dell/xps/15-9550>`          |
 | [Inverse Path USB armory][]       | `<nixos-hardware/inversepath/usbarmory>`     |
 | Lenovo IdeaPad Z510               | `<nixos-hardware/lenovo/ideapad/z510>`       |
@@ -57,6 +58,7 @@ imports = [
 
 [Acer Aspire 4810T]: acer/aspire/4810t
 [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1
+[Dell XPS 13 9370]: dell/xps/13-9370
 [Dell XPS 15 9550]: dell/xps/15-9550
 [Inverse Path USB armory]: inversepath/usbarmory
 [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen

default.nix

@@ -31,6 +31,7 @@ in
   apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5;
   apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1;
 
+  dell-xps-13-9370 = buildProfile ./dell/xps/13-9370;
   dell-xps-15-9550 = buildProfile ./dell/xps/15-9550;
 
   lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410;

dell/xps/13-9370/README.wiki

@@ -0,0 +1,16 @@
+= Dell XPS 13 9370 =
+
+== Battery drain when sleeping ==
+
+The laptop uses the S2 sleep mode by default instead of S3, which leads to
+draining a lot of battery during sleep.
+
+Though this is intentional by the manufacturer and might cause lockups when
+forced  I - @moredread - never had any issues with it.
+
+See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management
+and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference
+
+== Additional resources ==
+
+* Arch linux wiki: [https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370) Dell XPS 13 9370]

dell/xps/13-9370/default.nix

@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../../common/cpu/intel/kaby-lake
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/acpi_call.nix
+    ../../../common/pc/laptop/cpu-throttling-bug.nix
+  ];
+
+  # Force S3 sleep mode. See README.wiki for details.
+  boot.kernelParams = [ "mem_sleep_default=deep" ];
+
+  # touchpad goes over i2c
+  boot.blacklistedKernelModules = [ "psmouse" ];
+}

lenovo/thinkpad/t450s/default.nix

@@ -3,7 +3,7 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../acpi_call.nix
+    ../../../common/pc/laptop/acpi_call.nix
     ../.
   ];
 }

lenovo/thinkpad/t480s/default.nix

@@ -3,8 +3,8 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../acpi_call.nix
+    ../../../common/pc/laptop/acpi_call.nix
-    ../cpu-throttling-bug.nix
+    ../../../common/pc/laptop/cpu-throttling-bug.nix
     ../.
   ];
 }

lenovo/thinkpad/x1/6th-gen/default.nix

@@ -7,8 +7,8 @@
 {
   imports = [
     ../.
-    ../../cpu-throttling-bug.nix
+    ../../../../common/pc/laptop/acpi_call.nix
-    ../../acpi_call.nix
+    ../../../../common/pc/laptop/cpu-throttling-bug.nix
   ];
 
   # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery

lenovo/thinkpad/x230/default.nix

@@ -4,7 +4,7 @@
   imports = [
     ../.
     ../../../common/cpu/intel
-    ../acpi_call.nix
+    ../../../common/pc/laptop/acpi_call.nix
   ];
 
   boot = {

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