From 5650a9c4b7df976645c3d5d931f33392fd475962 Mon Sep 17 00:00:00 2001 From: twoneis Date: Thu, 13 Jun 2024 16:13:24 +0200 Subject: [PATCH] hwmon path as option --- devices/ellaca/options.nix | 2 ++ devices/inkvine/default.nix | 2 +- devices/inkvine/options.nix | 2 ++ devices/pleniscenta/options.nix | 2 ++ modules/home/niri-setup/default.nix | 2 +- options.nix | 5 +++++ outputs.nix | 4 +++- 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix index c9b6f07..4220c5c 100644 --- a/devices/ellaca/options.nix +++ b/devices/ellaca/options.nix @@ -10,4 +10,6 @@ withVM = false; withContainers = true; withGames = false; + + hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; } diff --git a/devices/inkvine/default.nix b/devices/inkvine/default.nix index c573faf..296c06b 100644 --- a/devices/inkvine/default.nix +++ b/devices/inkvine/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ pkgs, ... }: { imports = [ ./options.nix ]; diff --git a/devices/inkvine/options.nix b/devices/inkvine/options.nix index 2ffb2cd..1b74e4d 100644 --- a/devices/inkvine/options.nix +++ b/devices/inkvine/options.nix @@ -10,4 +10,6 @@ withVM = false; withContainers = false; withGames = false; + + hwmonPath = "/sys/class/hwmon/hwmon4/temp1_input"; } diff --git a/devices/pleniscenta/options.nix b/devices/pleniscenta/options.nix index 2ffb2cd..3ce5eb6 100644 --- a/devices/pleniscenta/options.nix +++ b/devices/pleniscenta/options.nix @@ -10,4 +10,6 @@ withVM = false; withContainers = false; withGames = false; + + hwmonPath = "/sys/class/hwmon/hwmon1/temp1_input"; } diff --git a/modules/home/niri-setup/default.nix b/modules/home/niri-setup/default.nix index 5330a54..36fee6f 100644 --- a/modules/home/niri-setup/default.nix +++ b/modules/home/niri-setup/default.nix @@ -40,7 +40,7 @@ in lib.mkIf (osConfig.withNiri) { format = "{usage}%"; }; "temperature" = { - hwmon-path = "/sys/class/hwmon/hwmon4/temp1_input"; + hwmon-path = osConfig.hwmonPath; format = "{temperatureC}°C "; interval = 10; tooltip = false; diff --git a/options.nix b/options.nix index 8eed72f..1da5f53 100644 --- a/options.nix +++ b/options.nix @@ -11,5 +11,10 @@ withVM = mkEnableOption "Enable VM related configuration"; withContainers = mkEnableOption "Enable container support"; withGames = mkEnableOption "Enable games"; + + hwmonPath = mkOption { + type = with types; nullOr str; + default = null; + }; }; } diff --git a/outputs.nix b/outputs.nix index 1b61e52..0ae382e 100644 --- a/outputs.nix +++ b/outputs.nix @@ -35,7 +35,9 @@ ]; }; - # Lenovo Thinkpad + # Lenovo Thinkpad T540p + # Intel i7-4710MQ + # 8GB RAM inkvine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {