6 files changed, 16 insertions, 43 deletions
diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index b23030ad5c..d1456a07f8 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -14,12 +14,6 @@
 
 #pragma once
 
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 80
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/hotswap/hotswap.c b/keyboards/quarkeys/z60/hotswap/hotswap.c
deleted file mode 100644
index b45286e8ba..0000000000
--- a/keyboards/quarkeys/z60/hotswap/hotswap.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index c142c01b7e..3924726711 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3C02",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index a66ebdd550..bf95108da3 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,13 +14,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
-
-#define RGB_DI_PIN D6
 #define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index e5ec227c7e..daffbb0220 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x3C01",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["E6", "F0", "F7", "F1", "F6", "F5", "F4", "C7", "B7", "D5", "C6", "B6", "B5", "D7", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4"]
+    },
+    "ws2812": {
+        "pin": "D6"
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/quarkeys/z60/solder/solder.c b/keyboards/quarkeys/z60/solder/solder.c
deleted file mode 100644
index 1aacc5168e..0000000000
--- a/keyboards/quarkeys/z60/solder/solder.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-/ Copyright 2022 quarkeys
-/ 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/>.
-*/
-
-#include "solder.h"