From fe7b46579c05d4aa19d88bc61b8b04967a914f39 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Wed, 10 Aug 2016 19:37:59 -0500
Subject: [PATCH 01/12] completes first-pass at base layer

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 183 ++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 keyboards/ergodox/keymaps/common-nighthawk/keymap.c

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
new file mode 100644
index 0000000000..f222ad839c
--- /dev/null
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -0,0 +1,183 @@
+#include "ergodox.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * | Esc    |   x  |   x  |   x  |   x  |   x  | Home |           | End  |   x  |   x  |   x  |   x  |   x  |   `~   |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |Bks/Ctrl|
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
+ * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
+ * |_/LShift|   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |   x  |   x  |       |  x   |   x    |
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      |   x  |       |  x   |        |      |
+ *                                 | ~L1  |   x  |------|       |------|   x    | ~L1  |
+ *                                 |      |      |Teensy|       |Teensy|        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[BASE] = KEYMAP(  // layer 0 : default
+        // left hand
+        KC_ESC,          KC_1,  KC_1,     KC_1,     KC_1,     KC_1,       KC_HOME,
+        CTL_T(KC_TAB),   KC_Q,  KC_W,     KC_E,     KC_R,     KC_T,       KC_UP,
+        GUI_T(KC_QUOT),  KC_A,  KC_S,     KC_D,     KC_F,     KC_G,
+        SFT_T(KC_UNDS),  KC_Z,  KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
+        KC_LALT,         KC_1,  KC_1,     KC_1,     KC_LEFT,
+                                                    KC_1,     KC_1,
+                                                    KC_1,
+                                                    KC_FN1,   KC_1,       RESET,
+        // right hand
+        KC_END,          KC_1,  KC_1,     KC_1,     KC_1,     KC_1,       KC_GRV,
+        KC_PGUP,         KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSLS),
+                         KC_H,  KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_RSFT,
+                                KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
+        KC_1,            KC_1,
+        KC_1,
+        RESET,           KC_1,  KC_FN1
+    ),
+/* 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  |   \  |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// SYMBOLS
+[SYMB] = KEYMAP(
+       // left hand
+       M(0),   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,
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       KC_TRNS,KC_TRNS,
+                                               KC_TRNS,
+                               KC_TRNS,KC_TRNS,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,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |Brwser|
+ *                                 |      |      |------|       |------|      |Back  |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// MEDIA AND MOUSE
+[MDIA] = KEYMAP(
+       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
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+        if (record->event.pressed) {
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+        }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+    uint8_t layer = biton32(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;
+    }
+
+};

From 916d12f9fab526d55bb864479520901635756f80 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Fri, 12 Aug 2016 14:37:13 -0500
Subject: [PATCH 02/12] completes first-pass at symbol layer

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index f222ad839c..34fae9ac3a 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                        |   x  |   x  |       |  x   |   x    |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      |   x  |       |  x   |        |      |
- *                                 | ~L1  |   x  |------|       |------|   x    | ~L1  |
+ *                                 |Sp/~L1|  L2  |------|       |------|   L2   |Sp/~L1|
  *                                 |      |      |Teensy|       |Teensy|        |      |
  *                                 `--------------------'       `----------------------'
  */
@@ -33,36 +33,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Otherwise, it needs KC_*
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,  KC_1,     KC_1,     KC_1,     KC_1,       KC_HOME,
-        CTL_T(KC_TAB),   KC_Q,  KC_W,     KC_E,     KC_R,     KC_T,       KC_UP,
-        GUI_T(KC_QUOT),  KC_A,  KC_S,     KC_D,     KC_F,     KC_G,
-        SFT_T(KC_UNDS),  KC_Z,  KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
-        KC_LALT,         KC_1,  KC_1,     KC_1,     KC_LEFT,
-                                                    KC_1,     KC_1,
-                                                    KC_1,
-                                                    KC_FN1,   KC_1,       RESET,
+        KC_ESC,          KC_1,    KC_1,     KC_1,     KC_1,     KC_1,       KC_HOME,
+        CTL_T(KC_TAB),   KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,       KC_UP,
+        GUI_T(KC_QUOT),  KC_A,    KC_S,     KC_D,     KC_F,     KC_G,
+        SFT_T(KC_UNDS),  KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
+        KC_LALT,         KC_1,    KC_1,     KC_1,     KC_LEFT,
+                                                      KC_1,     KC_1,
+                                                      KC_1,
+                                                      LT(SYMB, KC_SPC),   TG(MDIA),     RESET,
         // right hand
-        KC_END,          KC_1,  KC_1,     KC_1,     KC_1,     KC_1,       KC_GRV,
-        KC_PGUP,         KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSLS),
-                         KC_H,  KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_RSFT,
-                                KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
+        KC_END,          KC_1,    KC_1,     KC_1,     KC_1,     KC_1,       KC_GRV,
+        KC_PGUP,         KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
+                         KC_H,    KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_RSFT,
+                                  KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
         KC_1,            KC_1,
         KC_1,
-        RESET,           KC_1,  KC_FN1
+        RESET,           TG(MDIA),  LT(SYMB, KC_SPC)
     ),
 /* Keymap 1: Symbol Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |        |   !  |   ^  |   {  |   (  |   [  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |        |   &  |   $  |   }  |   )  |   ]  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
+ * |        |   \  |   #  |   @  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |      |      |      |      |      |                                       |      |      |   .  |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
@@ -75,28 +75,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // SYMBOLS
 [SYMB] = KEYMAP(
        // left hand
-       M(0),   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,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
+       KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_TRNS,
+       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LCBR,  KC_LPRN,  KC_LBRC,  KC_TRNS,
+       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RCBR,  KC_RPRN,  KC_RBRC,
+       KC_TRNS,  KC_BSLS,  KC_HASH,  KC_AT,    KC_PERC,  KC_PIPE,  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,
        // 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,
-       KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_TRNS,
+       KC_TRNS,  KC_EQL,   KC_7,     KC_8,     KC_9,     KC_0,     KC_TRNS,
+                 KC_PLUS,  KC_4,     KC_5,     KC_6,     KC_ASTR,  KC_TRNS,
+       KC_TRNS,  KC_MINS,  KC_1,     KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
+                           KC_TRNS,  KC_TRNS,  KC_DOT,   KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,
        KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
+       KC_TRNS,  KC_TRNS,  KC_TRNS
 ),
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       M(0),    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,

From 558bf2ed07ff04455b509c81a4f3312f5dbd308c Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Fri, 12 Aug 2016 19:27:44 -0500
Subject: [PATCH 03/12] completes first-pass at media layer

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 34fae9ac3a..7c232246da 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -11,13 +11,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   x  |   x  |   x  |   x  |   x  | Home |           | End  |   x  |   x  |   x  |   x  |   x  |   `~   |
+ * | Esc    |   x  |   x  |   x  |   _  |   x  | Home |           | End  |   x  |  Esc |   x  |   x  |   x  |   `~   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |Bks/Ctrl|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * |_/LShift|   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | RShift |
+ * |[/LShift|   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |]/RShift|
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
@@ -33,19 +33,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Otherwise, it needs KC_*
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,    KC_1,     KC_1,     KC_1,     KC_1,       KC_HOME,
+        KC_ESC,          KC_1,    KC_1,     KC_1,     KC_UNDS,  KC_1,       KC_HOME,
         CTL_T(KC_TAB),   KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,       KC_UP,
         GUI_T(KC_QUOT),  KC_A,    KC_S,     KC_D,     KC_F,     KC_G,
-        SFT_T(KC_UNDS),  KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
+        SFT_T(KC_LBRC),  KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
         KC_LALT,         KC_1,    KC_1,     KC_1,     KC_LEFT,
                                                       KC_1,     KC_1,
                                                       KC_1,
                                                       LT(SYMB, KC_SPC),   TG(MDIA),     RESET,
         // right hand
-        KC_END,          KC_1,    KC_1,     KC_1,     KC_1,     KC_1,       KC_GRV,
+        KC_END,          KC_1,    KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
         KC_PGUP,         KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
                          KC_H,    KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    KC_RSFT,
+        KC_PGDN,         KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    SFT_T(KC_RBRC),
                                   KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
         KC_1,            KC_1,
         KC_1,
@@ -98,13 +98,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+ * |        |      |      | MsUp |      |      |      |           |      | Play | Prev | Next |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Lclk | Rclk |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * |        |      |      |      |      |      |      |           |      | Mute |VolDn |VolUp |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   |      |      |      |      |      |                                       |      |      |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
@@ -120,16 +120,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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, 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_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_MUTE, KC_VOLD, KC_VOLU, 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

From 8019a074cfe39e2bf04c35bb5fb40c9ff9cda9a4 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Sun, 14 Aug 2016 20:43:05 -0500
Subject: [PATCH 04/12] minor tweaks to numpad and media layer

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 7c232246da..d57f665317 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -22,34 +22,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |   x  |   x  |       |  x   |   x    |
+ *                                        |CapLok|   x  |       |  x   |  Del   |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      |   x  |       |  x   |        |      |
  *                                 |Sp/~L1|  L2  |------|       |------|   L2   |Sp/~L1|
  *                                 |      |      |Teensy|       |Teensy|        |      |
  *                                 `--------------------'       `----------------------'
  */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,    KC_1,     KC_1,     KC_UNDS,  KC_1,       KC_HOME,
-        CTL_T(KC_TAB),   KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,       KC_UP,
-        GUI_T(KC_QUOT),  KC_A,    KC_S,     KC_D,     KC_F,     KC_G,
-        SFT_T(KC_LBRC),  KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,       KC_DOWN,
-        KC_LALT,         KC_1,    KC_1,     KC_1,     KC_LEFT,
-                                                      KC_1,     KC_1,
-                                                      KC_1,
-                                                      LT(SYMB, KC_SPC),   TG(MDIA),     RESET,
+        KC_ESC,          KC_1,  KC_1,     KC_1,     KC_UNDS,  KC_1,           KC_HOME,
+        CTL_T(KC_TAB),   KC_Q,  KC_W,     KC_E,     KC_R,     KC_T,           KC_UP,
+        GUI_T(KC_QUOT),  KC_A,  KC_S,     KC_D,     KC_F,     KC_G,
+        SFT_T(KC_LBRC),  KC_Z,  KC_X,     KC_C,     KC_V,     KC_B,           KC_DOWN,
+        KC_LALT,         KC_1,  KC_1,     KC_1,     KC_LEFT,
+                                                    KC_CAPS,  KC_1,
+                                                    KC_1,
+                                                    LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
-        KC_END,          KC_1,    KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
-        KC_PGUP,         KC_Y,    KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
-                         KC_H,    KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    SFT_T(KC_RBRC),
-                                  KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
-        KC_1,            KC_1,
+        KC_END,          KC_1,  KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
+        KC_PGUP,         KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
+                         KC_H,  KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    SFT_T(KC_RBRC),
+                                KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
+        KC_1,            KC_DEL,
         KC_1,
-        RESET,           TG(MDIA),  LT(SYMB, KC_SPC)
+        RESET,           TG(MDIA),    LT(SYMB, KC_SPC)
     ),
 /* Keymap 1: Symbol Layer
  *
@@ -62,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |        |   \  |   #  |   @  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |   .  |      |      |
+ *   |      |      |      |      |      |                                       |   0  |   0  |   .  |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
@@ -88,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,  KC_EQL,   KC_7,     KC_8,     KC_9,     KC_0,     KC_TRNS,
                  KC_PLUS,  KC_4,     KC_5,     KC_6,     KC_ASTR,  KC_TRNS,
        KC_TRNS,  KC_MINS,  KC_1,     KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
-                           KC_TRNS,  KC_TRNS,  KC_DOT,   KC_TRNS,  KC_TRNS,
+                           KC_0,     KC_0,     KC_DOT,   KC_TRNS,  KC_TRNS,
        KC_TRNS,  KC_TRNS,
        KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_TRNS
@@ -98,11 +96,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      | Play | Prev | Next |      |      |        |
+ * |        |      |  xx  | MsUp |  xx  |      |      |           |      | Play | Prev | Next |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      | Lclk | Rclk |      |      |        |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|  xx  | Lclk | Rclk |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      | Mute |VolDn |VolUp |      |      |        |
+ * |        |      |  xx  |  xx  |  xx  |      |      |           |      | Mute |VolDn |VolUp |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                                       |      |      |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -117,9 +115,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
        M(0),    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_NO,   KC_MS_U, KC_NO,   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_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                                            KC_TRNS, KC_TRNS,
                                                     KC_TRNS,
@@ -127,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // right hand
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_NO,   KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS,  KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS,
                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,

From 0c598f53c18419a10b143098b57a431c5545f906 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Thu, 1 Sep 2016 23:37:52 -0600
Subject: [PATCH 05/12] adds Hyper key. improves media layer. first attempt at
 tap dance.

---
 keyboards/ergodox/Makefile                    |  3 +-
 .../ergodox/keymaps/common-nighthawk/keymap.c | 75 ++++++++++---------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
index 7165350050..0dc0a77252 100644
--- a/keyboards/ergodox/Makefile
+++ b/keyboards/ergodox/Makefile
@@ -1,5 +1,6 @@
 SUBPROJECT_DEFAULT = ez
+TAP_DANCE_ENABLE = yes
 
 ifndef MAKEFILE_INCLUDED
 	include ../../Makefile
-endif
\ No newline at end of file
+endif
diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index d57f665317..919b7946cd 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -11,43 +11,48 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   x  |   x  |   x  |   _  |   x  | Home |           | End  |   x  |  Esc |   x  |   x  |   x  |   `~   |
+ * | Esc    |   x  |   x  |   x  |   _  | Hypr | Home |           | End  | Hypr |  Esc |   x  |   x  |   x  |   `~   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |Bks/Ctrl|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * |[/LShift|   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |]/RShift|
+ * | Sft//[ |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |]/RShift|
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |CapLok|   x  |       |  x   |  Del   |
+ *                                        | Mute | VolUp|       | Play |  Del   |
  *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      |   x  |       |  x   |        |      |
+ *                                 |      |      | VolDn|       | Next |        |      |
  *                                 |Sp/~L1|  L2  |------|       |------|   L2   |Sp/~L1|
- *                                 |      |      |Teensy|       |Teensy|        |      |
+ *                                 |      |      |Teensy|       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
+  /* TO DO: turn on third light when shifted */
+  /*        consider turning caplock back on.  but maybe not. */
+  /*        get less key presses for ShiftIt going with MEH or CAG */
+  /*        make all letter keys KC_NO for the media layer */
+            /* add the mouse wheel up and down */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,  KC_1,     KC_1,     KC_UNDS,  KC_1,           KC_HOME,
-        CTL_T(KC_TAB),   KC_Q,  KC_W,     KC_E,     KC_R,     KC_T,           KC_UP,
-        GUI_T(KC_QUOT),  KC_A,  KC_S,     KC_D,     KC_F,     KC_G,
-        SFT_T(KC_LBRC),  KC_Z,  KC_X,     KC_C,     KC_V,     KC_B,           KC_DOWN,
-        KC_LALT,         KC_1,  KC_1,     KC_1,     KC_LEFT,
-                                                    KC_CAPS,  KC_1,
-                                                    KC_1,
-                                                    LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
+        KC_ESC,          KC_1,          KC_1,     KC_1,     KC_UNDS,  ALL_T(KC_NO),   KC_HOME,
+        CTL_T(KC_TAB),   KC_Q,          KC_W,     KC_E,     KC_R,     KC_T,           KC_UP,
+        GUI_T(KC_QUOT),  KC_A,          KC_S,     KC_D,     KC_F,     KC_G,
+        ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_LBRC),  KC_Z,          KC_X,     KC_C,     KC_V,     KC_B,           KC_DOWN,
+        KC_LALT,         KC_1,          KC_1,     KC_1,     KC_LEFT,
+                                                            KC_MUTE,  KC_VOLU,
+                                                            KC_VOLD,
+                                                            LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
-        KC_END,          KC_1,  KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
-        KC_PGUP,         KC_Y,  KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
-                         KC_H,  KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,  KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    SFT_T(KC_RBRC),
-                                KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
-        KC_1,            KC_DEL,
-        KC_1,
-        RESET,           TG(MDIA),    LT(SYMB, KC_SPC)
+        KC_END,          ALL_T(KC_NO),  KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
+        KC_PGUP,         KC_Y,          KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
+                         KC_H,          KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,          KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_RBRC),
+                                        KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
+        KC_MPLY,         KC_DEL,
+        KC_MNXT,
+        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_SPC)
     ),
 /* Keymap 1: Symbol Layer
  *
@@ -96,11 +101,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |Version |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |  xx  | MsUp |  xx  |      |      |           |      | Play | Prev | Next |      |      |        |
+ * |        |      |      |      |      |      |      |           |      |      | WhDn | WhUp |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|  xx  | Lclk | Rclk |      |      |        |
+ * |        |      |      | R-Ck | L-Ck |      |------|           |------| MsLt | MsDn | MsUp | MsRt |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |  xx  |  xx  |  xx  |      |      |           |      | Mute |VolDn |VolUp |      |      |        |
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                                       |      |      |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -115,19 +120,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
        M(0),    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_NO,   KC_MS_U, KC_NO,   KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_NO,   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_BTN2, KC_BTN1, 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,
     // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_NO,   KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_MUTE, KC_VOLD, KC_VOLU, 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_WH_U,     KC_WH_D,     KC_TRNS,     KC_TRNS, KC_TRNS,
+                 KC_MS_LEFT,  KC_MS_DOWN,  KC_MS_UP,    KC_MS_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_WBAK
@@ -168,7 +173,7 @@ void matrix_scan_user(void) {
     switch (layer) {
       // TODO: Make this relevant to the ErgoDox EZ.
         case 1:
-            ergodox_right_led_1_on();
+            ergodox_right_led_3_on();
             break;
         case 2:
             ergodox_right_led_2_on();
@@ -177,5 +182,7 @@ void matrix_scan_user(void) {
             // none
             break;
     }
-
+    if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
+        ergodox_right_led_1_on ();
+    }
 };

From 250f096144529d6dbea4ae138da108440481ff22 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Fri, 2 Sep 2016 14:35:15 -0600
Subject: [PATCH 06/12] adds tap dance and macro to move underscore and l- and
 r- brackets to base layer.

---
 .../ergodox/keymaps/common-nighthawk/Makefile |  6 ++
 .../ergodox/keymaps/common-nighthawk/keymap.c | 76 +++++++++++++------
 2 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 keyboards/ergodox/keymaps/common-nighthawk/Makefile

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/Makefile b/keyboards/ergodox/keymaps/common-nighthawk/Makefile
new file mode 100644
index 0000000000..fafa40c43d
--- /dev/null
+++ b/keyboards/ergodox/keymaps/common-nighthawk/Makefile
@@ -0,0 +1,6 @@
+SUBPROJECT_DEFAULT = ez
+TAP_DANCE_ENABLE = yes
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 919b7946cd..9744313700 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -7,17 +7,34 @@
 #define SYMB 1 // symbols
 #define MDIA 2 // media keys
 
+//Tap Dance Declarations
+enum {
+  TD_J_LBRC = 0,
+  TD_K_RBRC,
+  TD_Y_ESC,
+};
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_J_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_LBRC),
+  [TD_K_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_K, KC_RBRC),
+  [TD_Y_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Y, KC_ESC)
+};
+
+//Macro Declarations
+static uint16_t sunds_timer;
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * | Esc    |   x  |   x  |   x  |   _  | Hypr | Home |           | End  | Hypr |  Esc |   x  |   x  |   x  |   `~   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |Bks/Ctrl|
+ * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc|   U  |   I  |   O  |   P  |Bks/Ctrl|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
+ * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  | J 2[ | K 2] |   L  |  ;:  |Entr/Cmd|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * | Sft//[ |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |]/RShift|
+ * | _/Shft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | _/Shft |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
@@ -29,27 +46,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |Teensy|       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
-  /* TO DO: turn on third light when shifted */
-  /*        consider turning caplock back on.  but maybe not. */
-  /*        get less key presses for ShiftIt going with MEH or CAG */
-  /*        make all letter keys KC_NO for the media layer */
-            /* add the mouse wheel up and down */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,          KC_1,     KC_1,     KC_UNDS,  ALL_T(KC_NO),   KC_HOME,
-        CTL_T(KC_TAB),   KC_Q,          KC_W,     KC_E,     KC_R,     KC_T,           KC_UP,
-        GUI_T(KC_QUOT),  KC_A,          KC_S,     KC_D,     KC_F,     KC_G,
-        ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_LBRC),  KC_Z,          KC_X,     KC_C,     KC_V,     KC_B,           KC_DOWN,
-        KC_LALT,         KC_1,          KC_1,     KC_1,     KC_LEFT,
-                                                            KC_MUTE,  KC_VOLU,
-                                                            KC_VOLD,
-                                                            LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
+        KC_ESC,          KC_1,          KC_1,          KC_1,            KC_UNDS,  ALL_T(KC_NO),      KC_HOME,
+        CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
+        GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
+        M(1),            KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
+        KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
+                                                                        KC_MUTE,  KC_VOLU,
+                                                                        KC_VOLD,
+                                                                        LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
-        KC_END,          ALL_T(KC_NO),  KC_ESC,   KC_1,     KC_1,     KC_1,       KC_GRV,
-        KC_PGUP,         KC_Y,          KC_U,     KC_I,     KC_O,     KC_P,       CTL_T(KC_BSPC),
-                         KC_H,          KC_J,     KC_K,     KC_L,     KC_SCOLON,  GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,          KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,    ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_RBRC),
-                                        KC_RGHT,  KC_1,     KC_1,     KC_1,       KC_RALT,
+        KC_END,          ALL_T(KC_NO),  KC_ESC,         KC_1,           KC_1,     KC_1,              KC_GRV,
+        KC_PGUP,         TD(TD_Y_ESC),  KC_U,           KC_I,           KC_O,     KC_P,              CTL_T(KC_BSPC),
+                         KC_H,          TD(TD_J_LBRC),  TD(TD_K_RBRC),  KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           M(1),
+                                        KC_RGHT,        KC_1,           KC_1,     KC_1,              KC_RALT,
         KC_MPLY,         KC_DEL,
         KC_MNXT,
         KC_MPRV,         TG(MDIA),      LT(SYMB, KC_SPC)
@@ -148,10 +160,24 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
   // MACRODOWN only works in this function
       switch(id) {
         case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
+          if (record->event.pressed) {
+            SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+          }
+          break;
+
+        case 1:
+          if (record->event.pressed) {
+            sunds_timer = timer_read();
+            register_code (KC_LSFT);
+          } else {
+            if (timer_elapsed (sunds_timer) < TAPPING_TERM) {
+              register_code (KC_MINS);
+              unregister_code (KC_MINS);
+            }
+            unregister_code (KC_LSFT);
+          }
+          break;
+
       }
     return MACRO_NONE;
 };

From b807867f955f95f832901b9d0cc0eed97ab8cea0 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Tue, 6 Sep 2016 21:56:27 -0600
Subject: [PATCH 07/12] moves brackets from J/K to U/I to remove block of
 common vim sequence.

---
 .../ergodox/keymaps/common-nighthawk/keymap.c    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 9744313700..ab0dcfece2 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -9,15 +9,15 @@
 
 //Tap Dance Declarations
 enum {
-  TD_J_LBRC = 0,
-  TD_K_RBRC,
+  TD_U_LBRC = 0,
+  TD_I_RBRC,
   TD_Y_ESC,
 };
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_J_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_LBRC),
-  [TD_K_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_K, KC_RBRC),
+  [TD_U_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_LBRC),
+  [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC),
   [TD_Y_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Y, KC_ESC)
 };
 
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * | Esc    |   x  |   x  |   x  |   _  | Hypr | Home |           | End  | Hypr |  Esc |   x  |   x  |   x  |   `~   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc|   U  |   I  |   O  |   P  |Bks/Ctrl|
+ * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc| U 2[ | I 2] |   O  |   P  |Bks/Ctrl|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  | J 2[ | K 2] |   L  |  ;:  |Entr/Cmd|
+ * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
  * | _/Shft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | _/Shft |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
@@ -58,8 +58,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                         LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
         KC_END,          ALL_T(KC_NO),  KC_ESC,         KC_1,           KC_1,     KC_1,              KC_GRV,
-        KC_PGUP,         TD(TD_Y_ESC),  KC_U,           KC_I,           KC_O,     KC_P,              CTL_T(KC_BSPC),
-                         KC_H,          TD(TD_J_LBRC),  TD(TD_K_RBRC),  KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
+        KC_PGUP,         TD(TD_Y_ESC),  TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              CTL_T(KC_BSPC),
+                         KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
         KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           M(1),
                                         KC_RGHT,        KC_1,           KC_1,     KC_1,              KC_RALT,
         KC_MPLY,         KC_DEL,

From abee80929880f0813149eb458f968666a18dd6cc Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Fri, 18 Nov 2016 11:11:08 -0600
Subject: [PATCH 08/12] moves brackets to top row.

---
 .../ergodox/keymaps/common-nighthawk/keymap.c  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index ab0dcfece2..14ed257ee0 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   x  |   x  |   x  |   _  | Hypr | Home |           | End  | Hypr |  Esc |   x  |   x  |   x  |   `~   |
+ * | Esc    |   x  |   x  |   x  |  Esc | Hypr | Home |           | End  |  Esc |   [  |   ]  |   x  |  `~  |   `~   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc| U 2[ | I 2] |   O  |   P  |Bks/Ctrl|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,          KC_1,          KC_1,            KC_UNDS,  ALL_T(KC_NO),      KC_HOME,
+        KC_ESC,          KC_1,          KC_1,          KC_1,            KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
         GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
         M(1),            KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                                         KC_VOLD,
                                                                         LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
-        KC_END,          ALL_T(KC_NO),  KC_ESC,         KC_1,           KC_1,     KC_1,              KC_GRV,
+        KC_END,          KC_ESC,        KC_LBRC,        KC_RBRC,        KC_1,     KC_GRV,            KC_GRV,
         KC_PGUP,         TD(TD_Y_ESC),  TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              CTL_T(KC_BSPC),
                          KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
         KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           M(1),
@@ -71,11 +71,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   ^  |   {  |   (  |   [  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
+ * |        |   !  |   ^  |   [  |   (  |   {  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   &  |   $  |   }  |   )  |   ]  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
+ * |        |   &  |   $  |   ]  |   )  |   }  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   \  |   #  |   @  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
+ * |        |   \  |   @  |   #  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                                       |   0  |   0  |   .  |      |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -91,9 +91,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = KEYMAP(
        // left hand
        KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_TRNS,
-       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LCBR,  KC_LPRN,  KC_LBRC,  KC_TRNS,
-       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RCBR,  KC_RPRN,  KC_RBRC,
-       KC_TRNS,  KC_BSLS,  KC_HASH,  KC_AT,    KC_PERC,  KC_PIPE,  KC_TRNS,
+       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LBRC,  KC_LPRN,  KC_LCBR,  KC_TRNS,
+       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RBRC,  KC_RPRN,  KC_RCBR,
+       KC_TRNS,  KC_BSLS,  KC_AT,    KC_HASH,  KC_PERC,  KC_PIPE,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
                                                KC_TRNS,  KC_TRNS,
                                                KC_TRNS,

From a94eb16bd7d06bcb55136fa67c2b3ec99f146c72 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Sun, 27 Nov 2016 16:12:32 -0600
Subject: [PATCH 09/12] removes the double actions from the metakeys.

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 14ed257ee0..be12debba3 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -11,14 +11,12 @@
 enum {
   TD_U_LBRC = 0,
   TD_I_RBRC,
-  TD_Y_ESC,
 };
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_U_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_LBRC),
-  [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC),
-  [TD_Y_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Y, KC_ESC)
+  [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC)
 };
 
 //Macro Declarations
@@ -28,43 +26,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   x  |   x  |   x  |  Esc | Hypr | Home |           | End  |  Esc |   [  |   ]  |   x  |  `~  |   `~   |
+ * |  _     |   x  |   x  |   _  |  Esc | Hypr | Home |           | End  | Hypr |   [  |   ]  |   x  |  `~  |  Bks   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc| U 2[ | I 2] |   O  |   P  |Bks/Ctrl|
+ * |Ctrl/Tab|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  | U 2[ | I 2] |   O  |   P  |  Ctrl  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
+ * |  Cmd   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * | _/Shft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | _/Shft |
+ * |  Shft  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |  Shft  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
+ *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |  Bks |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        | Mute | VolUp|       | Play |  Del   |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      | VolDn|       | Next |        |      |
- *                                 |Sp/~L1|  L2  |------|       |------|   L2   |Sp/~L1|
+ *                                 |Sp/~L1|  L2  |------|       |------|   L2   |'"/~L1|
  *                                 |      |      |Teensy|       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,          KC_1,          KC_1,            KC_ESC,   ALL_T(KC_NO),      KC_HOME,
+        KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
-        GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
-        M(1),            KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
+        KC_LGUI,         KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
+        KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
         KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
                                                                         KC_MUTE,  KC_VOLU,
                                                                         KC_VOLD,
                                                                         LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
         // right hand
-        KC_END,          KC_ESC,        KC_LBRC,        KC_RBRC,        KC_1,     KC_GRV,            KC_GRV,
-        KC_PGUP,         TD(TD_Y_ESC),  TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              CTL_T(KC_BSPC),
+        KC_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_1,     KC_GRV,            KC_BSPC,
+        KC_PGUP,         KC_Y,          TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              KC_LCTRL,
                          KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           M(1),
-                                        KC_RGHT,        KC_1,           KC_1,     KC_1,              KC_RALT,
+        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           KC_RSFT,
+                                        KC_RGHT,        KC_BSPC,        KC_1,     KC_1,              KC_RALT,
         KC_MPLY,         KC_DEL,
         KC_MNXT,
-        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_SPC)
+        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_QUOT)
     ),
 /* Keymap 1: Symbol Layer
  *

From 1f52dbcac01c37157c29038334e1f7b5be9bd4aa Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Tue, 6 Dec 2016 14:15:23 -0600
Subject: [PATCH 10/12] removes double-tab brackets and adds back quot to left
 cmd.

---
 .../ergodox/keymaps/common-nighthawk/keymap.c | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index be12debba3..5a1e46b7b0 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -26,37 +26,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  _     |   x  |   x  |   _  |  Esc | Hypr | Home |           | End  | Hypr |   [  |   ]  |   x  |  `~  |  Bks   |
+ * |  _     |   x  |   x  |   _  |  Esc | Hypr | Home |           | End  | Hypr |   [  |   ]  |  `~  |  `~  |  Bks   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Ctrl/Tab|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  | U 2[ | I 2] |   O  |   P  |  Ctrl  |
+ * |Ctrl/Tab|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |  Ctrl  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Cmd   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Entr/Cmd|
+ * | Cmd/"' |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Cmd/Entr|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
  * |  Shft  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |  Shft  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |  Bks |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        | Mute | VolUp|       | Play |  Del   |
+ *                                        |Teensy| VolUp|       | Play |  Del   |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      | VolDn|       | Next |        |      |
  *                                 |Sp/~L1|  L2  |------|       |------|   L2   |'"/~L1|
- *                                 |      |      |Teensy|       | Prev |        |      |
+ *                                 |      |      | Mute |       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
         KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
-        KC_LGUI,         KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
+        GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
         KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
         KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
-                                                                        KC_MUTE,  KC_VOLU,
+                                                                        RESET,    KC_VOLU,
                                                                         KC_VOLD,
-                                                                        LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
+                                                                        LT(SYMB, KC_SPC),  TG(MDIA), KC_MUTE,
         // right hand
-        KC_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_1,     KC_GRV,            KC_BSPC,
-        KC_PGUP,         KC_Y,          TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              KC_LCTRL,
+        KC_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_GRV,   KC_GRV,            KC_BSPC,
+        KC_PGUP,         KC_Y,          KC_U,           KC_I,           KC_O,     KC_P,              KC_LCTRL,
                          KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
         KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           KC_RSFT,
                                         KC_RGHT,        KC_BSPC,        KC_1,     KC_1,              KC_RALT,

From acffbb480f616f87889698230c35284cc54c45dd Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Sun, 1 Jan 2017 20:09:30 -0700
Subject: [PATCH 11/12] adds dedicated double-quote key.

---
 .../ergodox/keymaps/common-nighthawk/keymap.c      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index 5a1e46b7b0..debf384f3d 100644
--- a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
+++ b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // left hand
         KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
-        GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
+        M(1),            KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
         KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
         KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
                                                                         RESET,    KC_VOLU,
@@ -166,13 +166,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case 1:
           if (record->event.pressed) {
             sunds_timer = timer_read();
-            register_code (KC_LSFT);
+            register_code (KC_LGUI);
           } else {
             if (timer_elapsed (sunds_timer) < TAPPING_TERM) {
-              register_code (KC_MINS);
-              unregister_code (KC_MINS);
+              unregister_code (KC_LGUI);
+              register_code (KC_LSFT);
+              register_code (KC_QUOT);
+              unregister_code (KC_QUOT);
+              unregister_code (KC_LSFT);
+              register_code (KC_LGUI);
             }
-            unregister_code (KC_LSFT);
+            unregister_code (KC_LGUI);
           }
           break;
 

From 0de3a5d0b251132be367474a8439cfb986019a58 Mon Sep 17 00:00:00 2001
From: Daniel <danielallendeutsch@gmail.com>
Date: Sun, 1 Jan 2017 20:55:10 -0700
Subject: [PATCH 12/12] reverts change outside of personal keymap.

---
 keyboards/ergodox/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
index 0dc0a77252..7165350050 100644
--- a/keyboards/ergodox/Makefile
+++ b/keyboards/ergodox/Makefile
@@ -1,6 +1,5 @@
 SUBPROJECT_DEFAULT = ez
-TAP_DANCE_ENABLE = yes
 
 ifndef MAKEFILE_INCLUDED
 	include ../../Makefile
-endif
+endif
\ No newline at end of file