3 files changed, 17 insertions, 25 deletions
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index 8663bf8933..c65caad1de 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -17,12 +17,6 @@
  */
 
 #pragma once
-#include "config_common.h"
-
-// Key matrix size
-// Rows are doubled-up. Added extra column for rotary encoder VIA mapping.
-#define MATRIX_ROWS  10
-#define MATRIX_COLS  7
 
 // wiring of each half
 #define MATRIX_ROW_PINS       { C6, D7, E6, B4, B5 }
@@ -32,21 +26,8 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define DEBOUNCE        5
-
-// Encoder support
-#define ENCODERS_PAD_A            { F5 }
-#define ENCODERS_PAD_B            { F4 }
-#define ENCODERS_PAD_A_RIGHT      { F4 }
-#define ENCODERS_PAD_B_RIGHT      { F5 }
-#define ENCODER_RESOLUTIONS       { 4 }
-#define ENCODER_RESOLUTIONS_RIGHT { 2 }  // Left encoder seems to have double-output issue but right does not.
-
 #define TAP_CODE_DELAY  10
 
-// Communication between sides
-#define SOFT_SERIAL_PIN D2
-
 // OLED settings
 #define OLED_TIMEOUT    80000
 #define OLED_BRIGHTNESS 90
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index fd15873c42..f1d76cb788 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,6 +6,23 @@
         "pid": "0x1287",
         "device_version": "0.0.2"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
index 1934963819..bb1a7f3dc2 100755
--- a/keyboards/sofle/keyhive/rules.mk
+++ b/keyboards/sofle/keyhive/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #