Merge pull request #367 from NixOS/surface

Surface: refactoring + wifi firmware
This commit is contained in:
Jörg Thalheim 2022-02-02 09:56:22 +01:00 committed by GitHub
commit 57c7dfde9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 19 deletions

View File

@ -1,6 +1,25 @@
{ config, lib, pkgs, ... }: {
imports =
[ ./kernel ./hardware_configuration.nix ./firmware/surface-go/ath10k ];
imports = [
./kernel
./firmware/surface-go/ath10k
];
boot.extraModprobeConfig = lib.mkDefault ''
options i915 enable_fbc=1 enable_rc6=1 modeset=1
options snd_hda_intel power_save=1
options snd_ac97_codec power_save=1
options iwlwifi power_save=Y
options iwldvm force_cam=N
'';
boot.kernelParams = [ "mem_sleep_default=deep" ];
# NOTE: Check the README before enabling TLP:
services.tlp.enable = lib.mkDefault false;
# i.e. needed for wifi firmware, see https://github.com/NixOS/nixos-hardware/issues/364
hardware.enableRedistributableFirmware = lib.mkDefault true;
hardware.sensor.iio.enable = lib.mkDefault true;
environment.systemPackages = with pkgs; [ surface-control ];
users.groups.surface-control = { };

View File

@ -1,17 +0,0 @@
{ config, lib, pkgs, ... }:
{
boot.extraModprobeConfig = lib.mkDefault ''
options i915 enable_fbc=1 enable_rc6=1 modeset=1
options snd_hda_intel power_save=1
options snd_ac97_codec power_save=1
options iwlwifi power_save=Y
options iwldvm force_cam=N
'';
boot.kernelParams = [ "mem_sleep_default=deep" ];
# NOTE: Check the README before enabling TLP:
services.tlp.enable = lib.mkDefault false;
hardware.sensor.iio.enable = lib.mkDefault true;
}