diff options
author | Alan Pearce | 2019-10-21 14:58:25 +0200 |
---|---|---|
committer | Alan Pearce | 2019-10-21 14:58:25 +0200 |
commit | 9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa (patch) | |
tree | eeab269e2332e8c20b29e7fead1effd637ff959a /system/settings | |
parent | 6338eb3e142f7dc7568ef454c6a5c0f9f4608b51 (diff) | |
download | nixfiles-9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa.tar.lz nixfiles-9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa.tar.zst nixfiles-9f81cf18d0fac6db133a7df5d6c12c63ee6c25fa.zip |
Replace parts of T470s configuration with nixos-hardware
Diffstat (limited to 'system/settings')
-rw-r--r-- | system/settings/hardware/hidpi.nix | 9 | ||||
-rw-r--r-- | system/settings/hardware/intel-gpu.nix | 12 | ||||
-rw-r--r-- | system/settings/hardware/laptop.nix | 4 | ||||
-rw-r--r-- | system/settings/machines/t470s.nix | 10 |
4 files changed, 5 insertions, 30 deletions
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 ]; } |