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

2 files changed, 106 insertions, 106 deletions

diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json
index 49e78b298b..b81bb4b2ce 100644
--- a/keyboards/nek_type_a/info.json
+++ b/keyboards/nek_type_a/info.json
@@ -13,94 +13,112 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0, "w":1.75},
-                {"label":"F1", "x":2.75, "y":0},
-                {"label":"F2", "x":3.75, "y":0},
-                {"label":"F3", "x":4.75, "y":0},
-                {"label":"F4", "x":5.75, "y":0},
-                {"label":"F5", "x":8.25, "y":0},
-                {"label":"F6", "x":9.25, "y":0},
-                {"label":"F7", "x":10.25, "y":0},
-                {"label":"F8", "x":11.25, "y":0},
-                {"label":"F9", "x":12.5, "y":0},
-                {"label":"F10", "x":13.5, "y":0},
-                {"label":"F11", "x":14.5, "y":0},
-                {"label":"F12", "x":15.5, "y":0},
-                {"label":"Mute", "x":16.75, "y":0},
-                {"label":"Volume Down", "x":17.75, "y":0},
-                {"label":"Volume Up", "x":18.75, "y":0},
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":8, "y":1.25, "w":1.5},
-                {"label":"8", "x":9.5, "y":1.25},
-                {"label":"9", "x":10.5, "y":1.25},
-                {"label":"0", "x":11.5, "y":1.25},
-                {"label":"-", "x":12.5, "y":1.25},
-                {"label":"=", "x":13.5, "y":1.25},
-                {"label":"Backspace", "x":14.5, "y":1.25, "w":2},
-                {"label":"Insert", "x":16.75, "y":1.25},
-                {"label":"Home", "x":17.75, "y":1.25},
-                {"label":"Page Up", "x":18.75, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25, "w":1.5},
-                {"label":"Y", "x":8, "y":2.25},
-                {"label":"U", "x":9, "y":2.25},
-                {"label":"I", "x":10, "y":2.25},
-                {"label":"O", "x":11, "y":2.25},
-                {"label":"P", "x":12, "y":2.25},
-                {"label":"[", "x":13, "y":2.25},
-                {"label":"]", "x":14, "y":2.25},
-                {"label":"\\", "x":15, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":16.75, "y":2.25},
-                {"label":"End", "x":17.75, "y":2.25},
-                {"label":"Page Down", "x":18.75, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25, "w":1.25},
-                {"label":"H", "x":8, "y":3.25, "w":1.25},
-                {"label":"J", "x":9.25, "y":3.25},
-                {"label":"K", "x":10.25, "y":3.25},
-                {"label":"L", "x":11.25, "y":3.25},
-                {"label":";", "x":12.25, "y":3.25},
-                {"label":"'", "x":13.25, "y":3.25},
-                {"label":"Enter", "x":14.25, "y":3.25, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":2},
-                {"label":"Z", "x":2, "y":4.25},
-                {"label":"X", "x":3, "y":4.25},
-                {"label":"C", "x":4, "y":4.25},
-                {"label":"V", "x":5, "y":4.25},
-                {"label":"B", "x":6, "y":4.25},
-                {"label":"N", "x":8, "y":4.25, "w":1.5},
-                {"label":"M", "x":9.5, "y":4.25},
-                {"label":",", "x":10.5, "y":4.25},
-                {"label":".", "x":11.5, "y":4.25},
-                {"label":"/", "x":12.5, "y":4.25},
-                {"label":"Shift", "x":13.5, "y":4.25, "w":2.75},
-                {"label":"Up", "x":17.75, "y":3.75},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":5.25, "w":1.25},
-                {"label":"Cmd", "x":2.75, "y":5.25, "w":1.5},
-                {"label":"Space", "x":4.25, "y":5.25, "w":2.75},
-                {"label":"Space", "x":8, "y":5.25, "w":2.75},
-                {"label":"Cmd", "x":10.75, "y":5.25, "w":1.5},
-                {"label":"Alt", "x":12.25, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
-                {"label":"Menu", "x":15, "y":5.25, "w":1.25},
-                {"label":"Left", "x":16.75, "y":4.75},
-                {"label":"Down", "x":17.75, "y":4.75},
-                {"label":"Right", "x":18.75, "y":4.75}
+                {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 1.75},
+
+                {"matrix": [0, 3], "x": 2.75, "y": 0},
+                {"matrix": [0, 4], "x": 3.75, "y": 0},
+                {"matrix": [0, 5], "x": 4.75, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+                {"matrix": [0, 16], "x": 17.75, "y": 0},
+                {"matrix": [0, 17], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 8, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 8], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.5, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.75, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.75, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 7], "x": 8, "y": 2.25},
+                {"matrix": [2, 8], "x": 9, "y": 2.25},
+                {"matrix": [2, 9], "x": 10, "y": 2.25},
+                {"matrix": [2, 10], "x": 11, "y": 2.25},
+                {"matrix": [2, 11], "x": 12, "y": 2.25},
+                {"matrix": [2, 12], "x": 13, "y": 2.25},
+                {"matrix": [2, 13], "x": 14, "y": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.75, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.75, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 7], "x": 8, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2},
+                {"matrix": [4, 1], "x": 2, "y": 4.25},
+                {"matrix": [4, 2], "x": 3, "y": 4.25},
+                {"matrix": [4, 3], "x": 4, "y": 4.25},
+                {"matrix": [4, 4], "x": 5, "y": 4.25},
+                {"matrix": [4, 5], "x": 6, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 13.5, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 17.75, "y": 3.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 2.75},
+
+                {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 14], "x": 15, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 16.75, "y": 4.75},
+                {"matrix": [5, 16], "x": 17.75, "y": 4.75},
+                {"matrix": [5, 17], "x": 18.75, "y": 4.75}
             ]
         }
     }
diff --git a/keyboards/nek_type_a/nek_type_a.h b/keyboards/nek_type_a/nek_type_a.h
index 78f019c0fd..dda9e2bdde 100644
--- a/keyboards/nek_type_a/nek_type_a.h
+++ b/keyboards/nek_type_a/nek_type_a.h
@@ -38,21 +38,3 @@ extern uint8_t expander_input_pin_mask;
 extern bool i2c_initialized;
 
 void init_expander(void);
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-         L12,      L14, L15, L16, L17,   R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B, \
-    L21, L22, L23, L24, L25, L26, L27,   R21, R22, R23, R24, R25, R26,      R28, R29, R2A, R2B, \
-    L31, L32, L33, L34, L35, L36,        R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B, \
-    L41, L42, L43, L44, L45, L46,        R41, R42, R43, R44, R45, R46,      R48, \
-    L51, L52, L53, L54, L55, L56,        R51, R52, R53, R54, R55,           R58,      R5A, \
-    L61, L62, L63,      L65,             R61,      R63,      R65, R66,      R68, R69, R6A, R6B \
-) { \
-    { XXX, L12, XXX, L14, L15, L16, L17, R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B }, \
-    { L21, L22, L23, L24, L25, L26, L27, R21, R22, R23, R24, R25, R26, XXX, R28, R29, R2A, R2B }, \
-    { L31, L32, L33, L34, L35, L36, XXX, R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B }, \
-    { L41, L42, L43, L44, L45, L46, XXX, R41, R42, R43, R44, R45, R46, XXX, R48, XXX, XXX, XXX }, \
-    { L51, L52, L53, L54, L55, L56, XXX, R51, R52, R53, R54, R55, XXX, XXX, R58, XXX, R5A, XXX }, \
-    { L61, L62, L63, XXX, L65, XXX, XXX, R61, XXX, R63, XXX, R65, R66, XXX, R68, R69, R6A, R6B } \
-}