Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 183 insertions, 75 deletions

diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 1cbb042b83..803f64025f 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -14,5 +14,187 @@
         "on_state": 0
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [6, 0], "x": 2.25, "y": 1},
+                {"matrix": [5, 0], "x": 3.25, "y": 1},
+                {"matrix": [4, 0], "x": 4.25, "y": 1},
+                {"matrix": [3, 0], "x": 5.25, "y": 1},
+                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 2},
+                {"matrix": [5, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 1], "x": 4.25, "y": 2},
+                {"matrix": [3, 1], "x": 5.25, "y": 2},
+                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [5, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 2], "x": 5.25, "y": 3},
+                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [3, 3], "x": 5.25, "y": 4},
+                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 5},
+                {"matrix": [5, 4], "x": 3.25, "y": 5},
+                {"matrix": [3, 4], "x": 4.25, "y": 5},
+                {"matrix": [3, 6], "x": 5.25, "y": 6},
+                {"matrix": [3, 5], "x": 6.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 7},
+                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [7, 5], "x": 6.25, "y": 8},
+                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [9, 4], "x": 9.25, "y": 1},
+                {"matrix": [10, 4], "x": 10.25, "y": 1},
+                {"matrix": [11, 4], "x": 11.25, "y": 1},
+                {"matrix": [13, 4], "x": 12.25, "y": 1},
+                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 2},
+                {"matrix": [10, 5], "x": 10.25, "y": 2},
+                {"matrix": [11, 5], "x": 11.25, "y": 2},
+                {"matrix": [13, 5], "x": 12.25, "y": 2},
+                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [10, 6], "x": 10.25, "y": 3},
+                {"matrix": [11, 6], "x": 11.25, "y": 3},
+                {"matrix": [13, 6], "x": 12.25, "y": 3},
+                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+                {"matrix": [9, 7], "x": 9.25, "y": 4},
+                {"matrix": [10, 7], "x": 10.25, "y": 4},
+                {"matrix": [11, 7], "x": 11.25, "y": 4},
+                {"matrix": [13, 7], "x": 12.25, "y": 4},
+                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 3], "x": 10.25, "y": 5},
+                {"matrix": [11, 3], "x": 11.25, "y": 5},
+                {"matrix": [13, 3], "x": 12.25, "y": 5},
+                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 6},
+                {"matrix": [6, 6], "x": 9.25, "y": 6},
+                {"matrix": [6, 7], "x": 8.25, "y": 7},
+                {"matrix": [8, 7], "x": 8.25, "y": 8},
+                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+            ]
+        },
+        "LAYOUT_pretty": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 0], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [12, 1], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
+                {"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [6, 0], "x": 2.25, "y": 1},
+                {"matrix": [5, 0], "x": 3.25, "y": 1},
+                {"matrix": [4, 0], "x": 4.25, "y": 1},
+                {"matrix": [3, 0], "x": 5.25, "y": 1},
+                {"matrix": [9, 4], "x": 9.25, "y": 1},
+                {"matrix": [10, 4], "x": 10.25, "y": 1},
+                {"matrix": [11, 4], "x": 11.25, "y": 1},
+                {"matrix": [13, 4], "x": 12.25, "y": 1},
+                {"matrix": [14, 4], "x": 13.25, "y": 1.25},
+                {"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
+                {"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 2},
+                {"matrix": [5, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 1], "x": 4.25, "y": 2},
+                {"matrix": [3, 1], "x": 5.25, "y": 2},
+                {"matrix": [9, 5], "x": 9.25, "y": 2},
+                {"matrix": [10, 5], "x": 10.25, "y": 2},
+                {"matrix": [11, 5], "x": 11.25, "y": 2},
+                {"matrix": [13, 5], "x": 12.25, "y": 2},
+                {"matrix": [14, 5], "x": 13.25, "y": 2.25},
+                {"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
+                {"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [7, 2], "x": 1.25, "y": 3.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 3},
+                {"matrix": [5, 2], "x": 3.25, "y": 3},
+                {"matrix": [4, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 2], "x": 5.25, "y": 3},
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [10, 6], "x": 10.25, "y": 3},
+                {"matrix": [11, 6], "x": 11.25, "y": 3},
+                {"matrix": [13, 6], "x": 12.25, "y": 3},
+                {"matrix": [14, 6], "x": 13.25, "y": 3.25},
+                {"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
+                {"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [7, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [6, 3], "x": 2.25, "y": 4},
+                {"matrix": [5, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [3, 3], "x": 5.25, "y": 4},
+                {"matrix": [9, 7], "x": 9.25, "y": 4},
+                {"matrix": [10, 7], "x": 10.25, "y": 4},
+                {"matrix": [11, 7], "x": 11.25, "y": 4},
+                {"matrix": [13, 7], "x": 12.25, "y": 4},
+                {"matrix": [14, 7], "x": 13.25, "y": 4.25},
+                {"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
+                {"matrix": [7, 4], "x": 1.25, "y": 5.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 5},
+                {"matrix": [5, 4], "x": 3.25, "y": 5},
+                {"matrix": [3, 4], "x": 4.25, "y": 5},
+                {"matrix": [9, 3], "x": 10.25, "y": 5},
+                {"matrix": [11, 3], "x": 11.25, "y": 5},
+                {"matrix": [13, 3], "x": 12.25, "y": 5},
+                {"matrix": [14, 3], "x": 13.25, "y": 5.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 6},
+                {"matrix": [3, 5], "x": 6.25, "y": 6},
+                {"matrix": [4, 7], "x": 8.25, "y": 6},
+                {"matrix": [6, 6], "x": 9.25, "y": 6},
+                {"matrix": [5, 5], "x": 6.25, "y": 7},
+                {"matrix": [6, 7], "x": 8.25, "y": 7},
+                {"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
+                {"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
+                {"matrix": [7, 5], "x": 6.25, "y": 8},
+                {"matrix": [8, 7], "x": 8.25, "y": 8},
+                {"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
+                {"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h b/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h
deleted file mode 100644
index 2aabcad1b8..0000000000
--- a/keyboards/kinesis/nguyenvietyen/nguyenvietyen.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT(                                    \
-    k02, k22, k12, k01, k21, k11, k00, k20, k10,   \
-    k80, k70, k60, k50, k40, k30,                  \
-    k81, k71, k61, k51, k41, k31,                  \
-    k82, k72, k62, k52, k42, k32,                  \
-    k83, k73, k63, k53, k43, k33,                  \
-         k74, k64, k54, k34,                       \
-                             k36, k35,             \
-                                  k55,             \
-                        k56, k46, k75,             \
-                                                   \
-    k03, k23, k13, k04, k24, k14, k05, kC0, kC1,   \
-                   k94, kA4, kB4, kD4, kE4, kF4,   \
-                   k95, kA5, kB5, kD5, kE5, kF5,   \
-                   k96, kA6, kB6, kD6, kE6, kF6,   \
-                   k97, kA7, kB7, kD7, kE7, kF7,   \
-                        k93, kB3, kD3, kE3,        \
-              k47, k66,                            \
-              k67,                                 \
-              k87, k76, k86                        \
-) {                                                \
-    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \
-    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \
-    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \
-    { k80,  k81,  k82,  k83,  ___,  ___,  k86,  k87 }, \
-    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \
-    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \
-    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \
-    { kC0,  kC1,  ___,  ___,  ___,  ___,  ___,  ___ }, \
-    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \
-    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \
-    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \
-}
-
-/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */
-#define LAYOUT_pretty(                                                                           \
-    k02, k22, k12, k01, k21, k11, k00, k20, k10,   k03, k23, k13, k04, k24, k14, k05, kC0, kC1,  \
-    k80, k70, k60, k50, k40, k30,                                 k94, kA4, kB4, kD4, kE4, kF4,  \
-    k81, k71, k61, k51, k41, k31,                                 k95, kA5, kB5, kD5, kE5, kF5,  \
-    k82, k72, k62, k52, k42, k32,                                 k96, kA6, kB6, kD6, kE6, kF6,  \
-    k83, k73, k63, k53, k43, k33,                                 k97, kA7, kB7, kD7, kE7, kF7,  \
-         k74, k64, k54, k34,                                           k93, kB3, kD3, kE3,       \
-                             k36, k35,                       k47, k66,                           \
-                                  k55,                       k67,                                \
-                        k56, k46, k75,                       k87, k76, k86                       \
-) {                                                    \
-    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \
-    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \
-    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \
-    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \
-    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \
-    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \
-    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \
-    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \
-    { k80,  k81,  k82,  k83,  ___,  ___,  k86,  k87 }, \
-    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \
-    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \
-    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \
-    { kC0,  kC1,  ___,  ___,  ___,  ___,  ___,  ___ }, \
-    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \
-    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \
-    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \
-}