4 files changed, 17 insertions, 29 deletions
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index f99c65303c..e6499e9111 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,16 +2,6 @@
 
 #pragma once
 
-/* default pin-out */
-#define MATRIX_ROW_PINS { NO_PIN }
-#define MATRIX_COL_PINS { B4, B6, B2, D7, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
 #define RGBLED_NUM 9    // Number of LEDs
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index be3541c4fd..25dc85704d 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -8,23 +8,31 @@
         "pid": "0x0007",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"],
+        "rows": [null]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "breathing_period": 2
     },
+    "ws2812": {
+        "pin": "D3"
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"x": 0, "y": 0},
-              {"x": 0.5, "y": 1.25},
-              {"x": 1.5, "y": 2.5},
-              {"x": 2.75, "y": 3.25},
-              {"x": 4, "y": 3.5},
-              {"x": 5.25, "y": 3.25},
-              {"x": 6.5, "y": 2.5},
-              {"x": 7.5, "y": 1.25},
-              {"x": 8, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 0.5, "y": 1.25},
+                {"matrix": [0, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [0, 4], "x": 4, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 8, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c
deleted file mode 100644
index c0198a8eaf..0000000000
--- a/keyboards/handwired/lovelive9/lovelive9.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lovelive9.h"
diff --git a/keyboards/handwired/lovelive9/lovelive9.h b/keyboards/handwired/lovelive9/lovelive9.h
deleted file mode 100644
index f6fb1f94cc..0000000000
--- a/keyboards/handwired/lovelive9/lovelive9.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08 \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08 } \
-}