5 files changed, 18 insertions, 41 deletions
diff --git a/keyboards/hfdkb/ac001/ac001.c b/keyboards/hfdkb/ac001/ac001.c
index a977f9c80d..83dbdeb628 100644
--- a/keyboards/hfdkb/ac001/ac001.c
+++ b/keyboards/hfdkb/ac001/ac001.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ac001.h"
+#include "quantum.h"
 /*
     3---------------2
     |       |       |
diff --git a/keyboards/hfdkb/ac001/ac001.h b/keyboards/hfdkb/ac001/ac001.h
deleted file mode 100644
index 0758584ee8..0000000000
--- a/keyboards/hfdkb/ac001/ac001.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2022 jonylee@hfd
- *
- * 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( \
-	K000, K001, K002,  K003, K004  \
-) { \
-	{ K000, K001, K002,  K003, K004 } \
-}
-// clang-format on
diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index a03f9066a9..ee03dd1e17 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -18,17 +18,9 @@
 
 #define FORCE_NKRO
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B15}
-#define MATRIX_COL_PINS { A5, A6, A7, C4, C5}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
 #define TAP_CODE_DELAY 5
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN A1
 #define RGB_MATRIX_LED_COUNT 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
index 2e1011b7f6..d46deb9d0d 100644
--- a/keyboards/hfdkb/ac001/info.json
+++ b/keyboards/hfdkb/ac001/info.json
@@ -8,16 +8,28 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A6", "A7", "C4", "C5"],
+        "rows": ["B15"]
+    },
+    "diode_direction": "ROW2COL",
+    "ws2812": {
+        "pin": "A1"
+    },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-            {"label":"~", "x":0, "y":0},
-            {"label":"!", "x":1, "y":0},
-            {"label":"3", "x":2, "y":0},
-            {"label":"4", "x":3, "y":0},
-            {"label":"@", "x":4, "y":0}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/hfdkb/ac001/rules.mk b/keyboards/hfdkb/ac001/rules.mk
index cf3008c6e4..81b7e82c3f 100644
--- a/keyboards/hfdkb/ac001/rules.mk
+++ b/keyboards/hfdkb/ac001/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash