From 98127f61715ff6ea42236afed2dfaf5b1432b4eb Mon Sep 17 00:00:00 2001
From: Hayley Hughes <hayley@foxes.systems>
Date: Sun, 18 Feb 2024 17:33:46 +1100
Subject: [PATCH] Move keyboard features into info.json

---
 keyboards/ducky/one2sf/1967st/config.h  |  7 -------
 keyboards/ducky/one2sf/1967st/info.json | 11 +++++++++++
 keyboards/ducky/one2sf/1967st/rules.mk  | 16 ----------------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index a2959c9d730..1bb511107db 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -18,10 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)
-<<<<<<< HEAD
-=======
-
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
->>>>>>> 41dc4aefcf (Move led driver into the keyboard)
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
index 3624ba236c5..f3468c78d34 100644
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ b/keyboards/ducky/one2sf/1967st/info.json
@@ -9,9 +9,19 @@
         "force_nkro": true
     },
     "features": {
+        "bootmagic": true,
+        "dip_switch": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
         "rgb_matrix": true
     },
     "rgb_matrix": {
+        "animations": {
+            "breathing": true,
+            "cycle_left_right": true,
+            "typing_heatmap": true
+        },
         "driver": "custom",
         "layout": [
             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
@@ -56,6 +66,7 @@
             {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4},
             {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
             {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4},
             {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
             {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
             {"matrix": [3, 0], "x": 0, "y": 48, "flags": 5},
diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk
index c6a35c4ec1e..6bb3007fe4f 100644
--- a/keyboards/ducky/one2sf/1967st/rules.mk
+++ b/keyboards/ducky/one2sf/1967st/rules.mk
@@ -16,20 +16,4 @@ MCU  = cortex-m0
 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 ARMV = 6
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
 SRC += rgb_matrix_drivers.c