Merge upstream master to 2022 Q4 breaking change

8 files changed, 0 insertions, 3112 deletions

diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
deleted file mode 100644
index b84f83c3ad..0000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum custom_layers {
-    BASE,   // default layer
-    SYMB,   // symbols
-    MDIA,   // media keys
-};
-
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
-        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
-        // right hand
-             KC_RGHT,     KC_6,   KC_7,  KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(SYMB),    KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_BSLS,
-                          KC_H,   KC_J,  KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             MEH_T(KC_NO),KC_N,   KC_M,  KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-                                  KC_UP, KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |EE_CLR |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat|      |       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       RGB_MOD,KC_TRNS,
-                                               KC_TRNS,
-                               RGB_VAD,RGB_VAI,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       RGB_TOG, RGB_SLD,
-       KC_TRNS,
-       KC_TRNS, RGB_HUD, RGB_HUI
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-}
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
deleted file mode 100644
index ebdedcbe6b..0000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ /dev/null
@@ -1,551 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "layers.h"
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  DVORAK,
-  COLEMAK,
-  LOWER,
-  RAISE,
-  GAME,
-  MOUSE,
-  EPRM,
-  VRSN,
-  RGB_SLD,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic QWERTY layer
- *
- * ,---------------------------------------------.           ,---------------------------------------------.
- * |   `    |  1  |  2  |  3  |  4  |  5  | Esc  |           | Esc  |  6  |  7  |  8  |  9  |  0  |   Del  |
- * |--------+-----+-----+-----+-----+------------|           |------+-----+-----+-----+-----+-----+--------|
- * |  Tab   |  Q  |  W  |  E  |  R  |  T  |  [{  |           |  ]}  |  Y  |  U  |  I  |  O  |  P  |  BSPC  |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * |  ESC   |  A  |  S  |  D  |  F  |  G  |------|           |------|  H  |  J  |  K  |  L  |  ;  |    '   |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * | LShift |  Z  |  X  |  C  |  V  |  B  |      |           |      |  N  |  M  |  ,  |  .  |  /  | Enter  |
- * `--------+-----+-----+-----+-----+------------'           `------------+-----+-----+-----+-----+--------'
- *   | Num  |Ctrl | Alt |LGUI |Lower|                                     |Raise|Left |Down | Up  |Right |
- *   `------------------------------'                                     `------------------------------'
- *                                   ,------------.          ,------------.
- *                                   |Play |      |          |      |Play |
- *                             ,-----|-----|------|          |------+-----+-----.
- *                             |     |     | Alt  |          | Alt  |     |     |
- *                             |Space|LOWER|------|          |------|RAISE|Space|
- *                             |     |     | LGUI |          | LGUI |     |     |
- *                             `------------------'          `------------------'
- */
-[_QWERTY] = LAYOUT_ergodox(
-  // left hand
-  KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, KC_LBRC,
-  KC_ESC,   KC_A,    KC_S,    KC_D,    KC_F,  KC_G,
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, _______,
-  TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
-
-                                                  KC_MPLY,  _______,
-                                                            KC_LALT,
-                                      KC_SPACE,   LOWER,    KC_LGUI,
-
-  // right hand
-  KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_Y, KC_U,  KC_I,    KC_O,    KC_P,                KC_BSPC,
-               KC_H, KC_J,  KC_K,    KC_L,    KC_SCLN,             KC_QUOTE,
-  _______,     KC_N, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
-                     RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
-
-  _______, KC_MPLY,
-  KC_LALT,
-  KC_LGUI, RAISE,   KC_SPACE
-),
-
-/* Keymap 0: Basic Workman layer
- *
- * ,---------------------------------------------.           ,--------------------------------------------.
- * |   `    |  1  |  2  |  3  |  4  |  5  | Esc  |           | Esc  |  6  |  7  |  8  |  9  |  0  |   Del  |
- * |--------+-----+-----+-----+-----+------------|           |------+-----+-----+-----+-----+-----+--------|
- * |  Tab   |  Q  |  D  |  R  |  W  |  B  |  [{  |           |  ]}  |  J  |  F  |  U  |  P  |  ;  |  BSPC  |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * |  ESC   |  A  |  S  |  H  |  T  |  G  |------|           |------|  Y  |  N  |  E  |  O  |  I  |    '   |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * | LShift |  Z  |  X  |  M  |  C  |  V  |      |           |      |  K  |  L  |  ,  |  .  |  /  | Enter  |
- * `--------+-----+-----+-----+-----+------------'           `------------+-----+-----+-----+-----+--------'
- *   | Num  |Ctrl | Alt |LGUI |Lower|                                     |Raise|Left |Down | Up  |Right |
- *   `------------------------------'                                     `------------------------------'
- *                                   ,------------.          ,------------.
- *                                   |Play |      |          |      |Play |
- *                             ,-----|-----|------|          |------+-----+-----.
- *                             |     |     | Alt  |          | Alt  |     |     |
- *                             |Space|LOWER|------|          |------|RAISE|Space|
- *                             |     |     | LGUI |          | LGUI |     |     |
- *                             `------------------'          `------------------'
- */
-[_WORKMAN] = LAYOUT_ergodox(
-  // left hand
-  KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_D,    KC_R,    KC_W,    KC_B, KC_LBRC,
-  KC_ESC,   KC_A,    KC_S,    KC_H,    KC_T,    KC_G,
-  KC_LSFT,  KC_Z,    KC_X,    KC_M,    KC_C,    KC_V, _______,
-  TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
-
-                                                  KC_MPLY,  _______,
-                                                            KC_LALT,
-                                      KC_SPACE,   LOWER,    KC_LGUI,
-
-  // right hand
-  KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_J, KC_F,  KC_U,    KC_P,    KC_SCLN,             KC_BSPC,
-               KC_Y, KC_N,  KC_E,    KC_O,    KC_I,                KC_QUOTE,
-  _______,     KC_K, KC_L,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
-                     RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
-
-  _______, KC_MPLY,
-  KC_LALT,
-  KC_LGUI, RAISE,   KC_SPACE
-),
-
-/* Keymap 0: Basic Dvorak layer
- *
- * ,---------------------------------------------.           ,--------------------------------------------.
- * |   `    |  1  |  2  |  3  |  4  |  5  | Esc  |           | Esc  |  6  |  7  |  8  |  9  |  0  |   Del  |
- * |--------+-----+-----+-----+-----+------------|           |------+-----+-----+-----+-----+-----+--------|
- * |  Tab   |  '  |  ,  |  .  |  P  |  Y  |  [{  |           |  ]}  |  F  |  G  |  C  |  R  |  L  |  BSPC  |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * |  ESC   |  A  |  O  |  E  |  U  |  I  |------|           |------|  D  |  H  |  T  |  N  |  S  |   /    |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * | LShift |  ;  |  Q  |  J  |  K  |  X  |      |           |      |  B  |  M  |  W  |  V  |  Z  | Enter  |
- * `--------+-----+-----+-----+-----+------------'           `------------+-----+-----+-----+-----+--------'
- *   | Num  |Ctrl | Alt |LGUI |Lower|                                     |Raise|Left |Down | Up  |Right |
- *   `------------------------------'                                     `------------------------------'
- *                                   ,------------.          ,------------.
- *                                   |Play |      |          |      |Play |
- *                             ,-----|-----|------|          |------+-----+-----.
- *                             |     |     | Alt  |          | Alt  |     |     |
- *                             |Space|LOWER|------|          |------|RAISE|Space|
- *                             |     |     | LGUI |          | LGUI |     |     |
- *                             `------------------'          `------------------'
- */
-[_DVORAK] = LAYOUT_ergodox(
-  // left hand
-  KC_GRV,   KC_1,      KC_2,    KC_3,    KC_4,  KC_5, KC_ESC,
-  KC_TAB,   KC_QUOT,   KC_COMM, KC_DOT,  KC_P,  KC_Y, KC_LBRC,
-  KC_ESC,   KC_A,      KC_O,    KC_E,    KC_U,  KC_I,
-  KC_LSFT,  KC_SCLN,   KC_Q,    KC_J,    KC_K,  KC_X, _______,
-  TT(_NUM), KC_LCTL,   KC_LALT, KC_LGUI, LOWER,
-
-                                                  KC_MPLY,  _______,
-                                                            KC_LALT,
-                                      KC_SPACE,   LOWER,    KC_LGUI,
-
-  // right hand
-  KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,  KC_DEL,
-  KC_RBRC,     KC_F, KC_G,  KC_C,    KC_R,    KC_L,  KC_BSPC,
-               KC_D, KC_H,  KC_T,    KC_N,    KC_S,  LT(MOUSE, KC_SLSH),
-  _______,     KC_B, KC_M,  KC_W,    KC_V,    KC_Z,  RSFT_T(KC_ENT),
-                     RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
-
-  _______, KC_MPLY,
-  KC_LALT,
-  KC_LGUI, RAISE,   KC_SPACE
-),
-
-/* Keymap 0: Basic Colemak layer
- *
- * ,---------------------------------------------.           ,--------------------------------------------.
- * |   `    |  1  |  2  |  3  |  4  |  5  | Esc  |           | Esc  |  6  |  7  |  8  |  9  |  0  |   Del  |
- * |--------+-----+-----+-----+-----+------------|           |------+-----+-----+-----+-----+-----+--------|
- * |  Tab   |  Q  |  W  |  F  |  P  |  G  |  [{  |           |  ]}  |  J  |  L  |  U  |  Y  |  ;  |  BSPC  |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * |  ESC   |  A  |  R  |  S  |  T  |  D  |------|           |------|  H  |  N  |  E  |  I  |  O  |    '   |
- * |--------+-----+-----+-----+-----+-----|      |           |      |-----+-----+-----+-----+-----+--------|
- * | LShift |  Z  |  X  |  C  |  V  |  B  |      |           |      |  K  |  M  |  ,  |  .  |  /  | Enter  |
- * `--------+-----+-----+-----+-----+------------'           `------------+-----+-----+-----+-----+--------'
- *   | Num  |Ctrl | Alt |LGUI |Lower|                                     |Raise|Left |Down | Up  |Right |
- *   `------------------------------'                                     `------------------------------'
- *                                   ,------------.          ,------------.
- *                                   |Play |      |          |      |Play |
- *                             ,-----|-----|------|          |------+-----+-----.
- *                             |     |     | Alt  |          | Alt  |     |     |
- *                             |Space|LOWER|------|          |------|RAISE|Space|
- *                             |     |     | LGUI |          | LGUI |     |     |
- *                             `------------------'          `------------------'
- */
-[_COLEMAK] = LAYOUT_ergodox(
-  // left hand
-  KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_ESC,
-  KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G, KC_LBRC,
-  KC_ESC,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, _______,
-  TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
-
-                                                  KC_MPLY,  _______,
-                                                            KC_LALT,
-                                      KC_SPACE,   LOWER,    KC_LGUI,
-
-  // right hand
-  KC_ESC,      KC_6, KC_7,  KC_8,    KC_9,    KC_0,                KC_DEL,
-  KC_RBRC,     KC_J, KC_L,  KC_U,    KC_Y,    KC_SCLN,             KC_BSPC,
-               KC_H, KC_N,  KC_E,    KC_I,    KC_O,                KC_QUOTE,
-  _______,     KC_K, KC_M,  KC_COMM, KC_DOT,  LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
-                     RAISE, KC_LEFT, KC_DOWN, KC_UP,               KC_RIGHT,
-
-  _______, KC_MPLY,
-  KC_LALT,
-  KC_LGUI, RAISE,   KC_SPACE
-),
-
-/* Lower
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * | Version |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           | F12  |  F6  |  F7  |  F8  |  F9  | F10  |        |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |    ~    |  !   |  @   |  #   |  $   |  %   |  F6  |           |  F5  |  ^   |  &   |  *   |  (   |  )   |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   Del   |  F1  |  F2  |  F3  |  F4  |  F5  |------|           |------|  F6  |  _   |  +   |  {   |  }   |   |    |
- * |---------+------+------+------+------+------| F12  |           | F11  |------+------+------+------+------+--------|
- * |         |  F7  |  F8  |  F9  | F10  | F11  |      |           |      | F12  |ISO ~ |ISO | | Home | End  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      | Play | Vol- | Vol+ | Next |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                       ,-------------.           ,-------------.
- *                                       |      |      |           |      |      |
- *                                ,------|------|------|           |------+------+------.
- *                                |      |      |      |           |      |      |      |
- *                                |      |      |------|           |------|      |      |
- *                                |      |      |      |           |      |      |      |
- *                                `--------------------'           `--------------------'
- */
-[_LOWER] = LAYOUT_ergodox(
-  // left hand
-  VRSN,    KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F11,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,   KC_PERC, KC_F6,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______,
-
-                                       _______, _______,
-                                                _______,
-                              _______, _______, _______,
-
-  // right hand
-  KC_F12, KC_F6,   KC_F7,      KC_F8,      KC_F9,   KC_F10,  KC_F11,
-  KC_F5,  KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, _______,
-          KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  KC_F11, KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-                   _______,    KC_MPLY,    KC_VOLD, KC_VOLU, KC_MNXT,
-
-  _______, _______,
-  _______,
-  _______, _______, _______
-),
-
-/* Raise
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * | Version |  F1  |  F2  |  F3  |  F4  |  F5  | F11  |           | F12  |  F6  |  F7  |  F8  |  F9  | F10  |  F11   |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |    `    |  1   |  2   |  3   |  4   |  5   |  F6  |           |  F5  |  6   |  7   |  8   |  9   |  0   |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   Del   |  F1  |  F2  |  F3  |  F4  |  F5  |------|           |------|  F6  |  -   |  =   |  [   |  ]   |   \    |
- * |---------+------+------+------+------+------| F12  |           | F11  |------+------+------+------+------+--------|
- * |         |  F7  |  F8  |  F9  | F10  | F11  |      |           |      | F12  |ISO # |ISO / |Pg Up |Pg Dn |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      | Play | Vol- | Vol+ | Next |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                       ,-------------.           ,-------------.
- *                                       |Animat|      |           |Toggle|Solid |
- *                                ,------|------|------|           |------+------+------.
- *                                |Bright|Bright|      |           |      |Hue-  |Hue+  |
- *                                |ness- |ness+ |------|           |------|      |      |
- *                                |      |      |      |           |      |      |      |
- *                                `--------------------'           `--------------------'
- */
-[_RAISE] = LAYOUT_ergodox(
-  // left hand
-  VRSN,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F6,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______,
-
-                                               _______, _______,
-                                                        _______,
-                                      _______, _______, _______,
-
-  // right hand
-  KC_F12, KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-  KC_F5,  KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    _______,
-          KC_F6,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-                  _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT,
-
-  _______, _______,
-  _______,
-  _______, _______,  _______
-),
-
-/* Adjust
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |Reset |Debug |      |      |      |      |           |      |      |TRM on|TRMoff|      |      |  Del   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | CPSLCK |      |      |      |      |AG Nrm|------|           |------|AG Swp|QWERTY|Wrkman|Dvorak|Colmak|        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                      ,-------------.           ,-------------.
- *                                      |      |      |           |      |      |
- *                               ,------|------|------|           |------+------+------.
- *                               |      |      |      |           |      |      |      |
- *                               |      |      |------|           |------|      |      |
- *                               |      |      |      |           |      |      |      |
- *                               `--------------------'           `--------------------'
- */
-[_ADJUST] = LAYOUT_ergodox(
-  // left hand
-  VRSN,    _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, DB_TOGG, BL_TOGG, BL_STEP, _______, _______,
-  KC_CAPS, _______, _______, _______, _______, AG_NORM,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,
-
-                                               _______, _______,
-                                                        _______,
-                                      _______, _______, _______,
-
-  // right hand
-  _______, _______, _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______,  _______, _______, KC_DEL,
-           AG_SWAP, QWERTY,  WORKMAN,  DVORAK,  COLEMAK, _______,
-  _______, _______, _______, _______,  _______, _______, _______,
-                    _______, _______,  _______, _______, _______,
-
-  _______, _______,
-  _______,
-  _______, _______,  _______
-),
-
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk |Wh Up |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|Wh Dn |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                      ,-------------.           ,-------------.
- *                                      |      |      |           |      |      |
- *                               ,------|------|------|           |------+------+------.
- *                               |      |      |      |           |      |Brwser|Brwser|
- *                               | Lclk | Rclk |------|           |------|Back  |Fwd   |
- *                               |      |      |      |           |      |      |      |
- *                               `--------------------'           `--------------------'
- */
-// MOUSE
-[_MOUSE] = LAYOUT_ergodox(
-  // left hand
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_D, _______,
-  _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U,
-  _______, _______, KC_WH_L, KC_BTN3, KC_WH_R, _______, TO(_GAME),
-  _______, _______, _______, _______, _______,
-
-                                       _______, _______,
-                                                KC_WH_D,
-                              KC_BTN1, KC_BTN2, KC_WH_U,
-
-  // right hand
-  _______,   _______, _______, _______, _______, _______, _______,
-  _______,   _______, _______, _______, _______, _______, _______,
-             _______, _______, _______, _______, _______, KC_MPLY,
-  TO(_GAME), _______, _______, KC_MPRV, KC_MNXT, _______, _______,
-                      KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
-
-  _______, _______,
-  _______,
-  _______, KC_WBAK, KC_WFWD
-),
-
-/* Keymap 2: GAME
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                      ,-------------.           ,-------------.
- *                                      |      |      |           |      |      |
- *                               ,------|------|------|           |------+------+------.
- *                               |      |      |      |           |      |Brwser|Brwser|
- *                               | Lclk | Rclk |------|           |------|Back  |Fwd   |
- *                               |      |      |      |           |      |      |      |
- *                               `--------------------'           `--------------------'
- */
-[_GAME] = LAYOUT_ergodox(
-  // left hand
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,
-
-                                                  _______, _______,
-                                                           _______,
-                                        KC_SPACE, KC_LGUI, KC_LALT,
-
-  // right hand
-  _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, _______,
-
-  TG(_MOUSE), TT(_NUM),
-  _______,
-  _______,    _______,  _______
-),
-
-/* Keymap 2: NUMPAD
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |   ✗  |   ✗  |   ✗  |   ✗  |   ✗  |   ✗  |           |   ✗  |   ✗  |   ✗  |   /  |   *  |   -  |        |
- * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |        |   ✗  | Home |  Up  |  End | PgUp |      |           |      |   ✗  |   7  |   8  |   9  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   ✗  | Left | Down | Right| PgDn |------|           |------|   ✗  |   4  |   5  |   6  |   +  |    ✗   |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   /  |   *  |   -  |   +  | Enter|      |           |      |   ✗  |   1  |   2  |   3  | Enter|  Enter |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |   ✗  |                                       |   0  |   0  |   .  | Enter|   =  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                      ,-------------.           ,-------------.
- *                                      |      |      |           |      |      |
- *                               ,------|------|------|           |------+------+------.
- *                               |      |      |      |           |      |      |      |
- *                               |      |      |------|           |------|      |      |
- *                               |      |      |      |           |      |      |      |
- *                               `--------------------'           `--------------------'
- */
-[_NUM] = LAYOUT_ergodox(
-  // left hand
-  _______, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  _______, KC_NO,   KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_NO,
-  _______, KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
-  _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PENT, KC_NO,
-  _______, _______, _______, _______, KC_NO,
-
-                                               _______, _______,
-                                                        _______,
-                                      _______, _______, _______,
-
-  // right h