Voyager: Redo keyboard layout

I'm trying something new again. I tried using a row higher as the home row, but
I can't get comfortable that way, my arms feel tired at the end of the day. The
lower row was nicer and the thumb keys were easier to reach from there.

This moves the keys back down a layer. The top row is taken from my Ergodox
layout, the symbols layer is inspired by (but not the same as) the one from my
Atreus.

Hopefully I didn't miss any keys and this will be more comfortable.

1 files changed, 20 insertions, 45 deletions

diff --git a/keyboards/zsa/voyager/keymaps/ryuk/keymap.c b/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
index 3e89408..24557dc 100644
--- a/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
+++ b/keyboards/zsa/voyager/keymaps/ryuk/keymap.c
@@ -9,52 +9,52 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap 0: Basic layer
    *
    * ,---------------------------------------------.           ,--------------------------------------------.
-   * | ESC      |   Q  |   W  |   F  |   P  |   G  |           |   J  |   L  |   U  |   Y  |   ;  |    -    |
+   * | ESC      |   [  |   {  |   }  |   (  |   =  |           |   *  |   )  |   +  |   ]  |   !  |   APP   |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |   A  |   R  |   S  |   T  |   D  |           |   H  |   N  |   E  |   I  |   O  |    \    |
+   * | LSFT     |   Q  |   W  |   F  |   P  |   G  |           |   J  |   L  |   U  |   Y  |   ;  |  RSFT   |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |   Z  |   X  |   C  |   V  |   B  |           |   K  |   M  |   ,  |   .  |   '  |    /    |
+   * | LCTL     |   A  |   R  |   S  |   T  |   D  |           |   H  |   N  |   E  |   I  |   O  |  RCTL   |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |   ~L1    |  ~L2 | LALT |LSHIFT| LCtrl|      |           |      | RCtrl|RSHIFT| LALT | ~L2  |   ~L1   |
+   * | LALT     |   Z  |   X  |   C  |   V  |   B  |           |   K  |   M  |   ,  |   .  |   '  |  RALS   |
    * `----------+------+------+------+------+------'           `------+------+------+------+------+---------'
    *
    *                              ,----------------.           ,----------------.
-   *                              |   BSPS  |      |           |      |   SPC   |
+   *                              | 1,BSPS  |      |           |      |  2,SPC  |
    *                              '---------|G(TAB)|           |G(RET)|---------'
    *                                        |      |           |      |
    *                                        `------'           `------'
    */
     [0] = LAYOUT(
-        KC_ESC,  KC_Q,  KC_W,    KC_F,    KC_P,    KC_G,                   KC_J,    KC_L,    KC_U,     KC_Y,    KC_SCLN, KC_MINS,
-         KC_NO,  KC_A,  KC_R,    KC_S,    KC_T,    KC_D,                   KC_H,    KC_N,    KC_E,     KC_I,    KC_O,    KC_BSLS,
-         KC_NO,  KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,                   KC_K,    KC_M,    KC_COMMA, KC_DOT,  KC_QUOT, KC_SLSH,
-         MO(2), MO(1), KC_LALT, KC_LSFT, KC_LCTL, KC_NO,                   KC_NO,   KC_RCTL, KC_RSFT,  KC_LALT, MO(1),   MO(2),
-                                    KC_BSPC, LGUI_T(KC_TAB),           LGUI_T(KC_ENT), LT(2,KC_SPC)
+         KC_ESC,  KC_LBRC,  KC_LCBR,  KC_RCBR,  KC_LPRN,  KC_EQL,              KC_ASTR,  KC_RPRN,   KC_PLUS,  KC_RBRC,  KC_EXLM,   KC_APP,
+        KC_LSFT,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,                   KC_J,     KC_L,      KC_U,     KC_Y,  KC_SCLN,  KC_RSFT,
+        KC_LCTL,  KC_A,     KC_R,     KC_S,     KC_T,     KC_D,                   KC_H,     KC_N,      KC_E,     KC_I,     KC_O,  KC_RCTL,
+        KC_LALT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                   KC_K,     KC_M,  KC_COMMA,   KC_DOT,  KC_QUOT,  KC_RALT,
+                                     LT(1,KC_BSPC), LGUI_T(KC_TAB),           LGUI_T(KC_ENT), LT(2,KC_SPC)
     ),
   /* Keymap 1: Symbols && Numbers
    *
    * ,---------------------------------------------.           ,--------------------------------------------.
-   * |     `    |   !  |   @  |   #  |   $  |   %  |           |   -  |   7  |   8  |   9  |   /  |   F12   |
+   * |    F1    |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  |   F12   |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |   ^  |   &  |   *  |   (  |   )  |           |   +  |   4  |   5  |   6  |   *  |    ⌫    |
+   * |   PGUP   |   !  |   @  |   ↑  |   $  |   %  |           |  |   |   7  |   8  |   9  |  ?   |    `    |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |      |   [  |   ]  |   {  |   }  |           |   .  |   1  |   2  |   3  |   =  |    ⏎   |
+   * |   PGDN   |   (  |   ←  |   ↓  |   →  |   )  |           |  &   |   4  |   5  |   6  |  ^   |    -    |
    * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |   ~L3    |      | LALT |LSHIFT| LCtrl|      |           |      | RCtrl|RSHIFT| LALT |      |   ~L3   |
+   * |    _     |   [  |   ]  |   #  |   {  |   }  |           |  *   |   1  |   2  |   3  |  +   |    ~    |
    * `----------+------+------+------+------+------'           `------+------+------+------+------+---------'
    *
    *                                 ,-------------.           ,-------------.
    *                                 |      |      |           |      |   0  |
-   *                                 '------|      |           |      |------'
+   *                                 '------|  \   |           |  /   |------'
    *                                        |      |           |      |
    *                                        `------'           `------'
    */
     [1] = LAYOUT(
-         KC_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,            KC_MINS, KC_7,    KC_8,     KC_9,    KC_SLSH, KC_F12,
-        _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,            KC_PLUS, KC_4,    KC_5,     KC_6,    KC_ASTR, KC_BSPC,
-        _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR,            KC_DOT,  KC_1,    KC_2,     KC_3,    KC_EQL,  KC_ENT,
-          MO(3),   KC_NO, KC_LALT, KC_LSFT, KC_LCTL,   KC_NO,            KC_NO,   KC_RCTL, KC_RSFT,  KC_LALT, KC_NO,   MO(3),
-                                                _______, _______,    _______, KC_0
+    KC_F1,      KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,             KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,   KC_F12,
+    KC_PGUP,  KC_EXLM,    KC_AT,    KC_UP,   KC_DLR,  KC_PERC,             KC_PIPE,  KC_7,     KC_8,     KC_9,    KC_QUES,  KC_GRV,
+    KC_PGDN,  KC_LPRN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_RPRN,             KC_AMPR,  KC_4,     KC_5,     KC_6,    KC_CIRC,  KC_MINS,
+    KC_UNDS,  KC_LBRC,  KC_RBRC,  KC_HASH,  KC_LCBR,  KC_RCBR,             KC_ASTR,  KC_1,     KC_2,     KC_3,    KC_PLUS,  KC_TILD,
+                                                _______, KC_SLSH,    KC_BSLS, KC_0
     ),
     [2] = LAYOUT(
         RGB_TOG, QK_KB,   RGB_MOD, RGB_M_P, RGB_VAD, RGB_VAI,                      _______, _______, _______, _______, _______, QK_BOOT,
@@ -63,30 +63,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______,                      _______, C(S(KC_TAB)), C(KC_TAB), _______, _______, _______,
                                                      _______, _______,    _______, _______
     ),
-  /* Keymap 3: Function keys
-   *
-   * ,---------------------------------------------.           ,--------------------------------------------.
-   * |          |      |      |      |      |      |           |      |  F7  |  F8  |  F9  |  F10 |         |
-   * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |      |      |      |      |      |           |      |  F4  |  F5  |  F6  |  F11 |         |
-   * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |      |      |      |      |      |           |      |  F1  |  F2  |  F3  |  F12 |         |
-   * |----------+------+------+------+------+------|           |------+------+------+------+------+---------|
-   * |          |      | LALT |LSHIFT| LCtrl|      |           |      | RCtrl|RSHIFT| LALT |      |         |
-   * `----------+------+------+------+------+------'           `------+------+------+------+------+---------'
-   *
-   *                                 ,-------------.           ,-------------.
-   *                                 |      |      |           |      |      |
-   *                                 '------|      |           |      |------'
-   *                                        |      |           |      |
-   *                                        `------'           `------'
-   */
-    [3] = LAYOUT(
-          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,            KC_NO, KC_F7,   KC_F8,    KC_F9,   KC_F10, KC_NO,
-        _______,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,            KC_NO, KC_F4,   KC_F5,    KC_F6,   KC_F11, KC_NO,
-        _______, _______,   KC_NO,   KC_NO,   KC_NO, KC_NO,            KC_NO, KC_F1,   KC_F2,    KC_F3,   KC_F12, KC_NO,
-          KC_NO,   KC_NO, KC_LALT, KC_LSFT, KC_LCTL, KC_NO,            KC_NO, KC_RCTL, KC_RSFT,  KC_LALT, KC_NO,  KC_NO,
-                                                _______, _______,    _______, KC_NO
-    ),
     // clang-format on
 };