nixos/services.throttled: remove with lib;

This commit is contained in:
Felix Buehler 2024-08-27 20:43:24 +02:00
parent d9dc50dc11
commit 00052ae198

View File

@ -1,23 +1,20 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
cfg = config.services.throttled; cfg = config.services.throttled;
in { in {
options = { options = {
services.throttled = { services.throttled = {
enable = mkEnableOption "fix for Intel CPU throttling"; enable = lib.mkEnableOption "fix for Intel CPU throttling";
extraConfig = mkOption { extraConfig = lib.mkOption {
type = types.str; type = lib.types.str;
default = ""; default = "";
description = "Alternative configuration"; description = "Alternative configuration";
}; };
}; };
}; };
config = mkIf cfg.enable { config = lib.mkIf cfg.enable {
systemd.packages = [ pkgs.throttled ]; systemd.packages = [ pkgs.throttled ];
# The upstream package has this in Install, but that's not enough, see the NixOS manual # The upstream package has this in Install, but that's not enough, see the NixOS manual
systemd.services.throttled.wantedBy = [ "multi-user.target" ]; systemd.services.throttled.wantedBy = [ "multi-user.target" ];
@ -31,6 +28,6 @@ in {
# Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs.
# See https://github.com/erpalma/throttled/issues/215 # See https://github.com/erpalma/throttled/issues/215
hardware.cpu.x86.msr.settings.allow-writes = hardware.cpu.x86.msr.settings.allow-writes =
mkIf (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") "on"; lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.9") "on";
}; };
} }