6 files changed, 16 insertions, 30 deletions
diff --git a/keyboards/novelkeys/nk65/base/info.json b/keyboards/novelkeys/nk65/base/info.json
new file mode 100644
index 0000000000..fc547dc134
--- /dev/null
+++ b/keyboards/novelkeys/nk65/base/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/novelkeys/nk65/base/rules.mk b/keyboards/novelkeys/nk65/base/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/novelkeys/nk65/base/rules.mk
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index baca7223b4..1afa3fe95b 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -17,14 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Backlight options */
 
 #define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
index a231765dff..e9036ebb61 100755
--- a/keyboards/novelkeys/nk65/rules.mk
+++ b/keyboards/novelkeys/nk65/rules.mk
@@ -24,3 +24,5 @@ SRC =	keyboards/wilba_tech/wt_main.c \
 		drivers/led/issi/is31fl3733.c \
 		quantum/color.c \
 		i2c_master.c
+
+DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65/v1_4/config.h b/keyboards/novelkeys/nk65/v1_4/config.h
deleted file mode 100755
index 88629e5c99..0000000000
--- a/keyboards/novelkeys/nk65/v1_4/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Yiancar
-
-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
-
-#undef MATRIX_COL_PINS
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B1, B0, A7, A0, A1, A2, A3, A5 }
-// To enable debugger set A13 A14 -> A5 A7
diff --git a/keyboards/novelkeys/nk65/v1_4/info.json b/keyboards/novelkeys/nk65/v1_4/info.json
new file mode 100644
index 0000000000..3233797019
--- /dev/null
+++ b/keyboards/novelkeys/nk65/v1_4/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B1", "B0", "A7", "A0", "A1", "A2", "A3", "A5"],
+        "rows": ["B3", "B4", "B5", "A8", "A4"]
+    },
+    "diode_direction": "COL2ROW"
+}