testing

.gitignore

@@ -4,6 +4,7 @@
 /tools
 /zephyr
 /zmk-config
+/external-zmk-modules
 /build
 
 # macOS

app/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13.1)
 
 set(CONFIG_APPLICATION_DEFINED_SYSCALL true)
 
-set(ZEPHYR_EXTRA_MODULES "${ZMK_EXTRA_MODULES};${CMAKE_CURRENT_SOURCE_DIR}/module;${CMAKE_CURRENT_SOURCE_DIR}/keymap-module")
+set(EXTRA_ZEPHYR_MODULES "${ZMK_EXTRA_MODULES};${CMAKE_CURRENT_SOURCE_DIR}/module;${CMAKE_CURRENT_SOURCE_DIR}/keymap-module")
 
 # Find Zephyr. This also loads Zephyr's build system.
 find_package(Zephyr REQUIRED HINTS ../zephyr)

app/keymap-module/modules/modules.cmake

@@ -41,6 +41,8 @@ elseif(DEFINED ENV{ZMK_CONFIG})
 
 elseif(user_config_app_cmake_lists)
     set(ZMK_CONFIG ${user_config_app_cmake_lists})
+else()
+    set(ZMK_CONFIG ${APPLICATION_SOURCE_DIR}/../zmk-config/config)
 endif()
 
 # Store the selected user_config in the cache
@@ -50,10 +52,12 @@ if (ZMK_CONFIG)
     set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
     if(EXISTS ${ZMK_CONFIG}/boards)
         message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}")
+        message(DEPRECATION "Using the config folder as board root is deprecated.")
         list(APPEND BOARD_ROOT ${ZMK_CONFIG})
     endif()
     if(EXISTS ${ZMK_CONFIG}/dts)
         message(STATUS "Adding ZMK config directory as DTS root: ${ZMK_CONFIG}")
+        message(DEPRECATION "Using the config folder as DTS root is deprecated.")
         list(APPEND DTS_ROOT ${ZMK_CONFIG})
     endif()
 endif()

local/config-import.yml

@@ -0,0 +1,6 @@
+manifest:
+  self:
+    import:
+      file: ../zmk-config/config/west.yml
+      name-blocklist: [zmk]
+

local/west.yml

@@ -0,0 +1,5 @@
+manifest:
+  self:
+    import: 
+      - config-import.yml
+      - ../app/west.yml