all repos — nixfiles @ 9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa

System and user configuration, managed by nix and home-manager

Replace parts of T470s configuration with nixos-hardware
Alan Pearce alan@alanpearce.eu
Mon, 21 Oct 2019 14:58:25 +0200
commit

9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa

parent

6338eb3e142f7dc7568ef454c6a5c0f9f4608b51

6 files changed, 11 insertions(+), 35 deletions(-)

jump to
M system/satoshipad.nix → system/satoshipad.nix
@@ -5,6 +5,12 @@ imports = [     ./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/network-manager.nix     ./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
D system/settings/hardware/hidpi.nix
@@ -1,9 +0,0 @@-{ config, pkgs, ... }:
-
-{ i18n = {
-    consoleFont = "ter-v24b";
-    consolePackages = with pkgs; [
-      terminus_font
-    ];
-  };
-}
M system/settings/hardware/intel-gpu.nix → 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"
   ];
 }
M system/settings/hardware/laptop.nix → 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"
M system/settings/machines/t470s.nix → 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
@@ -21,11 +19,6 @@ (6,     60,     65)     (7,     60,     85)
     (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
   ];
 }
D user/gnupg/.gnupg/trezor/gpg.conf
@@ -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>"