diff --git a/default.nix b/default.nix index c287945..64fb9ce 100755 --- a/default.nix +++ b/default.nix @@ -10,6 +10,7 @@ in { (mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name]) inputs.nix-colors.homeManagerModules.default # >home manager modules >in non-hm modules inputs.nix-index-database.nixosModules.default + inputs.t2fanrd.nixosModules.t2fanrd inputs.niri.nixosModules.niri ] ++ (mapModulesRec' (toString ./modules) import); diff --git a/flake.lock b/flake.lock index 163eb06..562163d 100644 --- a/flake.lock +++ b/flake.lock @@ -530,6 +530,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", @@ -575,6 +591,7 @@ "nixpkgs": "nixpkgs_4", "rofi-catppuccin": "rofi-catppuccin", "systems": "systems_2", + "t2fanrd": "t2fanrd", "vicinae": "vicinae", "vicinae-extensions": "vicinae-extensions", "waybar-catppuccin": "waybar-catppuccin" @@ -640,9 +657,27 @@ "type": "github" } }, + "t2fanrd": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1775302822, + "narHash": "sha256-QoK8SYoIc0d/PoRdIUo+fkDNAHZIP2+AJ6PDM9ehGiY=", + "owner": "gnomeddev", + "repo": "t2fanrd", + "rev": "5b1c0c10785b8e8dfe124a4d6aaa7c2becdac65c", + "type": "github" + }, + "original": { + "owner": "gnomeddev", + "repo": "t2fanrd", + "type": "github" + } + }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 8db88dc..326097e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + t2fanrd.url = "github:gnomeddev/t2fanrd"; + niri.url = "github:sodiboo/niri-flake/pull/1731/head"; vicinae.url = "github:vicinaehq/vicinae"; diff --git a/hosts/goopnet-interface/apple-macbook-air-9-1.nix b/hosts/goopnet-interface/apple-macbook-air-9-1.nix index e7e46d2..edffcdf 100644 --- a/hosts/goopnet-interface/apple-macbook-air-9-1.nix +++ b/hosts/goopnet-interface/apple-macbook-air-9-1.nix @@ -9,7 +9,15 @@ # power-profile-daemon for power management services.power-profiles-daemon.enable = true; # manage fans for macbook devices - services.mbpfan.enable = true; + # see: https://github.com/GnomedDev/T2FanRD/blob/5b1c0c10785b8e8dfe124a4d6aaa7c2becdac65c/src/config.rs#L62 + services.mbpfan.enable = false; + services.t2fanrd.enable = true; + services.t2fanrd.config.Fan1 = { + low_temp = 55; + high_temp = 75; + speed_curve = "linear"; + always_full_speed = false; + }; # better performance than the actual intel driver services.xserver.videoDrivers = [ "modesetting" ];