Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

2 files changed, 195 insertions, 265 deletions

diff --git a/keyboards/nimrod/info.json b/keyboards/nimrod/info.json
index 666b069f89..4c14f8fd07 100644
--- a/keyboards/nimrod/info.json
+++ b/keyboards/nimrod/info.json
@@ -19,202 +19,217 @@
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 1.25 },
-                { "x": 3.75, "y": 3, "w": 1.25 },
-                { "x": 5, "y": 3, "w": 1.25 },
-                { "x": 6.25, "y": 3, "w": 1.25 },
-                { "x": 7.5, "y": 3, "w": 1.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_left_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 6.25 },
-                { "x": 6.25, "y": 3, "w": 1.25 },
-                { "x": 7.5, "y": 3, "w": 1.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_center_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 6.25 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3, "w": 1.25 },
-                { "x": 11.25, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_right_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1.25 },
-                { "x": 2.5, "y": 3, "w": 1.25 },
-                { "x": 3.75, "y": 3, "w": 1.25 },
-                { "x": 5, "y": 3, "w": 1.25 },
-                { "x": 6.25, "y": 3, "w": 6.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1.25 },
-                { "x": 1.25, "y": 0, "w": 1.25 },
-                { "x": 2.5, "y": 0, "w": 1.25 },
-                { "x": 3.75, "y": 0, "w": 1.25 },
-                { "x": 5, "y": 0, "w": 1.25 },
-                { "x": 6.25, "y": 0, "w": 1.25 },
-                { "x": 7.5, "y": 0, "w": 1.25 },
-                { "x": 8.75, "y": 0, "w": 1.25 },
-                { "x": 10, "y": 0, "w": 1.25 },
-                { "x": 11.25, "y": 0, "w": 1.25 },
-                { "x": 0, "y": 1, "w": 1.25 },
-                { "x": 1.25, "y": 1, "w": 1.25 },
-                { "x": 2.5, "y": 1, "w": 1.25 },
-                { "x": 3.75, "y": 1, "w": 1.25 },
-                { "x": 5, "y": 1, "w": 1.25 },
-                { "x": 6.25, "y": 1, "w": 1.25 },
-                { "x": 7.5, "y": 1, "w": 1.25 },
-                { "x": 8.75, "y": 1, "w": 1.25 },
-                { "x": 10, "y": 1, "w": 1.25 },
-                { "x": 11.25, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.25 },
-                { "x": 1.25, "y": 2, "w": 1.25 },
-                { "x": 2.5, "y": 2, "w": 1.25 },
-                { "x": 3.75, "y": 2, "w": 1.25 },
-                { "x": 5, "y": 2, "w": 1.25 },
-                { "x": 6.25, "y": 2, "w": 1.25 },
-                { "x": 7.5, "y": 2, "w": 1.25 },
-                { "x": 8.75, "y": 2, "w": 1.25 },
-                { "x": 10, "y": 2, "w": 1.25 },
-                { "x": 11.25, "y": 2, "w": 1.25 },
-                { "x": 0, "y": 3, "w": 6.25 },
-                { "x": 6.25, "y": 3, "w": 6.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 7], "x": 8.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 8], "x": 10, "y": 0, "w": 1.25},
+                {"matrix": [0, 9], "x": 11.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1, "w": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [1, 7], "x": 8.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 8], "x": 10, "y": 1, "w": 1.25},
+                {"matrix": [1, 9], "x": 11.25, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 4], "x": 5, "y": 2, "w": 1.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2, "w": 1.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2, "w": 1.25},
+                {"matrix": [2, 7], "x": 8.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 8], "x": 10, "y": 2, "w": 1.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 3, "w": 6.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 6.25}
             ]
         }
     }
diff --git a/keyboards/nimrod/nimrod.h b/keyboards/nimrod/nimrod.h
deleted file mode 100644
index 253154905c..0000000000
--- a/keyboards/nimrod/nimrod.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2020 cjcodell1
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_ortho_4x10( \
-  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, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  \
-) \
-{ \
-  { 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  }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39  }  \
-}
-
-#define LAYOUT_left_space( \
-  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, \
-            K32,           K35, K36, K37, K38, K39  \
-) \
-{ \
-  { 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  }, \
-  { XXX, XXX, K32, XXX, XXX, K35, K36, K37, K38, K39  }  \
-}
-
-#define LAYOUT_center_space( \
-  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, \
-  K30, K31,           K34,           K37, K38, K39  \
-) \
-{ \
-  { 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  }, \
-  { K30, K31, XXX, XXX, K34, XXX, XXX, K37, K38, K39  }  \
-}
-
-#define LAYOUT_right_space( \
-  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, \
-  K30, K31, K32, K33, K34,           K37            \
-) \
-{ \
-  { 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  }, \
-  { K30, K31, K32, K33, K34, XXX, XXX, K37, XXX, XXX  }  \
-}
-
-#define LAYOUT_split_space( \
-  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, \
-            K32,                     K37            \
-) \
-{ \
-  { 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  }, \
-  { XXX, XXX, K32, XXX, XXX, XXX, XXX, K37, XXX, XXX  }  \
-}