Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-hardware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ed0d3cc19855
Choose a base ref
...
head repository: NixOS/nixos-hardware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1ea7efa26286
Choose a head ref
  • 2 commits
  • 7 files changed
  • 2 contributors

Commits on Oct 16, 2019

  1. Replace ad hoc throttling fix with throttled 

    `throttled` is a service designed to fix the same CPU throttling bug,
but it's an actively maintainted upstream project that we can use.
    @michaelpj
    michaelpj committed Oct 16, 2019
    Copy the full SHA
    2bf9422 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #115 from michaelpj/imp/throttled 

    Replace ad hoc throttling fix with throttled
    @Mic92
    Mic92 authored Oct 21, 2019
    Copy the full SHA
    1ea7efa View commit details
38 changes: 0 additions & 38 deletions common/pc/laptop/cpu-throttling-bug.nix
View file

This file was deleted.

3 changes: 2 additions & 1 deletion dell/xps/13-9370/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,13 @@
../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/cpu-throttling-bug.nix
];

# Force S3 sleep mode. See README.wiki for details.
boot.kernelParams = [ "mem_sleep_default=deep" ];

# touchpad goes over i2c
boot.blacklistedKernelModules = [ "psmouse" ];

services.throttled.enable = lib.mkDefault true;
}
5 changes: 3 additions & 2 deletions lenovo/thinkpad/p53/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ nixos, pkgs, config, stdenv, ... }:
{ nixos, pkgs, lib, config, stdenv, ... }:
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/cpu-throttling-bug.nix
../.
];

services.throttled.enable = lib.mkDefault true;
}
3 changes: 2 additions & 1 deletion lenovo/thinkpad/t480s/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/cpu-throttling-bug.nix
../.
];

services.throttled.enable = lib.mkDefault true;
}
5 changes: 3 additions & 2 deletions lenovo/thinkpad/t490/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ nixos, pkgs, config, stdenv, ... }:
{ nixos, lib, pkgs, config, stdenv, ... }:
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/cpu-throttling-bug.nix
../.
];

@@ -26,5 +25,7 @@
LABEL="pulseaudio_end"
'';

throttled.enable = lib.mkDefault true;
};
}
3 changes: 2 additions & 1 deletion lenovo/thinkpad/x1-extreme/gen2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ with lib;
{
imports = [
../.
../../../../common/pc/laptop/cpu-throttling-bug.nix
];

# Fixes an issue with incorrect battery reporting. See
@@ -44,4 +43,6 @@ with lib;
videoDrivers = [ "intel" ];
})
];

services.throttled.enable = lib.mkDefault true;
}
5 changes: 3 additions & 2 deletions lenovo/thinkpad/x1/6th-gen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,16 @@
#
# Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30,
# then manually selecting Linux in the power management section.
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
{
imports = [
../.
../../../../common/pc/laptop/acpi_call.nix
../../../../common/pc/laptop/cpu-throttling-bug.nix
];

# New ThinkPads have a different TrackPoint manufacturer/name.
# See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/
hardware.trackpoint.device = "TPPS/2 Elan TrackPoint";

services.throttled.enable = lib.mkDefault true;
}