diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-27 02:57:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-27 03:02:31 +0000 |
| commit | ab630003f4951542d7f246f25c11a19dc718bb64 (patch) | |
| tree | f62eee9a6e91ad9d6ce6a62d68facd23c3c36dbe /modules/nixos-hardware/common/pc | |
| parent | 7eb57d645ab60d8e61911c1aebc221cc2b9d98f8 (diff) | |
| parent | 115770eed0c0fa50c1277cd0f7fe0f15501dbc43 (diff) | |
| download | nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.gz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.bz2 nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.lz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.xz nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.tar.zst nixlib-ab630003f4951542d7f246f25c11a19dc718bb64.zip | |
modules/nixos-hardware: merge 115770eed0c
Diffstat (limited to 'modules/nixos-hardware/common/pc')
| -rw-r--r-- | modules/nixos-hardware/common/pc/default.nix | 6 | ||||
| -rw-r--r-- | modules/nixos-hardware/common/pc/laptop/default.nix | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/nixos-hardware/common/pc/default.nix b/modules/nixos-hardware/common/pc/default.nix index 0b498ff1d20e..8864de1c416a 100644 --- a/modules/nixos-hardware/common/pc/default.nix +++ b/modules/nixos-hardware/common/pc/default.nix @@ -1,5 +1,9 @@ -{ lib, ... }: +{ config, lib, ... }: { + boot.blacklistedKernelModules = lib.optionals (!config.hardware.enableRedistributableFirmware) [ + "ath3k" + ]; + services.xserver.libinput.enable = lib.mkDefault true; } diff --git a/modules/nixos-hardware/common/pc/laptop/default.nix b/modules/nixos-hardware/common/pc/laptop/default.nix index ebc4931dbc29..946d066d04d5 100644 --- a/modules/nixos-hardware/common/pc/laptop/default.nix +++ b/modules/nixos-hardware/common/pc/laptop/default.nix @@ -3,11 +3,5 @@ { imports = [ ../. ]; - # TODO: fix in NixOS/nixpkgs - # Disable governor set in hardware-configuration.nix, - # required when services.tlp.enable is true: - powerManagement.cpuFreqGovernor = - lib.mkIf config.services.tlp.enable (lib.mkForce null); - services.tlp.enable = lib.mkDefault true; } |