From 9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 21 Oct 2019 14:58:25 +0200
Subject: Replace parts of T470s configuration with nixos-hardware

---
 system/settings/machines/t470s.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'system/settings/machines')

diff --git a/system/settings/machines/t470s.nix b/system/settings/machines/t470s.nix
index 4ee6c2ac..7343dadb 100644
--- a/system/settings/machines/t470s.nix
+++ b/system/settings/machines/t470s.nix
@@ -3,9 +3,7 @@
 { hardware.usbWwan.enable = false; # unused
   systemd.services.ModemManager.enable = false;
 
-  hardware.firmware = with pkgs; [
-    firmwareLinuxNonfree
-  ];
+  hardware.enableRedistributableFirmware = true;
 
   services.thinkfan.sensors = ''
     hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp3_input
@@ -22,11 +20,6 @@
     (127,   80,     32767)
   '';
 
-  boot.kernelParams = [
-    "i915.enable_guc=2"
-    "i915.enable_psr=1"
-  ];
-
   boot.postBootCommands = ''
     echo bfq > /sys/block/nvme0n1/queue/scheduler
   '';
@@ -53,7 +46,6 @@
 
   imports = [
     ../hardware/intel-gpu.nix
-    ../hardware/hidpi.nix
     ../hardware/thinkpad.nix
   ];
 }
-- 
cgit 1.4.1