[Keymap] Userspace refactor, adding leader key functionality (#7790)

* Userspace refactor

* Fixed missed ifdef

* tapcode16, adjust layout

* glcdfont changes from #7745

* Modify Keymaps, add workman

* RGB & OLED update

3 files changed, 26 insertions, 21 deletions

diff --git a/keyboards/lily58/keymaps/curry/config.h b/keyboards/lily58/keymaps/curry/config.h
index 9ab19bc3c0..a4c697df42 100644
--- a/keyboards/lily58/keymaps/curry/config.h
+++ b/keyboards/lily58/keymaps/curry/config.h
@@ -5,3 +5,13 @@
 
 #define OLED_DISABLE_TIMEOUT
 #define TAPPING_TERM_PER_KEY
+
+#if defined(RGBLIGHT_ENABLE)
+#    undef RGBLED_NUM
+#    define RGBLED_NUM 27
+
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 5
+#    define RGBLIGHT_LIMIT_VAL 120
+#endif
diff --git a/keyboards/lily58/keymaps/curry/keymap.c b/keyboards/lily58/keymaps/curry/keymap.c
index a8183d36f3..bc779305a2 100644
--- a/keyboards/lily58/keymaps/curry/keymap.c
+++ b/keyboards/lily58/keymaps/curry/keymap.c
@@ -7,11 +7,11 @@
         K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A  \
     ) \
     LAYOUT_wrapper( \
-        KC_ESC,  K01, K02, K03, K04, K05,                    K06, K07, K08, K09, K0A, KC_GRV, \
-        KC_TAB,  K11, K12, K13, K14, K15,                    K16, K17, K18, K19, K1A, KC_BSLS,  \
+        KC_ESC,  K01, K02, K03, K04, K05,                    K06, K07, K08, K09, K0A, KC_GRV,  \
+        KC_TAB,  K11, K12, K13, K14, K15,                    K16, K17, K18, K19, K1A, KC_BSLS, \
         KC_LCTL, K21, K22, K23, K24, K25,                    K26, K27, K28, K29, K2A, KC_QUOT, \
         OS_LSFT, K31, K32, K33, K34, K35, KC_LBRC, KC_RBRC,  K36, K37, K38, K39, K3A, OS_RSFT, \
-                OS_LGUI, OS_LALT, LOWER, KC_SPC,  KC_ENT,  RAISE, KC_BSPC, OS_RGUI \
+                 KC_LEAD, OS_LALT, LOWER, KC_SPC,  KC_ENT,   RAISE, KC_BSPC, OS_RGUI           \
     )
 #define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
 
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJUST] = LAYOUT_wrapper( \
         _______, ___________________BLANK___________________,                    ___________________BLANK___________________, _______,
-        KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RESET,
+        KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RST,
         VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EEP_RST,
         MG_NKRO, _________________ADJUST_L3_________________, _______,  _______, _________________ADJUST_R3_________________, RGB_IDL,
                                    _______, _______, _______, _______,  _______, _______, _______, _______
diff --git a/keyboards/lily58/keymaps/curry/rules.mk b/keyboards/lily58/keymaps/curry/rules.mk
index 1b42868c91..2137a15074 100644
--- a/keyboards/lily58/keymaps/curry/rules.mk
+++ b/keyboards/lily58/keymaps/curry/rules.mk
@@ -2,20 +2,15 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE            = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE             = no  # Mouse keys(+4700)
-EXTRAKEY_ENABLE             = yes # Audio control and System control(+450)
-CONSOLE_ENABLE              = no  # Console for debug(+400)
-COMMAND_ENABLE              = no  # Commands for debug and configuration
-NKRO_ENABLE                 = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE            = no  # Enable keyboard backlight functionality
-MIDI_ENABLE                 = no  # MIDI controls
-AUDIO_ENABLE                = no  # Audio output on port C6
-UNICODE_ENABLE              = no  # Unicode
-BLUETOOTH_ENABLE            = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE             = no  # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE           = no  # Enable one-hand typing
-TAP_DANCE_ENABLE            = yes      # Enable Tap Dance.
-OLED_DRIVER_ENABLE          = yes
-BOOTLOADER                  = atmel-dfu
-SPLIT_TRANSPORT             = mirror
+BOOTMAGIC_ENABLE        = no
+MOUSEKEY_ENABLE         = no
+CONSOLE_ENABLE          = no
+COMMAND_ENABLE          = no
+
+RGBLIGHT_ENABLE         = no
+RGB_MATRIX_ENABLE       = no
+
+OLED_DRIVER_ENABLE      = yes
+
+BOOTLOADER              = atmel-dfu
+SPLIT_TRANSPORT         = mirror