Reformat

1 files changed, 221 insertions, 219 deletions

diff --git a/keymap.c b/keymap.c
index bf08990..d4179ef 100644
--- a/keymap.c
+++ b/keymap.c
@@ -2,11 +2,11 @@
 #include "version.h"
 
 enum layers {
-    BASE,                       // Default layer
-    SYMNUM,                     // Symbols and numbers
-    MOVEMENT,                   // Movement/Navigation keys
-    UPPER,                      /* Fake capslock */
-    GAME,                       /* Flipped for games */
+  BASE,     // Default layer
+  SYMNUM,   // Symbols and numbers
+  MOVEMENT, // Movement/Navigation keys
+  UPPER,    /* Fake capslock */
+  GAME,     /* Flipped for games */
 };
 
 enum custom_keycodes {
@@ -19,28 +19,29 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | ESC    |   1  |   2  |   3  |   4  |   5  |  L4  |           |  L3  |   6  |   7  |   8  |   9  |   0  |  DEL   |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   Q  |   W  |   E  |   R  |   T  | APP  |           |      |   Y  |   U  |   I  |   O  |   P  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | Meh    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Meh    |
- * |--------+------+------+------+------+------| TAB  |           | Back |------+------+------+------+------+--------|
- * | Hyper  |   Z  |   X  |   C  |   V  |   B  |      |           | space|   N  |   M  |   ,  |   .  |   '  | Hyper  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | ~L1  | ~L2  | LAlt |LShift| LCtrl|                                       | RCtrl|RShift| LAlt | ~L1  | ~L2  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,--------------.
- *                                        | Home | End  |       | Left | Right |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | PgUp |       |  Up  |        |      |
- *                                 | Space| LGui |------|       |------|  RGui  |Enter |
- *                                 |      |      | PgDn |       | Down |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[BASE] = LAYOUT_ergodox_pretty(
+    // clang-format off
+  /* Keymap 0: Basic layer
+   *
+   * ,--------------------------------------------------.           ,--------------------------------------------------.
+   * | ESC    |   1  |   2  |   3  |   4  |   5  |  L4  |           |  L3  |   6  |   7  |   8  |   9  |   0  |  DEL   |
+   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+   * |        |   Q  |   W  |   E  |   R  |   T  | APP  |           |      |   Y  |   U  |   I  |   O  |   P  |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * | Meh    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | Meh    |
+   * |--------+------+------+------+------+------| TAB  |           | Back |------+------+------+------+------+--------|
+   * | Hyper  |   Z  |   X  |   C  |   V  |   B  |      |           | space|   N  |   M  |   ,  |   .  |   '  | Hyper  |
+   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+   *   | ~L1  | ~L2  | LAlt |LShift| LCtrl|                                       | RCtrl|RShift| LAlt | ~L1  | ~L2  |
+   *   `----------------------------------'                                       `----------------------------------'
+   *                                        ,-------------.       ,--------------.
+   *                                        | Home | End  |       | Left | Right |
+   *                                 ,------|------|------|       |------+--------+------.
+   *                                 |      |      | PgUp |       |  Up  |        |      |
+   *                                 | Space| LGui |------|       |------|  RGui  |Enter |
+   *                                 |      |      | PgDn |       | Down |        |      |
+   *                                 `--------------------'       `----------------------'
+   */
+  [BASE] = LAYOUT_ergodox_pretty(
   // left hand
         KC_ESC,        KC_1,     KC_2,       KC_3,      KC_4,     KC_5,  TG(GAME),             TG(UPPER),  KC_6,      KC_7,      KC_8,       KC_9,     KC_0,        KC_DEL,
        KC_TRNS,        KC_Q,     KC_W,       KC_E,      KC_R,     KC_T,    KC_APP,             KC_TRNS,    KC_Y,      KC_U,      KC_I,       KC_O,     KC_P,        KC_TRNS,
@@ -50,149 +51,150 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                KC_HOME,    KC_END,             KC_LEFT,    KC_RIGHT,
                                                                           KC_PGUP,             KC_UP,
                                                       KC_SPC,  KC_LGUI,   KC_PGDN,             KC_DOWN,    KC_RGUI,   KC_ENT
-),
-/* Keymap 1: Symbol and numbers layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |    F1   |  F2  |  F3  |  F4  |  F5  |  F6  |      |           |      |  F7  |  F8  |  F9  | F10  |  F11 |   F12  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   -  |   =  |   {  |   }  |   |  |      |           |      |      |   &  |   *  |   (  |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   _  |   ?  |   \  |   /  |   `  |------|           |------|   ,  |   $  |   %  |   ^  |      |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   +  |      |   [  |   ]  |   ~  |      |           |      |   6  |   !  |   @  |   #  |   8  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |      |    . |   )  |   5  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[SYMNUM] = LAYOUT_ergodox_pretty(
-  // left hand
-    KC_F1,        KC_F2,        KC_F3,           KC_F4,           KC_F5,    KC_F6,  KC_TRNS,             KC_TRNS,  KC_F7,     KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-  KC_TRNS,     KC_MINUS,     KC_EQUAL,  S(KC_LBRACKET),  S(KC_RBRACKET),  KC_PIPE,  KC_TRNS,             KC_TRNS,  KC_TRNS,   S(KC_7),  S(KC_8),  S(KC_9),  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  S(KC_MINUS),  S(KC_SLASH),       KC_BSLASH,        KC_SLASH,   KC_GRV,                                 KC_COMMA,  S(KC_4),  S(KC_5),  S(KC_6),  KC_TRNS,  KC_TRNS,
-  KC_TRNS,  S(KC_EQUAL),      KC_TRNS,     KC_LBRACKET,     KC_RBRACKET,  KC_TILD,  KC_TRNS,             KC_TRNS,  KC_6,      S(KC_1),  S(KC_2),  S(KC_3),  KC_8,     KC_TRNS,
-  KC_TRNS,      KC_TRNS,      KC_TRNS,         KC_TRNS,         KC_TRNS,                                                      KC_TRNS,  KC_DOT,   S(KC_0),  KC_5,     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
-),
-/* Keymap 2: Movement mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk | WhUp |      |           |      | PgUp | Home |  Up  | End  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght| WhDn |------|           |------| PgDn | Left | Down | Right|      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-[MOVEMENT] = LAYOUT_ergodox_pretty(
-  // left 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_MS_BTN1,  KC_MS_U,  KC_MS_BTN2,    KC_MS_WH_UP,  KC_TRNS,     KC_TRNS,  KC_PGUP,    KC_HOME,  KC_UP,    KC_END,    KC_TRNS,  KC_TRNS,
-  KC_TRNS,  KC_TRNS,    KC_MS_L,  KC_MS_D,     KC_MS_R,  KC_MS_WH_DOWN,                         KC_PGDOWN,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  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_TRNS,     KC_TRNS,                                         KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,
+  ),
+  /* Keymap 1: Symbol and numbers layer
+   *
+   * ,---------------------------------------------------.           ,--------------------------------------------------.
+   * |    F1   |  F2  |  F3  |  F4  |  F5  |  F6  |      |           |      |  F7  |  F8  |  F9  | F10  |  F11 |   F12  |
+   * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+   * |         |   -  |   =  |   {  |   }  |   |  |      |           |      |      |   &  |   *  |   (  |      |        |
+   * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |         |   _  |   ?  |   \  |   /  |   `  |------|           |------|   ,  |   $  |   %  |   ^  |      |        |
+   * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |         |   +  |      |   [  |   ]  |   ~  |      |           |      |   6  |   !  |   @  |   #  |   8  |        |
+   * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+   *   |       |      |      |      |      |                                       |      |    . |   )  |   5  |      |
+   *   `-----------------------------------'                                       `----------------------------------'
+   *                                        ,-------------.       ,-------------.
+   *                                        |      |      |       |      |      |
+   *                                 ,------|------|------|       |------+------+------.
+   *                                 |      |      |      |       |      |      |      |
+   *                                 |      |      |------|       |------|      |      |
+   *                                 |      |      |      |       |      |      |      |
+   *                                 `--------------------'       `--------------------'
+   */
+  [SYMNUM] = LAYOUT_ergodox_pretty(
+    // left hand
+      KC_F1,        KC_F2,        KC_F3,           KC_F4,           KC_F5,    KC_F6,  KC_TRNS,             KC_TRNS,  KC_F7,     KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+    KC_TRNS,     KC_MINUS,     KC_EQUAL,  S(KC_LBRACKET),  S(KC_RBRACKET),  KC_PIPE,  KC_TRNS,             KC_TRNS,  KC_TRNS,   S(KC_7),  S(KC_8),  S(KC_9),  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  S(KC_MINUS),  S(KC_SLASH),       KC_BSLASH,        KC_SLASH,   KC_GRV,                                 KC_COMMA,  S(KC_4),  S(KC_5),  S(KC_6),  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  S(KC_EQUAL),      KC_TRNS,     KC_LBRACKET,     KC_RBRACKET,  KC_TILD,  KC_TRNS,             KC_TRNS,  KC_6,      S(KC_1),  S(KC_2),  S(KC_3),  KC_8,     KC_TRNS,
+    KC_TRNS,      KC_TRNS,      KC_TRNS,         KC_TRNS,         KC_TRNS,                                                      KC_TRNS,  KC_DOT,   S(KC_0),  KC_5,     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
+  ),
+  /* Keymap 2: Movement mouse keys
+   *
+   * ,--------------------------------------------------.           ,--------------------------------------------------.
+   * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+   * |        |      | Lclk | MsUp | Rclk | WhUp |      |           |      | PgUp | Home |  Up  | End  |      |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |      |MsLeft|MsDown|MsRght| WhDn |------|           |------| PgDn | Left | Down | Right|      |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+   *   |      |      |      |      |      |                                       |      |      |      |      |      |
+   *   `----------------------------------'                                       `----------------------------------'
+   *                                        ,-------------.       ,-------------.
+   *                                        |      |      |       |      |      |
+   *                                 ,------|------|------|       |------+------+------.
+   *                                 |      |      |      |       |      |      |Brwser|
+   *                                 |      |      |------|       |------|      |Back  |
+   *                                 |      |      |      |       |      |      |      |
+   *                                 `--------------------'       `--------------------'
+   */
+  [MOVEMENT] = LAYOUT_ergodox_pretty(
+    // left 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_MS_BTN1,  KC_MS_U,  KC_MS_BTN2,    KC_MS_WH_UP,  KC_TRNS,     KC_TRNS,  KC_PGUP,    KC_HOME,  KC_UP,    KC_END,    KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,    KC_MS_L,  KC_MS_D,     KC_MS_R,  KC_MS_WH_DOWN,                         KC_PGDOWN,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  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_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_WBAK
-),
-/* Keymap 3: UPPER layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   L0   |   1  |   2  |   3  |   4  |   5  |      |           |      |   6  |   7  |   8  |   9  |   0  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |  [   |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[UPPER] = LAYOUT_ergodox_pretty(
-  // left hand
-  TO(BASE),  S(KC_1),  S(KC_2),  S(KC_3),  S(KC_4),  S(KC_5),  KC_TRNS,             KC_TRNS,  S(KC_6),  S(KC_7),  S(KC_8),  S(KC_9),  S(KC_0),     KC_TRNS,
-   KC_TRNS,  S(KC_Q),  S(KC_W),  S(KC_E),  S(KC_R),  S(KC_T),  KC_TRNS,             KC_TRNS,  S(KC_Y),  S(KC_U),  S(KC_I),  S(KC_O),  KC_TRNS,     KC_TRNS,
-   KC_TRNS,  S(KC_A),  S(KC_S),  S(KC_D),  S(KC_F),  S(KC_G),                                 S(KC_H),  S(KC_J),  S(KC_K),  S(KC_L),  S(KC_SCLN),  KC_TRNS,
-   KC_TRNS,  S(KC_Z),  S(KC_X),  S(KC_C),  S(KC_V),  S(KC_B),  KC_TRNS,             KC_TRNS,  S(KC_N),  S(KC_M),  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_TRNS,
-                                           KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS
-),
-/* Keymap 4: Game layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |  L4  |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   R  |   ;  |   L  |   I  |   O  |      |           |      |   F  |   S  |   K  |   W  |   Q  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   P  |   U  |   N  |   Y  |   H  |------|           |------|   T  |   E  |   A  |   D  |   G  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   '  |   .  |   ,  |   M  |   J  |      |           |      |   B  |   V  |   C  |   X  |   Z  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,--------------.
- *                                        |      |      |       |      |       |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-[GAME] = LAYOUT_ergodox_pretty(
-  // left hand
-  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  TG(GAME),             KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-  KC_TRNS,     KC_R,  KC_SCLN,      KC_L,     KC_I,     KC_O,   KC_TRNS,             KC_TRNS,  KC_F,     KC_S,     KC_K,     KC_W,     KC_Q,     KC_TRNS,
-  KC_TRNS,     KC_P,     KC_U,      KC_N,     KC_Y,     KC_H,                                  KC_T,     KC_E,     KC_A,     KC_D,     KC_G,     KC_TRNS,
-  KC_TRNS,  KC_QUOT,   KC_DOT,  KC_COMMA,     KC_M,     KC_J,   KC_TRNS,             KC_TRNS,  KC_B,     KC_V,     KC_C,     KC_X,     KC_Z,     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_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_WBAK
+  ),
+  /* Keymap 3: UPPER layer
+   *
+   * ,--------------------------------------------------.           ,--------------------------------------------------.
+   * |   L0   |   1  |   2  |   3  |   4  |   5  |      |           |      |   6  |   7  |   8  |   9  |   0  |        |
+   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+   * |        |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |      |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |      |      |      |        |
+   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+   *   |      |      |      |      |      |                                       |      |      |  [   |      |      |
+   *   `----------------------------------'                                       `----------------------------------'
+   *                                        ,-------------.       ,--------------.
+   *                                        |      |      |       |      |       |
+   *                                 ,------|------|------|       |------+--------+------.
+   *                                 |      |      |      |       |      |        |      |
+   *                                 |      |      |------|       |------|        |      |
+   *                                 |      |      |      |       |      |        |      |
+   *                                 `--------------------'       `----------------------'
+   */
+  [UPPER] = LAYOUT_ergodox_pretty(
+    // left hand
+    TO(BASE),  S(KC_1),  S(KC_2),  S(KC_3),  S(KC_4),  S(KC_5),  KC_TRNS,             KC_TRNS,  S(KC_6),  S(KC_7),  S(KC_8),  S(KC_9),  S(KC_0),     KC_TRNS,
+     KC_TRNS,  S(KC_Q),  S(KC_W),  S(KC_E),  S(KC_R),  S(KC_T),  KC_TRNS,             KC_TRNS,  S(KC_Y),  S(KC_U),  S(KC_I),  S(KC_O),  KC_TRNS,     KC_TRNS,
+     KC_TRNS,  S(KC_A),  S(KC_S),  S(KC_D),  S(KC_F),  S(KC_G),                                 S(KC_H),  S(KC_J),  S(KC_K),  S(KC_L),  S(KC_SCLN),  KC_TRNS,
+     KC_TRNS,  S(KC_Z),  S(KC_X),  S(KC_C),  S(KC_V),  S(KC_B),  KC_TRNS,             KC_TRNS,  S(KC_N),  S(KC_M),  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_TRNS,
+                                             KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+  /* Keymap 4: Game layer
+   *
+   * ,--------------------------------------------------.           ,--------------------------------------------------.
+   * |        |      |      |      |      |      |  L4  |           |      |      |      |      |      |      |        |
+   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+   * |        |   R  |   ;  |   L  |   I  |   O  |      |           |      |   F  |   S  |   K  |   W  |   Q  |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |   P  |   U  |   N  |   Y  |   H  |------|           |------|   T  |   E  |   A  |   D  |   G  |        |
+   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+   * |        |   '  |   .  |   ,  |   M  |   J  |      |           |      |   B  |   V  |   C  |   X  |   Z  |        |
+   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+   *   |      |      |      |      |      |                                       |      |      |      |      |      |
+   *   `----------------------------------'                                       `----------------------------------'
+   *                                        ,-------------.       ,--------------.
+   *                                        |      |      |       |      |       |
+   *                                 ,------|------|------|       |------+--------+------.
+   *                                 |      |      |      |       |      |        |      |
+   *                                 |      |      |------|       |------|        |      |
+   *                                 |      |      |      |       |      |        |      |
+   *                                 `--------------------'       `----------------------'
+   */
+  [GAME] = LAYOUT_ergodox_pretty(
+    // left hand
+    KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  TG(GAME),             KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,     KC_R,  KC_SCLN,      KC_L,     KC_I,     KC_O,   KC_TRNS,             KC_TRNS,  KC_F,     KC_S,     KC_K,     KC_W,     KC_Q,     KC_TRNS,
+    KC_TRNS,     KC_P,     KC_U,      KC_N,     KC_Y,     KC_H,                                  KC_T,     KC_E,     KC_A,     KC_D,     KC_G,     KC_TRNS,
+    KC_TRNS,  KC_QUOT,   KC_DOT,  KC_COMMA,     KC_M,     KC_J,   KC_TRNS,             KC_TRNS,  KC_B,     KC_V,     KC_C,     KC_X,     KC_Z,     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_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+    // clang-format on
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     switch (keycode) {
-      case VRSN:
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        return false;
-      #ifdef RGBLIGHT_ENABLE
-      case RGB_SLD:
-        rgblight_mode(1);
-        return false;
-      #endif
+    case VRSN:
+      SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      return false;
+#ifdef RGBLIGHT_ENABLE
+    case RGB_SLD:
+      rgblight_mode(1);
+      return false;
+#endif
     }
   }
   return true;
@@ -214,61 +216,61 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 
   uint8_t layer = get_highest_layer(state);
   switch (layer) {
-      case 0:
-        #ifdef RGBLIGHT_COLOR_LAYER_0
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0);
-        #endif
-        break;
-      case 1:
-        ergodox_right_led_1_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_1
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1);
-        #endif
-        break;
-      case 2:
-        ergodox_right_led_2_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_2
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2);
-        #endif
-        break;
-      case 3:
-        ergodox_right_led_3_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_3
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3);
-        #endif
-        break;
-      case 4:
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_4
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4);
-        #endif
-        break;
-      case 5:
-        ergodox_right_led_1_on();
-        ergodox_right_led_3_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_5
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5);
-        #endif
-        break;
-      case 6:
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_6
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
-        #endif
-        break;
-      case 7:
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        ergodox_right_led_3_on();
-        #ifdef RGBLIGHT_COLOR_LAYER_7
-          rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7);
-        #endif
-        break;
-      default:
-        break;
-    }
+  case 0:
+#ifdef RGBLIGHT_COLOR_LAYER_0
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0);
+#endif
+    break;
+  case 1:
+    ergodox_right_led_1_on();
+#ifdef RGBLIGHT_COLOR_LAYER_1
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1);
+#endif
+    break;
+  case 2:
+    ergodox_right_led_2_on();
+#ifdef RGBLIGHT_COLOR_LAYER_2
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2);
+#endif
+    break;
+  case 3:
+    ergodox_right_led_3_on();
+#ifdef RGBLIGHT_COLOR_LAYER_3
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3);
+#endif
+    break;
+  case 4:
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+#ifdef RGBLIGHT_COLOR_LAYER_4
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4);
+#endif
+    break;
+  case 5:
+    ergodox_right_led_1_on();
+    ergodox_right_led_3_on();
+#ifdef RGBLIGHT_COLOR_LAYER_5
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5);
+#endif
+    break;
+  case 6:
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+#ifdef RGBLIGHT_COLOR_LAYER_6
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
+#endif
+    break;
+  case 7:
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+#ifdef RGBLIGHT_COLOR_LAYER_7
+    rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7);
+#endif
+    break;
+  default:
+    break;
+  }
 
   return state;
 };