4 files changed, 13 insertions, 38 deletions
diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c
index 22c766a30f..93b9477dce 100644
--- a/keyboards/handwired/6key/6key.c
+++ b/keyboards/handwired/6key/6key.c
@@ -13,7 +13,7 @@
   * 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 "6key.h"
+#include "quantum.h"
 
 bool dip_switch_update_kb(uint8_t index, bool active) {
     if (!dip_switch_update_user(index, active)) { return false; }
diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h
deleted file mode 100644
index f63abc35d2..0000000000
--- a/keyboards/handwired/6key/6key.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* Copyright 2020 Bratzworth
-  *
-  * 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( \
-      k00, k01, k02,    \
-      k03, k04, k05     \
-) \
-{ \
-    { k00, k01, k02 },  \
-    { k03, k04, k05 }   \
-}
diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
index 31b6c8888d..0ba89040c7 100644
--- a/keyboards/handwired/6key/config.h
+++ b/keyboards/handwired/6key/config.h
@@ -16,13 +16,5 @@
 
 #pragma once
 
-
-/* pin-out */
-#define MATRIX_ROW_PINS { B4, D0 }
-#define MATRIX_COL_PINS { D3, D2, D1 }
-
 /* dip switch */
 #define DIP_SWITCH_PINS { C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json
index 7d7e17b64c..39c26006d6 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/info.json
@@ -8,13 +8,23 @@
       "pid": "0x0007",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D3", "D2", "D1"],
+      "rows": ["B4", "D0"]
+    },
+    "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}
+          {"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}
         ]
       }
     }