From 5488081c6577539cbf144b8ffcff409da73d2824 Mon Sep 17 00:00:00 2001
From: urob <978080+urob@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:05:20 -0400
Subject: [PATCH] upgrade to zmk-helpers v2

---
 .gitmodules                | 3 ---
 config/base.keymap         | 6 +++---
 config/corneish_zen.keymap | 4 ++--
 config/glove80.keymap      | 4 ++--
 config/planck_rev6.keymap  | 4 ++--
 config/west.yml            | 3 +++
 zmk-nodefree-config        | 1 -
 7 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 zmk-nodefree-config

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 314a3c9..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "zmk-nodefree-config"]
-	path = zmk-nodefree-config
-	url = https://github.com/urob/zmk-nodefree-config
diff --git a/config/base.keymap b/config/base.keymap
index 24d29cb..f8adfb3 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -7,9 +7,9 @@
     #define _BT_SEL_KEYS_ &trans &trans &trans &trans &trans
 #endif
 
-#include "../zmk-nodefree-config/helper.h"
-#include "../zmk-nodefree-config/international_chars/greek.dtsi"
-#include "../zmk-nodefree-config/international_chars/german.dtsi"
+#include "zmk-helpers/helper.h"
+#include "zmk-helpers/unicode-chars/greek.dtsi"
+#include "zmk-helpers/unicode-chars/german.dtsi"
 
 #define DEF 0
 #define NAV 1
diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap
index 3b8bb3b..81f5c1f 100644
--- a/config/corneish_zen.keymap
+++ b/config/corneish_zen.keymap
@@ -1,5 +1,5 @@
-/* source keypos definitions */
-#include "../zmk-nodefree-config/keypos_def/keypos_36keys.h"
+/* source key position labels */
+#include "zmk-helpers/key-labels/36.h"
 
 /* map Zen's extra keys */
 #define X_LH  &kp LGUI      // thumb row, left
diff --git a/config/glove80.keymap b/config/glove80.keymap
index 2c103bc..1fee54c 100644
--- a/config/glove80.keymap
+++ b/config/glove80.keymap
@@ -1,5 +1,5 @@
-/* source keypos definitions */
-#include "../zmk-nodefree-config/keypos_def/keypos_glv80.h"
+/* source key position labels */
+#include "zmk-helpers/key-labels/glove80.h"
 
 /* map the Glove's extra keys */
 #define X_LT  \
diff --git a/config/planck_rev6.keymap b/config/planck_rev6.keymap
index d19be4d..2439269 100644
--- a/config/planck_rev6.keymap
+++ b/config/planck_rev6.keymap
@@ -1,5 +1,5 @@
-/* source keypos definitions */
-#include "../zmk-nodefree-config/keypos_def/keypos_48keys_wide.h"
+/* source key position labels */
+#include "zmk-helpers/key-labels/48_wide.h"
 
 /* map Planck's extra keys */
 #define X_MT  &none &none                // top row, middle
diff --git a/config/west.yml b/config/west.yml
index bfee2ba..d1372d7 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -9,5 +9,8 @@ manifest:
       remote: urob
       revision: main
       import: app/west.yml
+    - name: zmk-helpers
+      remote: urob
+      revision: v2
   self:
     path: config
diff --git a/zmk-nodefree-config b/zmk-nodefree-config
deleted file mode 160000
index cee51bb..0000000
--- a/zmk-nodefree-config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cee51bb018436b4e6a67fbf40e0d7b764ba75b7b