Merge branch 'master' into msi_z370
This commit is contained in:
commit
427df66072
4 changed files with 24 additions and 24 deletions
|
|
@ -25,10 +25,10 @@
|
|||
# This enables the brightness and airplane mode keys to work
|
||||
# https://community.frame.work/t/12th-gen-not-sending-xf86monbrightnessup-down/20605/11
|
||||
"hid-sensor-hub"
|
||||
# This fixes controller crashes during sleep
|
||||
# https://community.frame.work/t/tracking-fn-key-stops-working-on-popos-after-a-while/21208/32
|
||||
(lib.mkIf (config.hardware.framework.enableKmod == false) "cros_ec_lpcs")
|
||||
];
|
||||
]
|
||||
# This fixes controller crashes during sleep
|
||||
# https://community.frame.work/t/tracking-fn-key-stops-working-on-popos-after-a-while/21208/32
|
||||
++ lib.optional (config.hardware.framework.enableKmod == false) "cros_ec_lpcs";
|
||||
|
||||
boot.kernelParams = [
|
||||
# For Power consumption
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ let
|
|||
supportedKernels =
|
||||
let
|
||||
lts-kernel = {
|
||||
version = "6.18.8";
|
||||
hash = "sha256-N/DF1cJCwdYE6H1I8IeV6GGlqF9yW0yhHQpTjxL/jP8=";
|
||||
version = "6.18.13";
|
||||
hash = "sha256-7Sw8Vf045oNsCU/ONW8lZ/lRYTC3M1SimFeWA2jFaH8=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -38,8 +38,8 @@ let
|
|||
linux-surface = pkgs.fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = "linux-surface";
|
||||
rev = "faedd344762f9db3fe3c79e4f085d4ca7891e0c8"; # debian-6.18.8-1
|
||||
hash = "sha256-2t5tMvne8W1q/hCO+O5XfuHj6DAzO6iKtCC6egXsWWM=";
|
||||
rev = "829ceccd5970ed3621a30d9fcfb2fe6584a3aab7";
|
||||
hash = "sha256-H/qjP2dR5yjUvHUhI6pis+EHHSRXxc4+c4zir/pDA54=";
|
||||
};
|
||||
|
||||
# Fetch and build the kernel
|
||||
|
|
|
|||
|
|
@ -102,23 +102,23 @@ in
|
|||
target = <&thermal_trips>;
|
||||
__overlay__ {
|
||||
trip0: trip0 {
|
||||
temperature = <${cfg.fan.temperature0}>;
|
||||
hysteresis = <${cfg.fan.hysteresis0}>;
|
||||
temperature = <${toString cfg.fan.temperature0}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis0}>;
|
||||
type = "active";
|
||||
};
|
||||
trip1: trip1 {
|
||||
temperature = <${cfg.fan.temperature1}>;
|
||||
hysteresis = <${cfg.fan.hysteresis1}>;
|
||||
temperature = <${toString cfg.fan.temperature1}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis1}>;
|
||||
type = "active";
|
||||
};
|
||||
trip2: trip2 {
|
||||
temperature = <${cfg.fan.temperature2}>;
|
||||
hysteresis = <${cfg.fan.hysteresis2}>;
|
||||
temperature = <${toString cfg.fan.temperature2}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis2}>;
|
||||
type = "active";
|
||||
};
|
||||
trip3: trip3 {
|
||||
temperature = <${cfg.fan.temperature3}>;
|
||||
hysteresis = <${cfg.fan.hysteresis3}>;
|
||||
temperature = <${toString cfg.fan.temperature3}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis3}>;
|
||||
type = "active";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -104,23 +104,23 @@ in
|
|||
target = <&thermal_trips>;
|
||||
__overlay__ {
|
||||
trip0: trip0 {
|
||||
temperature = <${cfg.fan.temperature0}>;
|
||||
hysteresis = <${cfg.fan.hysteresis0}>;
|
||||
temperature = <${toString cfg.fan.temperature0}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis0}>;
|
||||
type = "active";
|
||||
};
|
||||
trip1: trip1 {
|
||||
temperature = <${cfg.fan.temperature1}>;
|
||||
hysteresis = <${cfg.fan.hysteresis1}>;
|
||||
temperature = <${toString cfg.fan.temperature1}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis1}>;
|
||||
type = "active";
|
||||
};
|
||||
trip2: trip2 {
|
||||
temperature = <${cfg.fan.temperature2}>;
|
||||
hysteresis = <${cfg.fan.hysteresis2}>;
|
||||
temperature = <${toString cfg.fan.temperature2}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis2}>;
|
||||
type = "active";
|
||||
};
|
||||
trip3: trip3 {
|
||||
temperature = <${cfg.fan.temperature3}>;
|
||||
hysteresis = <${cfg.fan.hysteresis3}>;
|
||||
temperature = <${toString cfg.fan.temperature3}>;
|
||||
hysteresis = <${toString cfg.fan.hysteresis3}>;
|
||||
type = "active";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue