Updated default (non-NVIDIA) config.

Removed xps-common, and migrated it to default.nix.
This commit is contained in:
bahaynes 2020-07-27 13:00:20 -04:00
parent 8e984dc856
commit d56b2e96a6
No known key found for this signature in database
GPG key ID: BBD46B0B5D4DF951
3 changed files with 20 additions and 28 deletions

View file

@ -1,8 +1,24 @@
{ lib, pkgs, ... }:
{ lib, ... }:
let
thermald-conf = ./thermald-conf.xml;
in
{
imports = [
./xps-common.nix
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
];
# Boot loader
boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ];
# This will save you money and possibly your life!
services.thermald.enable = lib.mkDefault true;
# Thermald doesn't have a default config for the 9500 yet, the one in this repo
# was generated with dptfxtract-static (https://github.com/intel/dptfxtract)
services.thermald.configFile = lib.mkDefault thermald-conf;
# Set the tlp config to powersave explictly. TLP is enabled in common/pc/laptop.
services.tlp.extraConfig = lib.mkDefault "CPU_SCALING_GOVERNOR_ON_AC=powersave\nCPU_SCALING_GOVERNOR_ON_BAT=powersave";
}

View file

@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{
imports = [
../xps-common.nix
../default.nix
../../../../common/gpu/nvidia.nix
];

View file

@ -1,24 +0,0 @@
{ lib, ... }:
let
thermald-conf = ./thermald-conf.xml;
in
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
];
# Boot loader
boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ];
# This will save you money and possibly your life!
services.thermald.enable = lib.mkDefault true;
# Thermald doesn't have a default config for the 9500 yet, the one in this repo
# was generated with dptfxtract-static (https://github.com/intel/dptfxtract)
services.thermald.configFile = lib.mkDefault thermald-conf;
# Set the tlp config to powersave explictly. TLP is enabled in common/pc/laptop.
services.tlp.extraConfig = lib.mkDefault "CPU_SCALING_GOVERNOR_ON_AC=powersave\nCPU_SCALING_GOVERNOR_ON_BAT=powersave";
}