7 files changed, 12 insertions, 53 deletions
diff --git a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
index 2502667d30..8e78994017 100644
--- a/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
+++ b/keyboards/noxary/268/keymaps/sixtyeight/keymap.c
@@ -70,52 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
 void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-    }
-    else {
-
-    }
-
     if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
         DDRB |= (1 << 6); PORTB |= (1 << 6);
     }
     else {
         DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
     }
-
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-
-    }
-    else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-    }
-    else {
-
-    }
-
-    if (usb_led & (1 << USB_LED_KANA)) {
-
-    }
-    else {
-
-    }
-
 }
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
index 051782f146..20c5301861 100644
--- a/keyboards/noxary/268_2_rgb/config.h
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 16
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
index d1f57bc5fc..b9378287c9 100644
--- a/keyboards/noxary/268_2_rgb/info.json
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -16,6 +16,12 @@
     "backlight": {
       "pin": "B7"
     },
+    "rgblight": {
+      "hue_steps": 16,
+      "saturation_steps": 16,
+      "brightness_steps": 16,
+      "led_count": 16
+    },
     "ws2812": {
       "pin": "B5"
     },
diff --git a/keyboards/noxary/378/rules.mk b/keyboards/noxary/378/rules.mk
index 3c9c278b51..93e50cd795 100644
--- a/keyboards/noxary/378/rules.mk
+++ b/keyboards/noxary/378/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/noxary/valhalla/rules.mk b/keyboards/noxary/valhalla/rules.mk
index 3c9c278b51..93e50cd795 100644
--- a/keyboards/noxary/valhalla/rules.mk
+++ b/keyboards/noxary/valhalla/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index 0f7486408c..f2a2a9584a 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -28,10 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 16
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json
index 1bfcf109f4..21ccfd911e 100644
--- a/keyboards/noxary/x268/info.json
+++ b/keyboards/noxary/x268/info.json
@@ -16,6 +16,12 @@
   "backlight": {
     "pin": "B7"
   },
+  "rgblight": {
+    "hue_steps": 16,
+    "saturation_steps": 16,
+    "brightness_steps": 16,
+    "led_count": 16
+  },
   "ws2812": {
     "pin": "B5"
   },