4 files changed, 20 insertions, 35 deletions
diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h
index 26dda7d8fa..2f38776326 100644
--- a/keyboards/puck/config.h
+++ b/keyboards/puck/config.h
@@ -1,11 +1,4 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { D2, D3, C6, C7 }
-#define MATRIX_COL_PINS { B4, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/puck/info.json b/keyboards/puck/info.json
index f56b1ceef8..25abece192 100644
--- a/keyboards/puck/info.json
+++ b/keyboards/puck/info.json
@@ -8,23 +8,31 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "D7", "D6"],
+    "rows": ["D2", "D3", "C6", "C7"]
+  },
+  "diode_direction": "ROW2COL",
   "processor": "atmega32u4",
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"SW1", "x":0, "y":0}, 
-        {"label":"SW2", "x":1, "y":0}, 
-        {"label":"SW3", "x":2, "y":0}, 
-        {"label":"SW4", "x":0, "y":1}, 
-        {"label":"SW5", "x":1, "y":1}, 
-        {"label":"SW6", "x":2, "y":1}, 
-        {"label":"SW7", "x":0, "y":2}, 
-        {"label":"SW8", "x":1, "y":2}, 
-        {"label":"SW9", "x":2, "y":2}, 
-        {"label":"SW10", "x":0, "y":3}, 
-        {"label":"SW11", "x":1, "y":3}, 
-        {"label":"SW12", "x":2, "y":3}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3}
       ]
     }
   }
diff --git a/keyboards/puck/puck.c b/keyboards/puck/puck.c
deleted file mode 100644
index 0e26b9c3cd..0000000000
--- a/keyboards/puck/puck.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "puck.h"
diff --git a/keyboards/puck/puck.h b/keyboards/puck/puck.h
deleted file mode 100644
index 31fff79555..0000000000
--- a/keyboards/puck/puck.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22, \
-    k30, k31, k32 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }, \
-    { k30, k31, k32 } \
-}