Merge branch 'master' into iptsd
This commit is contained in:
commit
755815160a
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
|
@ -9,6 +9,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
# when updating channels, also update .mergify.yml
|
||||||
channel: [ nixos-unstable, nixos-24.05 ]
|
channel: [ nixos-unstable, nixos-24.05 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
queue_rules:
|
queue_rules:
|
||||||
- name: default
|
- name: default
|
||||||
merge_conditions:
|
merge_conditions:
|
||||||
- check-success=tests
|
- check-success=tests (nixos-24.05)
|
||||||
|
- check-success=tests (nixos-unstable)
|
||||||
defaults:
|
defaults:
|
||||||
actions:
|
actions:
|
||||||
queue:
|
queue:
|
||||||
|
|
|
@ -15,4 +15,9 @@
|
||||||
|
|
||||||
services.iptsd.enable = lib.mkDefault true;
|
services.iptsd.enable = lib.mkDefault true;
|
||||||
environment.systemPackages = [ pkgs.surface-control ];
|
environment.systemPackages = [ pkgs.surface-control ];
|
||||||
|
|
||||||
|
services.thermald = lib.mkDefault {
|
||||||
|
enable = true;
|
||||||
|
configFile = ./thermal-conf.xml;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
27
microsoft/surface/surface-pro-intel/thermal-conf.xml
Normal file
27
microsoft/surface/surface-pro-intel/thermal-conf.xml
Normal 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>
|
Loading…
Reference in a new issue