From 1c08c88097a4a4e618f1116e64db41d1d70b7b10 Mon Sep 17 00:00:00 2001
From: Nick Conway <nick@conway.dev>
Date: Sun, 15 Jun 2025 16:07:28 -0400
Subject: [PATCH] feat(leader): update kconfig

---
 app/CMakeLists.txt    |  1 +
 app/Kconfig           | 12 ------------
 app/Kconfig.behaviors |  5 +++++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index d78fb96fc..1041e10e5 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -54,6 +54,7 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources(app PRIVATE src/behaviors/behavior_caps_word.c)
   target_sources(app PRIVATE src/behaviors/behavior_key_repeat.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_MACRO app PRIVATE src/behaviors/behavior_macro.c)
+  target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_LEADER_KEY app PRIVATE src/leader.c)
   target_sources_ifdef(CONFIG_ZMK_BEHAVIOR_LEADER_KEY app PRIVATE src/behaviors/behavior_leader_key.c)
   target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
   target_sources(app PRIVATE src/behaviors/behavior_mod_morph.c)
diff --git a/app/Kconfig b/app/Kconfig
index 99786af72..e0b627f9b 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -483,18 +483,6 @@ config ZMK_MACRO_DEFAULT_TAP_MS
     int "Default time to wait (in milliseconds) between the press and release events of a tapped behavior in macros"
     default 30
 
-DT_COMPAT_ZMK_LEADER := zmk,leader-sequences
-
-config ZMK_LEADER
-        bool
-        default $(dt_compat_enabled,$(DT_COMPAT_ZMK_LEADER))
-
-DT_COMPAT_ZMK_BEHAVIOR_LEADER_KEY := zmk,behavior-leader-key
-
-config ZMK_BEHAVIOR_LEADER_KEY
-        bool
-        default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BEHAVIOR_LEADER_KEY))
-
 endmenu
 
 menu "Advanced"
diff --git a/app/Kconfig.behaviors b/app/Kconfig.behaviors
index da9bcc41a..8a93d2b5d 100644
--- a/app/Kconfig.behaviors
+++ b/app/Kconfig.behaviors
@@ -134,3 +134,8 @@ config ZMK_BEHAVIOR_MACRO
     bool
     default y
     depends on DT_HAS_ZMK_BEHAVIOR_MACRO_ENABLED || DT_HAS_ZMK_BEHAVIOR_MACRO_ONE_PARAM_ENABLED || DT_HAS_ZMK_BEHAVIOR_MACRO_TWO_PARAM_ENABLED
+
+config ZMK_BEHAVIOR_LEADER_KEY
+    bool
+    default y
+    depends on DT_HAS_ZMK_BEHAVIOR_LEADER_KEY_ENABLED || DT_HAS_ZMK_BEHAVIOR_LEADER_SEQUENCES_ENABLED