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

2 files changed, 49 insertions, 79 deletions

diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json
index f0aa07e6e9..c431ae5f10 100644
--- a/keyboards/matthewdias/minim/info.json
+++ b/keyboards/matthewdias/minim/info.json
@@ -18,52 +18,55 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Tab", "x": 0, "y": 0, "w": 1.25 },
-                { "label": "Q", "x": 1.25, "y": 0 },
-                { "label": "W", "x": 2.25, "y": 0 },
-                { "label": "E", "x": 3.25, "y": 0 },
-                { "label": "R", "x": 4.25, "y": 0 },
-                { "label": "T", "x": 5.25, "y": 0 },
-                { "label": "Y", "x": 6.25, "y": 0 },
-                { "label": "U", "x": 7.25, "y": 0 },
-                { "label": "I", "x": 8.25, "y": 0 },
-                { "label": "O", "x": 9.25, "y": 0 },
-                { "label": "P", "x": 10.25, "y": 0 },
-                { "label": "{", "x": 11.25, "y": 0 },
-                { "label": "}", "x": 12.25, "y": 0 },
-                { "label": "Back", "x": 13.25, "y": 0, "w": 1.25 },
-                { "label": "Ctrl", "x": 0, "y": 1, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 1 },
-                { "label": "S", "x": 2.75, "y": 1 },
-                { "label": "D", "x": 3.75, "y": 1 },
-                { "label": "F", "x": 4.75, "y": 1 },
-                { "label": "G", "x": 5.75, "y": 1 },
-                { "label": "H", "x": 6.75, "y": 1 },
-                { "label": "J", "x": 7.75, "y": 1 },
-                { "label": "K", "x": 8.75, "y": 1 },
-                { "label": "L", "x": 9.75, "y": 1 },
-                { "label": ":", "x": 10.75, "y": 1 },
-                { "label": "\"", "x": 11.75, "y": 1 },
-                { "label": "Enter", "x": 12.75, "y": 1, "w": 1.75 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 2 },
-                { "label": "X", "x": 3.25, "y": 2 },
-                { "label": "C", "x": 4.25, "y": 2 },
-                { "label": "V", "x": 5.25, "y": 2 },
-                { "label": "B", "x": 6.25, "y": 2 },
-                { "label": "N", "x": 7.25, "y": 2 },
-                { "label": "M", "x": 8.25, "y": 2 },
-                { "label": "<", "x": 9.25, "y": 2 },
-                { "label": ">", "x": 10.25, "y": 2 },
-                { "label": "?", "x": 11.25, "y": 2 },
-                { "label": "Shift", "x": 12.25, "y": 2, "w": 2.25 },
-                { "label": "Opt", "x": 1.5, "y": 3 },
-                { "label": "Cmd", "x": 2.5, "y": 3, "w": 1.25 },
-                { "label": "", "x": 3.75, "y": 3, "w": 2 },
-                { "label": "", "x": 5.75, "y": 3, "w": 3 },
-                { "label": "", "x": 8.75, "y": 3, "w": 2 },
-                { "label": "Cmd", "x": 10.75, "y": 3, "w": 1.25 },
-                { "label": "Opt", "x": 12, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 8], "x": 7.75, "y": 1},
+                {"matrix": [1, 9], "x": 8.75, "y": 1},
+                {"matrix": [1, 10], "x": 9.75, "y": 1},
+                {"matrix": [1, 11], "x": 10.75, "y": 1},
+                {"matrix": [1, 12], "x": 11.75, "y": 1},
+                {"matrix": [1, 13], "x": 12.75, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 2},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/matthewdias/minim/minim.h b/keyboards/matthewdias/minim/minim.h
deleted file mode 100644
index 7a732a8ab9..0000000000
--- a/keyboards/matthewdias/minim/minim.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 Matthew Dias <matthewdias@me.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-         K31, K32,      K34,           K37,      K39,      K3B, K3C       \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO, K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D   }, \
-    { KC_NO, K31,   K32,   KC_NO, K34,   KC_NO, KC_NO, K37,   KC_NO, K39,   KC_NO, K3B,   K3C,   KC_NO }  \
-}