diff --git a/.clang-tidy.hash b/.clang-tidy.hash
index 3c1c2be289..6f6339ff84 100644
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-fe0fe4fde52c61eb40b1214675af8db44d2678c6b7bc2674d51ed4836ecf94da
+442b8197be00e6fee6b1b64b07a0e3b3558188fddf1d9c510565da884687c451
diff --git a/platformio.ini b/platformio.ini
index d60a4fd68d..718dfb672f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -97,6 +97,16 @@ build_flags =
 build_unflags =
     ${common.build_unflags}
 
+; Libraries shared by the non-ESP32 embedded environments (esp8266, rp2040,
+; libretiny, nrf52). On ESP32 these are provided as ESP-IDF managed components
+; via the esphome/idf_component.yml manifest, so they must not be listed in the
+; esp32 envs (which would double-include them).
+[common:idf-component-libs]
+lib_deps =
+    esphome/dlms_parser@1.1.0             ; dlms_meter
+    bblanchon/ArduinoJson@7.4.2           ; json
+    lvgl/lvgl@9.5.0                       ; lvgl
+
 ; This are common settings for the ESP8266 using Arduino.
 [common:esp8266-arduino]
 extends = common:arduino
@@ -107,9 +117,8 @@ platform_packages =
 framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
-    esphome/dlms_parser@1.1.0             ; dlms_meter
+    ${common:idf-component-libs.lib_deps}
     fastled/FastLED@3.9.16                ; fastled_base
-    bblanchon/ArduinoJson@7.4.2           ; json
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
     ESP32Async/ESPAsyncTCP@2.0.0          ; async_tcp
@@ -119,7 +128,6 @@ lib_deps =
     ESP8266mDNS                           ; mdns (Arduino built-in)
     DNSServer                             ; captive_portal (Arduino built-in)
     droscy/esp_wireguard@0.4.5            ; wireguard
-    lvgl/lvgl@9.5.0                       ; lvgl
 
 build_flags =
     ${common:arduino.build_flags}
@@ -194,12 +202,9 @@ platform_packages =
 framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
-    esphome/dlms_parser@1.1.0             ; dlms_meter
-    fastled/FastLED@3.9.16                ; fastled_base
+    ${common:idf-component-libs.lib_deps}
     ayushsharma82/RPAsyncTCP@1.3.2        ; async_tcp
-    bblanchon/ArduinoJson@7.4.2           ; json
     ESP32Async/ESPAsyncWebServer@3.9.6    ; web_server_base
-    lvgl/lvgl@9.5.0                       ; lvgl
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_RP2040
@@ -214,11 +219,9 @@ platform = https://github.com/libretiny-eu/libretiny.git#v1.12.1
 framework = arduino
 lib_compat_mode = soft
 lib_deps =
-    esphome/dlms_parser@1.1.0             ; dlms_meter
-    bblanchon/ArduinoJson@7.4.2           ; json
+    ${common:idf-component-libs.lib_deps}
     ESP32Async/ESPAsyncWebServer@3.9.6    ; web_server_base
     droscy/esp_wireguard@0.4.5            ; wireguard
-    lvgl/lvgl@9.5.0                       ; lvgl
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_LIBRETINY
@@ -239,9 +242,7 @@ build_flags =
     -DUSE_NRF52
 lib_deps =
     ${common.lib_deps_base}
-    esphome/dlms_parser@1.1.0             ; dlms_meter
-    bblanchon/ArduinoJson@7.4.2           ; json
-    lvgl/lvgl@9.5.0                       ; lvgl
+    ${common:idf-component-libs.lib_deps}
 
 ; All the actual environments are defined below.