From 0f2c55992677e78d5d2908d0648e410ef9b27436 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 23 Sep 2017 13:59:19 +0200
Subject: Organise modules into folders

---
 modules/machines/t470s.nix | 25 +++++++++++++++++++++++++
 modules/machines/x250.nix  | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 modules/machines/t470s.nix
 create mode 100644 modules/machines/x250.nix

(limited to 'modules/machines')

diff --git a/modules/machines/t470s.nix b/modules/machines/t470s.nix
new file mode 100644
index 0000000..21614f0
--- /dev/null
+++ b/modules/machines/t470s.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+{ hardware.usbWwan.enable = true;
+  hardware.firmware = with pkgs; [
+    firmwareLinuxNonfree
+  ];
+
+  boot.blacklistedKernelModules = [ "thinkpad_acpi" ];
+
+  systemd.services.ModemManager.enable = true;
+
+  hardware.pulseaudio.extraConfig = ''
+    load-module module-alsa-sink device=hw:0,7
+  '';
+
+  environment.systemPackages = with pkgs; [
+    nvme-cli
+  ];
+
+  imports = [
+    ../hardware/intel-gpu.nix
+    ../hardware/hidpi.nix
+    ../hardware/thinkpad.nix
+  ];
+}
diff --git a/modules/machines/x250.nix b/modules/machines/x250.nix
new file mode 100644
index 0000000..c527f4d
--- /dev/null
+++ b/modules/machines/x250.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{ boot.extraModulePackages = with config.boot.kernelPackages; [
+    acpi_call
+  ];
+
+  hardware.firmware = with pkgs; [
+    firmwareLinuxNonfree
+  ];
+
+  services.xserver.monitorSection = ''
+    DisplaySize 277 156
+  '';
+
+  services.tlp.extraConfig = ''
+    # Newer Thinkpads have a battery firmware
+    # it conflicts with TLP if stop thresholds are set
+    START_CHARGE_THRESH_BAT0=70
+    # STOP_CHARGE_THRESH_BAT0=80
+    START_CHARGE_THRESH_BAT1=70
+    # STOP_CHARGE_THRESH_BAT1=80
+
+    DISK_APM_LEVEL_ON_AC="254 254"
+    DISK_APM_LEVEL_ON_BAT="128 128"
+
+    # One or both of these lines stops disk corruption
+    # when re-attaching to AC whilst on.
+    SATA_LINKPWR_ON_BAT=medium_power
+    SATA_LINKPWR_BLACKLIST="host1"
+  '';
+
+  imports = [
+    ../hardware/synaptics.nix
+    ../hardware/intel-gpu.nix
+    ../hardware/thinkpad.nix
+  ];
+}
-- 
cgit 1.4.1