Changes to danielhklein nyquist config (#2783)

* nyquist

* danielhklein nyquist setup

* shift left controls

* remove readme

* cleanup before pr

* ready for pr

* updated bootmagic, arrows, and special chars

* allow gui on arrows

* replace arrows with right modifiers

* documentation re-added

* updated personal repo

* fixes to layers

3 files changed, 67 insertions, 34 deletions

diff --git a/keyboards/nyquist/keymaps/danielhklein/config.h b/keyboards/nyquist/keymaps/danielhklein/config.h
index 7ed90b6cdf..09abbccb72 100644
--- a/keyboards/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/nyquist/keymaps/danielhklein/config.h
@@ -19,6 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM 150 
 #define USE_SERIAL
 #define EE_HANDS
+#define BOOTMAGIC_KEY_SALT KC_ENT
+
 
 #ifdef SUBPROJECT_rev1
     #include "../../rev1/config.h"
diff --git a/keyboards/nyquist/keymaps/danielhklein/keymap.c b/keyboards/nyquist/keymaps/danielhklein/keymap.c
index d0801b4a16..c7dd52a12e 100644
--- a/keyboards/nyquist/keymaps/danielhklein/keymap.c
+++ b/keyboards/nyquist/keymaps/danielhklein/keymap.c
@@ -7,32 +7,41 @@
  Major changes made:
   - DVORAK, COLEMAK, FUNCTION, MOUSE, and ADJUST layers have been removed
   - right 2u key performs backspace, not enter
-  - no right ctrl key
-  - direction keys added to bottom row
   - LOWER layer controls function keys, media controls, and underglow
+  - ARROW layer uses JKLI for arrow keys
+  - Bootmagic enabled and bootmagic initialization key changed from space to enter
 */
+
 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.
 enum custom_layers {
   _QWERTY,
   _LOWER,
-  _RAISE
+  _RAISE,
+  _ARROW
 };
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
   LOWER,
-  RAISE
+  RAISE,
+  ARROW
 };
 
   // Enable these functions using FUNC(n) macro.
   const uint16_t PROGMEM fn_actions[] = { //ACTION_LAYER_TAP_TOGGLE requires that number of taps be defined in *config.h* - default set to 5
-      [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC),    //Hold for momentary Lower layer, Tap for Space,
-      [1] = ACTION_LAYER_TAP_KEY(_RAISE, KC_BSPC)     //Hold for momentary Raise layer, Tap for Backspace,
+      [0] = LT(_LOWER, KC_SPC),    //Hold for momentary Lower layer, Tap for Backspace, 
+      [1] = LT(_RAISE, KC_BSPC),     //Hold for momentary Raise layer, Tap for Space,
+      [2] = MO(_ARROW), //Hold for momentary Arrow
    };
 
 #define SPC_LWR FUNC(0)
 #define BSP_RSE FUNC(1)
+#define ARW FUNC(2)
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
@@ -44,48 +53,48 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* QWERTY
+/* QWERTY 
  * .----------------------------------------.     .-----------------------------------------.
- * | Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  |  [   |
+ * | Esc |   1  |   2  |   3  |   4  |   5  |     |   6  |   7  |   8  |   9  |   0  |  -   |
  * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * | Tab |   Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |  ]   |
+ * | Tab |   Q  |   W  |   E  |   R  |   T  |     |   Y  |   U  |   I  |   O  |   P  |Enter |
  * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
  * | Caps|   A  |   S  |   D  |   F  |   G  |     |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * |Lshft|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |  /   |Enter |
+ * |Lshft|   Z  |   X  |   C  |   V  |   B  |     |   N  |   M  |   ,  |   .  |  /   |Rshft |
  * |-----+------+------+------+------+------|     |------+------+------+------+------+------|
- * |     | Ctrl | LAlt | LGui |  Bspc/Raise |     |   Spc/Lower | Left | Down |  Up  |Right |
+ * |Arrow| LCtrl| LAlt | LGui |  Bspc/Raise |     |   Spc/Lower | RGui | RAlt | RCtrl| Del  |
  * `----------------------------------------'     '-----------------------------------------'
  */
 
 [_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,    KC_0,    KC_LBRACKET,  \
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,    KC_P,    KC_RBRACKET, \
-  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_ENT, \
-  XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, BSP_RSE, BSP_RSE, SPC_LWR, SPC_LWR, KC_LEFT,   KC_DOWN, KC_UP,   KC_RGHT \
-  ),
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,      KC_9,    KC_0,    KC_MINS,  
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,      KC_O,    KC_P,    KC_ENT, 
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,      KC_L,    KC_SCLN, KC_QUOT, 
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,   KC_DOT,  KC_SLSH, KC_RSFT, 
+  ARW,     KC_LCTL, KC_LALT, KC_LGUI, BSP_RSE, BSP_RSE, SPC_LWR, SPC_LWR, KC_RGUI,   KC_RALT, KC_RCTL, KC_DEL 
+  ),  
 
 /* Raise
  * ,-----------------------------------------.    .-----------------------------------------.
- * |      |      |      |      |      |      |    |   =  |   /  |   *  |   -  |   \  | Del  |
+ * |      |      |      |      |      |      |    |   =  |   /  |   *  |   -  |   \  |   `  |
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |      |      |    |   7  |   8  |   9  |   +  |   `  |      |
+ * |      |      |      |      |      |      |    |   7  |   8  |   9  |   +  |   [  |   ]  |
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
  * |      |      |      |      |      |      |    |   4  |   5  |   6  | Enter|      |      |
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
  * | Lshft|      |      |      |      |      |    |   1  |   2  |   3  | Space|      |      |
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |      |      |      |      |  Bspc/Raise |    |      0      |   .  | Bspc |      |      |
+ * |      |      |      | LGui |             |    |      0      |   .  | Bspc |      |      |
  * `-----------------------------------------'    `-----------------------------------------'
  */
 
-[_RAISE] = LAYOUT( \
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_PEQL, KC_PSLS, KC_PAST, KC_MINS,  KC_BSLS, KC_DEL, \
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_PPLS,  KC_GRV,  XXXXXXX,\
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_PENT,  XXXXXXX, XXXXXXX,\
-  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_SPC,   XXXXXXX, XXXXXXX,\
-  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,  KC_0,    KC_0,    KC_DOT,  KC_BSPC,  XXXXXXX, XXXXXXX \
+[_RAISE] = LAYOUT( 
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_PEQL, KC_PSLS, KC_PAST, KC_MINS,  KC_BSLS, KC_GRV, 
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_7,    KC_8,    KC_9,    KC_PPLS,  KC_LBRC, KC_RBRC,
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_4,    KC_5,    KC_6,    KC_PENT,  XXXXXXX, XXXXXXX,
+  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_1,    KC_2,    KC_3,    KC_SPC,   XXXXXXX, XXXXXXX,
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,  _______,  KC_0,    KC_0,    KC_DOT,  KC_BSPC,  XXXXXXX, XXXXXXX 
 ),
 
 /* Lower
@@ -98,18 +107,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
  * |RGB IO|RGB >>|RGB <<|Hue++ |Hue-- |      |    |      |      |      |      |      |      |
  * |------+------+------+------+------+------|    |------+------+------+------+------+------|
- * |Sat++ |Sat-- |Val++ |Val-- |             |    |   Spc/Lower |      |      |      |      |
+ * |Sat++ |Sat-- |Val++ |Val-- |             |    |             |      |      |      |      |
  * `-----------------------------------------'    `-----------------------------------------'
 */
 
-[_LOWER] = LAYOUT( \
-  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  KC_F7,    KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  KC_MPLY,  KC_MUTE, KC_VOLD,  KC_VOLU, KC_MPRV, KC_MNXT, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  RGB_TOG,  RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD, XXXXXXX, XXXXXXX, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+[_LOWER] = LAYOUT( 
+  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  KC_F7,    KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  KC_MPLY,  KC_MUTE, KC_VOLD,  KC_VOLU, KC_MPRV, KC_MNXT, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  RGB_TOG,  RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD, XXXXXXX, XXXXXXX, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
   ),
 
+/* Arrow
+ * ,-----------------------------------------.     ,----------------------------------------.
+ * |      |      |      |      |      |      |     |     |      |      |      |      |      |
+ * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
+ * |      |      |      |      |      |      |     |     |      |  Up  |      |      |      |
+ * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
+ * |      |      |      |      |      |      |     |     | Left | Down |Right |      |      |
+ * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
+ * |      |      |      |      |      |      |     |     |      |      |      |      |      |
+ * |------+------+------+------+------+------|     |-----+------+------+------+------+------|
+ * |      |      |      | Gui  |             |     |            |      |      |      |      |
+ * `-----------------------------------------'     `----------------------------------------'
+ */
+
+[_ARROW] = LAYOUT( 
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, 
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX,
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT,  XXXXXXX, XXXXXXX,
+  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+  _______,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX 
+),
+
 };
 
 void persistent_default_layer_set(uint16_t default_layer) {
diff --git a/keyboards/nyquist/keymaps/danielhklein/rules.mk b/keyboards/nyquist/keymaps/danielhklein/rules.mk
index ba799d47f4..0b540a4712 100644
--- a/keyboards/nyquist/keymaps/danielhklein/rules.mk
+++ b/keyboards/nyquist/keymaps/danielhklein/rules.mk
@@ -18,7 +18,7 @@
 #   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)
+BOOTMAGIC_ENABLE = yes      # 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)