diff --git a/esphome/components/text/text_traits.h b/esphome/components/text/text_traits.h
index a7fadbf93c..6ec1e9da69 100644
--- a/esphome/components/text/text_traits.h
+++ b/esphome/components/text/text_traits.h
@@ -21,7 +21,7 @@ class TextTraits {
   int get_max_length() const { return this->max_length_; }
 
   // Set/get the pattern.
-  void set_pattern(const std::string &pattern) { this->pattern_ = std::move(pattern); }
+  void set_pattern(const std::string &pattern) { this->pattern_ = pattern; }
   std::string get_pattern() const { return this->pattern_; }
 
   // Set/get the frontend mode.
diff --git a/esphome/components/time/real_time_clock.h b/esphome/components/time/real_time_clock.h
index cc41ddd0ef..900ca2271e 100644
--- a/esphome/components/time/real_time_clock.h
+++ b/esphome/components/time/real_time_clock.h
@@ -37,9 +37,7 @@ class RealTimeClock : public PollingComponent {
 
   void call_setup() override;
 
-  void add_on_time_sync_callback(const std::function<void()> &callback) {
-    this->time_sync_callback_.add(std::move(callback));
-  };
+  void add_on_time_sync_callback(const std::function<void()> &callback) { this->time_sync_callback_.add(callback); };
 
  protected:
   /// Report a unix epoch as current time.
diff --git a/platformio.ini b/platformio.ini
index f8a6a681ab..f1dc48f6aa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -194,6 +194,7 @@ build_flags =
     -DUSE_ZEPHYR
     -DUSE_NRF52
 lib_deps =
+    bblanchon/ArduinoJson@7.0.0           ; json
 
 ; All the actual environments are defined below.
 
diff --git a/script/clang-tidy b/script/clang-tidy
index 2fd01241db..7d1fff5fcb 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -116,9 +116,8 @@ def clang_options(idedata):
         # skip our own directories, we add those later
         if (
             not directory.startswith(f"{root_path}/")
-            or directory.startswith(f"{root_path}/.pio/")
+            or (directory.startswith(f"{root_path}") and "/.pio/" in directory)
             or directory.startswith(f"{root_path}/managed_components/")
-            or "zephyr/include/generated" in directory
         ):
             cmd.extend(["-isystem", directory])