chore: change fw-fanctrl to upstream module
Some checks failed
Flake check / Check flake (push) Has been cancelled

This commit is contained in:
Leon Schwarzäugl 2025-09-26 08:50:06 +02:00
parent 355cf03bd1
commit a896d5eb5d
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
3 changed files with 2382 additions and 376 deletions

View file

@ -451,11 +451,12 @@ A short overview over each input and what it does:
zjstatus = {
url = "github:dj95/zjstatus";
};
fw-fanctrl = {
# url = "github:TamtamHero/fw-fanctrl/packaging/nix";
url = "github:Swarsel/fw-fanctrl/packaging/nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# has been upstreamed
# fw-fanctrl = {
# # url = "github:TamtamHero/fw-fanctrl/packaging/nix";
# url = "github:Swarsel/fw-fanctrl/packaging/nix";
# inputs.nixpkgs.follows = "nixpkgs";
# };
nix-darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
@ -10414,9 +10415,9 @@ This holds configuration that is specific to framework laptops.
#+begin_src nix-ts :tangle modules/nixos/optional/framework.nix
{ lib, config, inputs, ... }:
{
imports = [
inputs.fw-fanctrl.nixosModules.default
];
# imports = [
# inputs.fw-fanctrl.nixosModules.default
# ];
options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselmodules.optional.framework {
services = {
@ -10434,7 +10435,7 @@ This holds configuration that is specific to framework laptops.
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
'';
};
programs.fw-fanctrl = {
hardware.fw-fanctrl = {
enable = true;
config = {
defaultStrategy = "lazy";