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

2 files changed, 34 insertions, 60 deletions

diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index a7553afc4b..97d8d9b763 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -18,47 +18,47 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Q", "x": 0, "y": 0.3 },
-                { "label": "W", "x": 1, "y": 0.1 },
-                { "label": "E", "x": 2, "y": 0 },
-                { "label": "R", "x": 3, "y": 0.1 },
-                { "label": "T", "x": 4, "y": 0.2 },
+                {"matrix": [0, 0], "x": 0, "y": 0.3},
+                {"matrix": [0, 1], "x": 1, "y": 0.1},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.2},
 
-                { "label": "Y", "x": 8, "y": 0.2 },
-                { "label": "U", "x": 9, "y": 0.1 },
-                { "label": "I", "x": 10, "y": 0 },
-                { "label": "O", "x": 11, "y": 0.1 },
-                { "label": "P", "x": 12, "y": 0.3 },
+                {"matrix": [0, 5], "x": 8, "y": 0.2},
+                {"matrix": [0, 6], "x": 9, "y": 0.1},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0.1},
+                {"matrix": [0, 9], "x": 12, "y": 0.3},
 
-                { "label": "A", "x": 0, "y": 1.3 },
-                { "label": "S", "x": 1, "y": 1.1 },
-                { "label": "D", "x": 2, "y": 1 },
-                { "label": "F", "x": 3, "y": 1.1 },
-                { "label": "G", "x": 4, "y": 1.2 },
+                {"matrix": [1, 0], "x": 0, "y": 1.3},
+                {"matrix": [1, 1], "x": 1, "y": 1.1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.2},
 
-                { "label": "H", "x": 8, "y": 1.2 },
-                { "label": "J", "x": 9, "y": 1.1 },
-                { "label": "K", "x": 10, "y": 1 },
-                { "label": "L", "x": 11, "y": 1.1 },
-                { "label": ";", "x": 12, "y": 1.3 },
+                {"matrix": [1, 5], "x": 8, "y": 1.2},
+                {"matrix": [1, 6], "x": 9, "y": 1.1},
+                {"matrix": [1, 7], "x": 10, "y": 1},
+                {"matrix": [1, 8], "x": 11, "y": 1.1},
+                {"matrix": [1, 9], "x": 12, "y": 1.3},
 
-                { "label": "Z", "x": 0, "y": 2.3 },
-                { "label": "X", "x": 1, "y": 2.1 },
-                { "label": "C", "x": 2, "y": 2 },
-                { "label": "V", "x": 3, "y": 2.1 },
-                { "label": "B", "x": 4, "y": 2.2 },
+                {"matrix": [2, 0], "x": 0, "y": 2.3},
+                {"matrix": [2, 1], "x": 1, "y": 2.1},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.2},
 
-                { "label": "N", "x": 8, "y": 2.2 },
-                { "label": "M", "x": 9, "y": 2.1 },
-                { "label": ",", "x": 10, "y": 2 },
-                { "label": ".", "x": 11, "y": 2.1 },
-                { "label": "/", "x": 12, "y": 2.3 },
+                {"matrix": [2, 5], "x": 8, "y": 2.2},
+                {"matrix": [2, 6], "x": 9, "y": 2.1},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2.1},
+                {"matrix": [2, 9], "x": 12, "y": 2.3},
 
-                { "label": "GUI", "x": 3, "y": 3.7 },
-                { "label": "Lower", "x": 4, "y": 3.7 },
+                {"matrix": [3, 3], "x": 3, "y": 3.7},
+                {"matrix": [3, 4], "x": 4, "y": 3.7},
 
-                { "label": "Raise", "x": 8, "y": 3.7 },
-                { "label": "Alt", "x": 9, "y": 3.7 }
+                {"matrix": [3, 5], "x": 8, "y": 3.7},
+                {"matrix": [3, 6], "x": 9, "y": 3.7}
             ]
         }
     }
diff --git a/keyboards/k34/k34.h b/keyboards/k34/k34.h
deleted file mode 100644
index e34f5408d4..0000000000
--- a/keyboards/k34/k34.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
-                   k33, k34, k35, k36 \
-) { \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
-    { KC_NO, KC_NO, KC_NO, k33,   k34,   k35,   k36,   KC_NO, KC_NO, KC_NO }, \
-}