4 files changed, 21 insertions, 26 deletions
diff --git a/keyboards/9key/9key.c b/keyboards/9key/9key.c
deleted file mode 100644
index bbbabb81c4..0000000000
--- a/keyboards/9key/9key.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "9key.h"
diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h
deleted file mode 100644
index ad809da4b8..0000000000
--- a/keyboards/9key/9key.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, \
-    k10, k11, k12, \
-    k20, k21, k22 \
-) { \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 } \
-}
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index 8f721392c8..bb910a4427 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -17,17 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* 9Key PCB default pin-out */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN F7
-
 #define RGBLED_NUM 1    // Number of LEDs
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define TAPPING_TERM 200
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index fa74573e3e..1dc9fad41a 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -8,11 +8,31 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "ws2812": {
+    "pin": "F7"
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6"],
+    "rows": ["D1", "D0", "D4"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
+      "layout": [
+        {"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}
+      ]
     }
   }
 }