From 476f5566132032af227a4fa95ceab56f4f3e06f7 Mon Sep 17 00:00:00 2001
From: Christoffer Holmberg <mr.skug@gmail.com>
Date: Tue, 29 Oct 2019 10:39:15 +0200
Subject: [PATCH] [Keymap] Update layout for my nyquist (#7188)

* Add layer for gaming without fancy Shift & Ctrl keys

* Add default layer select to ARRW layer

* Define layers with an enum to save fw space
---
 .../keebio/nyquist/keymaps/skug/keymap.c      | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/keyboards/keebio/nyquist/keymaps/skug/keymap.c b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
index 3d67b2a73..be77cb24b 100644
--- a/keyboards/keebio/nyquist/keymaps/skug/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/skug/keymap.c
@@ -19,16 +19,6 @@
 
 extern keymap_config_t keymap_config;
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define ARRW 3
-#define _ADJUST 16
-
 #define CT_APOS CTL_T(SE_APOS)
 #define CT_TILD CTL_T(SE_TILD)
 #define MD_OSLH LT(MDIA, SE_OSLH)
@@ -36,6 +26,15 @@ extern keymap_config_t keymap_config;
 #define SE_LT   SE_LESS
 #define SE_GT   LSFT(SE_LESS)
 
+enum layer_names {
+      BASE,
+      GAME,
+      SYMB,
+      MDIA,
+      ARRW,
+      _ADJUST,
+};
+
 enum custom_keycodes {
   PLACEHOLDER = SAFE_RANGE,
   ADJUST,
@@ -68,6 +67,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   CT_APOS,  SE_ACUT, KC_LALT, KC_BSPC, KC_SPC,  KC_LGUI,     KC_ENT,  KC_SPC,  KC_BSPC, KC_ALGR, SE_ASTR, CT_TILD  \
 ),
 
+/* Gaming layer
+ * ,-----------------------------------------.   .-----------------------------------------.
+ * |  Esc |   1  |   2  |   3  |   4  |   5  |   |   6  |   7  |   8  |   9  |   0  |   +  |
+ * |------+------+------+------+------+------+   +------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   |   Y  |   U  |   I  |   O  |   P  |   Å  |
+ * |------+------+------+------+------+------|   |------+------+------+------+------+------|
+ * | ARRW |   A  |   S  |   D  |   F  |   G  |   |   H  |   J  |   K  |   L  |   Ö  |   Ä  |
+ * |------+------+------+------+------+------|   |------+------+------+------+------+------|
+ * |Shift |   Z  |   X  |   C  |   V  |   B  |   |   N  |   M  |   ,  |   .  |   -  | Shift|
+ * |------+------+------+------+------+------+   +------+------+------+------+------+------|
+ * | Ctrl |  ´   | Alt  |  Bsp |Space |  Win |   | Entr | Space| Bsb  | AlGr |   *  | Ctrl |
+ * `-----------------------------------------'   '-----------------------------------------'
+ */
+[GAME] = LAYOUT( \
+                //       LEFT HAND                                               RIGHT HAND
+  KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    SE_PLUS, \
+  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    SE_AA,   \
+  MO(ARRW), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    MD_OSLH, SM_AE,   \
+  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS, KC_RSFT, \
+  KC_LCTL,  SE_ACUT, KC_LALT, KC_BSPC, KC_SPC,  KC_LGUI,     KC_ENT,  KC_SPC,  KC_BSPC, KC_ALGR, SE_ASTR, KC_RCTL  \
+),
+
 /* Symbols layer
  * ,-----------------------------------------.   .-----------------------------------------.
  * |      |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
@@ -112,9 +133,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Arrow layer
  * ,-----------------------------------------.   .-----------------------------------------.
- * |  §/½ |      |      |      |      |      |   |      |      |      | Ins  | Home | PgUp |
+ * |  §/½ |      |      |      |      |      |   |      |      | BASE | Ins  | Home | PgUp |
  * |------+------+------+------+------+------+   +------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |   |      |      |      | Del  | End  | PgDn |
+ * |      |      |  Up  |      |      |      |   |      |      | GAME | Del  | End  | PgDn |
  * |------+------+------+------+------+------|   |------+------+------+------+------+------|
  * |      | Left | Down | Right|      | Back |   |  Fwd |      |      |      |      |      |
  * |------+------+------+------+------+------|   |------+------+------+------+------+------|
@@ -124,8 +145,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------'   '-----------------------------------------'
  */
 [ARRW] = LAYOUT( \
-  SE_HALF,  _______,  _______,  _______ ,  _______,  _______,     _______,  _______,  _______,  KC_INS ,  KC_HOME,  KC_PGUP, \
-  _______,  _______,  KC_UP  ,  _______ ,  _______,  _______,     _______,  _______,  _______,  KC_DEL ,  KC_END ,  KC_PGDN, \
+  SE_HALF,  _______,  _______,  _______ ,  _______,  _______,     _______,  _______,  DF(BASE),  KC_INS ,  KC_HOME,  KC_PGUP, \
+  _______,  _______,  KC_UP  ,  _______ ,  _______,  _______,     _______,  _______,  DF(GAME),  KC_DEL ,  KC_END ,  KC_PGDN, \
   _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_WBAK,     KC_WFWD,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  _______ ,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______, \
   _______,  _______,  _______,  KC_DEL  ,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______  \