From 01119f632aad7fedeef0eb2d10b0cfc64763c18a Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Fri, 19 Sep 2025 20:52:53 +0200
Subject: [PATCH] fix(waybar): bad thermalZone variable type

---
 modules/home-manager/desktop/sway/default.nix         | 2 +-
 modules/home-manager/desktop/sway/includes/waybar.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix
index d8fa2ff..84a6a88 100644
--- a/modules/home-manager/desktop/sway/default.nix
+++ b/modules/home-manager/desktop/sway/default.nix
@@ -74,7 +74,7 @@ in
       cpuThermal = {
 
         thermalZone = mkOption {
-          type = types.int or null;
+          type = types.nullOr types.int;
           default = null;
           description = "CPU thermal hwmon thermal Zone";
         };
diff --git a/modules/home-manager/desktop/sway/includes/waybar.nix b/modules/home-manager/desktop/sway/includes/waybar.nix
index 3f74082..0c9bc96 100644
--- a/modules/home-manager/desktop/sway/includes/waybar.nix
+++ b/modules/home-manager/desktop/sway/includes/waybar.nix
@@ -157,8 +157,8 @@ in
           "temperature" = {
             "critical-threshold" = 80;
             "format" = " {temperatureC}°C  ";
-            "thermal-zone" = mkIf ( cfg.waybar.cpuThermal.thermalZone != "" )
-              "${cfg.waybar.cpuThermal.thermalZone}";
+            "thermal-zone" = mkIf ( cfg.waybar.cpuThermal.thermalZone != null )
+              cfg.waybar.cpuThermal.thermalZone;
             "hwmon-path-abs" = mkIf ( cfg.waybar.cpuThermal.hwmonPathAbs != "" )
               "${cfg.waybar.cpuThermal.hwmonPathAbs}";
             "input-filename" = mkIf ( cfg.waybar.cpuThermal.inputFilename != "" )