6 files changed, 11 insertions, 35 deletions
diff --git a/system/satoshipad.nix b/system/satoshipad.nix
index 760181e6..d7efce38 100644
--- a/system/satoshipad.nix
+++ b/system/satoshipad.nix
@@ -5,6 +5,12 @@
     ./hardware-configuration.nix
     ./private/default.nix
 
+    <nixos-hardware/lenovo/thinkpad/t470s>
+    <nixos-hardware/common/pc/laptop/cpu-throttling-bug.nix>
+    <nixos-hardware/common/pc/ssd>
+    <nixos-hardware/common/cpu/intel/kaby-lake>
+    ./settings/machines/t470s.nix
+
     ./settings/base.nix
     ./settings/configuration/berlin.nix
     ./settings/configuration/british-english.nix
@@ -17,7 +23,6 @@
     ./settings/hardware/qwerty.nix
     ./settings/hardware/trackball.nix
     ./settings/hardware/trezor.nix
-    ./settings/machines/t470s.nix
     ./settings/programs/gnupg.nix
     ./settings/programs/keybase.nix
     ./settings/programs/tor.nix
diff --git a/system/settings/hardware/hidpi.nix b/system/settings/hardware/hidpi.nix
deleted file mode 100644
index 1f4644c5..00000000
--- a/system/settings/hardware/hidpi.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{ i18n = {
-    consoleFont = "ter-v24b";
-    consolePackages = with pkgs; [
-      terminus_font
-    ];
-  };
-}
diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix
index 81fd765e..95d27cc0 100644
--- a/system/settings/hardware/intel-gpu.nix
+++ b/system/settings/hardware/intel-gpu.nix
@@ -1,13 +1,9 @@
 { config, pkgs, ... }:
 
-{ hardware.opengl.extraPackages = with pkgs; [
-    vaapiIntel
-    vaapiVdpau
-    libvdpau-va-gl
-  ];
+{
 
-  boot.earlyVconsoleSetup = true;
-  boot.initrd.kernelModules = [
-    "i915"
+  boot.kernelParams = [
+    "i915.enable_guc=2"
+    "i915.fastboot=1"
   ];
 }
diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix
index f8f2979c..bb715408 100644
--- a/system/settings/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
@@ -1,9 +1,6 @@
 { config, pkgs, lib, ... }:
 
 { boot.kernelModules = [ "coretemp" ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [
-    x86_energy_perf_policy
-  ];
 
   hardware = {
     bluetooth = {
@@ -51,7 +48,6 @@
   };
 
   services.tlp = {
-    enable = true;
     extraConfig = ''
       CPU_SCALING_GOVERNOR_ON_BAT=powersave
       ENERGY_PERF_POLICY_ON_BAT="balance_power"
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
   ];
 }
diff --git a/user/gnupg/.gnupg/trezor/gpg.conf b/user/gnupg/.gnupg/trezor/gpg.conf
deleted file mode 100644
index fd2cdb0f..00000000
--- a/user/gnupg/.gnupg/trezor/gpg.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Hardware-based GPG configuration
-agent-program /Users/alan/.gnupg/trezor/run-agent.sh
-personal-digest-preferences SHA512
-default-key "Alan Pearce <alan@alanpearce.eu>"