5 files changed, 15 insertions, 39 deletions
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 9148cf1abf..265da302e5 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F7 }
-#define MATRIX_COL_PINS \
-    { B5, B6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION        COL2ROW
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define RGBLIGHT_DI_PIN        C7
@@ -58,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_LIGHT
 #define RGBLIGHT_DEFAULT_HUE          170
 
-#define RGB_DI_PIN                    F6
 #define RGB_MATRIX_LED_COUNT              2
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 3eb050b92a..70da0e4cc4 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,11 +8,22 @@
         "pid": "0xE6F0",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["B5", "B6", "C6"],
+        "rows": ["F7"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "D7", "pin_b": "B4"}
         ]
     },
+    "ws2812": {
+        "pin": "F6"
+    },
     "bootmagic": {
         "matrix": [0, 2]
     },
@@ -21,9 +32,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/work_louder/nano/keymaps/via/keymap.c b/keyboards/work_louder/nano/keymaps/via/keymap.c
index 84c5895d5e..17053dffd2 100644
--- a/keyboards/work_louder/nano/keymaps/via/keymap.c
+++ b/keyboards/work_louder/nano/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(C(KC_Z), C(KC_Y)) },
     [1] = { ENCODER_CCW_CW(G(KC_Z), G(S(KC_Z))) },
     [2] = { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/work_louder/nano/nano.h b/keyboards/work_louder/nano/nano.h
index cc152b8ccc..04de456eca 100644
--- a/keyboards/work_louder/nano/nano.h
+++ b/keyboards/work_louder/nano/nano.h
@@ -18,17 +18,3 @@
 
 #include "quantum.h"
 #include "rgb_functions.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02 \
-) { \
-    { k00, k01,   k02 } \
-}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index 60c7afc95e..bcbb4bb31d 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -14,6 +14,5 @@ ENCODER_ENABLE = yes
 LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 
 SRC += rgb_functions.c