Move single `LAYOUT`s to data driven (#20365)

2 files changed, 40 insertions, 54 deletions

diff --git a/keyboards/emptystring/nqg/info.json b/keyboards/emptystring/nqg/info.json
index 76bdb7fbe1..a64d706719 100644
--- a/keyboards/emptystring/nqg/info.json
+++ b/keyboards/emptystring/nqg/info.json
@@ -18,43 +18,46 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"A", "x":1, "y":1},
-                {"label":"S", "x":2, "y":1},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1},
-                {"label":"G", "x":5, "y":1},
-                {"label":"H", "x":6, "y":1},
-                {"label":"J", "x":7, "y":1},
-                {"label":"K", "x":8, "y":1},
-                {"label":"L", "x":9, "y":1},
-                {"label":"; '", "x":10, "y":1},
-                {"label":"Z", "x":1, "y":2},
-                {"label":"X", "x":2, "y":2},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2},
-                {"label":"B", "x":5, "y":2},
-                {"label":"N", "x":6, "y":2},
-                {"label":"M", "x":7, "y":2},
-                {"label":",", "x":8, "y":2},
-                {"label":".", "x":9, "y":2},
-                {"label":"/ Enter", "x":10, "y":2},
-                {"label":"Shift / Tab", "x":0, "y":2},
-                {"label":"LT(_LOWER, KC_ESC)", "x":3, "y":3},
-                {"label":"Ctrl / Backspace", "x":4, "y":3},
-                {"label":"Ctrl / Backspace", "x":5, "y":3},
-                {"label":"Space", "x":6, "y":3},
-                {"label":"Space", "x":7, "y":3},
-                {"label":"MO(_RAISE)", "x":8, "y":3}
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+
+                {"matrix": [2, 0], "x": 1, "y": 2},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3}
             ]
         }
     }
diff --git a/keyboards/emptystring/nqg/nqg.h b/keyboards/emptystring/nqg/nqg.h
deleted file mode 100644
index 004fbb5456..0000000000
--- a/keyboards/emptystring/nqg/nqg.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-         L00, L01, L02, L03, L04,      L05, L06, L07, L08, L09, \
-         L10, L11, L12, L13, L14,      L15, L16, L17, L18, L19, \
-         L20, L21, L22, L23, L24,      L25, L26, L27, L28, L29, \
-         L30,      L32, L33, L34,      L35, L36, L37            \
-    ) { \
-        {L00, L01,   L02, L03, L04, L05, L06, L07, L08,   L09},  \
-        {L10, L11,   L12, L13, L14, L15, L16, L17, L18,   L19},  \
-        {L20, L21,   L22, L23, L24, L25, L26, L27, L28,   L29},  \
-        {L30, KC_NO, L32, L33, L34, L35, L36, L37, KC_NO, KC_NO} \
-      }