Merge branch 'master' into iptsd

This commit is contained in:
Jörg Thalheim 2024-06-23 14:05:16 +02:00 committed by GitHub
commit 755815160a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 1 deletions

View file

@ -9,6 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# when updating channels, also update .mergify.yml
channel: [ nixos-unstable, nixos-24.05 ]
steps:
- uses: actions/checkout@v4

View file

@ -1,7 +1,8 @@
queue_rules:
- name: default
merge_conditions:
- check-success=tests
- check-success=tests (nixos-24.05)
- check-success=tests (nixos-unstable)
defaults:
actions:
queue:

View file

@ -15,4 +15,9 @@
services.iptsd.enable = lib.mkDefault true;
environment.systemPackages = [ pkgs.surface-control ];
services.thermald = lib.mkDefault {
enable = true;
configFile = ./thermal-conf.xml;
};
}

View file

@ -0,0 +1,27 @@
<?xml version="1.0"?>
<ThermalConfiguration>
<Platform>
<Name>Surface Pro Intel Thermal Workaround</Name>
<ProductName>*</ProductName>
<Preference>QUIET</Preference>
<ThermalZones>
<ThermalZone>
<Type>cpu</Type>
<TripPoints>
<TripPoint>
<SensorType>x86_pkg_temp</SensorType>
<Temperature>65000</Temperature>
<type>passive</type>
<ControlType>SEQUENTIAL</ControlType>
<CoolingDevice>
<index>1</index>
<type>rapl_controller</type>
<influence>100</influence>
<SamplingPeriod>10</SamplingPeriod>
</CoolingDevice>
</TripPoint>
</TripPoints>
</ThermalZone>
</ThermalZones>
</Platform>
</ThermalConfiguration>