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

1 files changed, 58 insertions, 58 deletions

diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
index 8ae75ee34b..b1b1cc9855 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -27,68 +27,68 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [5, 0], "x": 6, "y": 0},
+                {"matrix": [5, 1], "x": 7, "y": 0},
+                {"matrix": [5, 2], "x": 8, "y": 0},
+                {"matrix": [5, 3], "x": 9, "y": 0},
+                {"matrix": [5, 4], "x": 10, "y": 0},
+                {"matrix": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 6], "x": 12, "y": 0},
 
-                {"label":"Tab", "x":0, "y":1},
-                {"label":"Q", "x":1, "y":1},
-                {"label":"W", "x":2, "y":1},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1},
-                {"label":"T", "x":5, "y":1},
-                {"label":"Y", "x":6, "y":1},
-                {"label":"U", "x":7, "y":1},
-                {"label":"I", "x":8, "y":1},
-                {"label":"O", "x":9, "y":1},
-                {"label":"P", "x":10, "y":1},
-                {"label":"[", "x":11, "y":1},
-                {"label":"]", "x":12, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [6, 0], "x": 6, "y": 1},
+                {"matrix": [6, 1], "x": 7, "y": 1},
+                {"matrix": [6, 2], "x": 8, "y": 1},
+                {"matrix": [6, 3], "x": 9, "y": 1},
+                {"matrix": [6, 4], "x": 10, "y": 1},
+                {"matrix": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 6], "x": 12, "y": 1},
 
-                {"label":"Control", "x":0, "y":2},
-                {"label":"A", "x":1, "y":2},
-                {"label":"S", "x":2, "y":2},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2},
-                {"label":"G", "x":5, "y":2},
-                {"label":"H", "x":6, "y":2},
-                {"label":"J", "x":7, "y":2},
-                {"label":"K", "x":8, "y":2},
-                {"label":"L", "x":9, "y":2},
-                {"label":";", "x":10, "y":2},
-                {"label":"'", "x":11, "y":2},
-                {"label":"Enter", "x":12, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [7, 0], "x": 6, "y": 2},
+                {"matrix": [7, 1], "x": 7, "y": 2},
+                {"matrix": [7, 2], "x": 8, "y": 2},
+                {"matrix": [7, 3], "x": 9, "y": 2},
+                {"matrix": [7, 4], "x": 10, "y": 2},
+                {"matrix": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 6], "x": 12, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3},
-                {"label":"Z", "x":1, "y":3},
-                {"label":"X", "x":2, "y":3},
-                {"label":"C", "x":3, "y":3},
-                {"label":"Y", "x":4, "y":3},
-                {"label":"B", "x":5, "y":3},
-                {"label":"N", "x":6, "y":3},
-                {"label":"M", "x":7, "y":3},
-                {"label":",", "x":8, "y":3},
-                {"label":".", "x":9, "y":3},
-                {"label":"/", "x":10, "y":3},
-                {"label":"\\", "x":11, "y":3},
-                {"label":"Shift", "x":12, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [8, 0], "x": 6, "y": 3},
+                {"matrix": [8, 1], "x": 7, "y": 3},
+                {"matrix": [8, 2], "x": 8, "y": 3},
+                {"matrix": [8, 3], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 6], "x": 12, "y": 3},
 
-                {"label":"Alt", "x":3, "y":4},
-                {"label":"GUI", "x":4, "y":4},
-                {"x":5, "y":4},
-                {"x":6, "y":4},
-                {"label":"Fn", "x":7, "y":4},
-                {"label":"Delete", "x":8, "y":4}
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [9, 0], "x": 6, "y": 4},
+                {"matrix": [9, 1], "x": 7, "y": 4},
+                {"matrix": [9, 2], "x": 8, "y": 4}
             ]
         }
     }