From 44f5f67f5cc222a3b8682a6687f5deaf5c948f55 Mon Sep 17 00:00:00 2001
From: urob <978080+urob@users.noreply.github.com>
Date: Thu, 15 Aug 2024 13:24:34 -0400
Subject: [PATCH] Change paths for use as module

- Namespace `zephyr` under `modules`
- Fix `west-commands` paths to work when ZMK is loaded as module
---
 app/scripts/west-commands.yml | 4 ++--
 app/west.yml                  | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/scripts/west-commands.yml b/app/scripts/west-commands.yml
index 64583a90678..40fee6614a8 100644
--- a/app/scripts/west-commands.yml
+++ b/app/scripts/west-commands.yml
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: MIT
 
 west-commands:
-  - file: scripts/west_commands/test.py
+  - file: app/scripts/west_commands/test.py
     commands:
       - name: test
         class: Test
         help: run ZMK testsuite
-  - file: scripts/west_commands/metadata.py
+  - file: app/scripts/west_commands/metadata.py
     commands:
       - name: metadata
         class: Metadata
diff --git a/app/west.yml b/app/west.yml
index 1b50247786b..5a1da2f5e28 100644
--- a/app/west.yml
+++ b/app/west.yml
@@ -10,6 +10,8 @@ manifest:
       revision: v3.5.0+zmk-fixes
       clone-depth: 1
       import:
+        # Namespacing avoids conflicts when ZMK is imported as module
+        path-prefix: modules/zephyr
         name-blocklist:
           - ci-tools
           - hal_altera
@@ -30,4 +32,5 @@ manifest:
           - edtt
           - trusted-firmware-m
   self:
-    west-commands: scripts/west-commands.yml
+    # This works (only) when ZMK is loaded as module
+    west-commands: app/scripts/west-commands.yml