1 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c
index be12debba..5a1e46b7b 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_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_GRV,   KC_GRV,            KC_BSPC,
-        KC_PGUP,         KC_Y,          TD(TD_U_LBRC),  TD(TD_I_RBRC),  KC_O,     KC_P,              KC_LCTRL,
+        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,

diff --git a/keyboards/ergodox/keymaps/common-nighthawk/keymap.c b/keyboards/ergodox/keymaps/common-nighthawk/keymap.c index be12debba..5a1e46b7b 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] = {
26	/* Keymap 0: Basic layer	26	/* Keymap 0: Basic layer
27	*	27	*
28	* ,--------------------------------------------------. ,--------------------------------------------------.	28	* ,--------------------------------------------------. ,--------------------------------------------------.
29	* \| _ \| x \| x \| _ \| Esc \| Hypr \| Home \| \| End \| Hypr \| [ \| ] \| x \| `~ \| Bks \|	29	* \| _ \| x \| x \| _ \| Esc \| Hypr \| Home \| \| End \| Hypr \| [ \| ] \| `~ \| `~ \| Bks \|
30	* \|--------+------+------+------+------+-------------\| \|------+------+------+------+------+------+--------\|	30	* \|--------+------+------+------+------+-------------\| \|------+------+------+------+------+------+--------\|
31	* \|Ctrl/Tab\| Q \| W \| E \| R \| T \| Up \| \| PgUp \| Y \| U 2[ \| I 2] \| O \| P \| Ctrl \|	31	* \|Ctrl/Tab\| Q \| W \| E \| R \| T \| Up \| \| PgUp \| Y \| U \| I \| O \| P \| Ctrl \|
32	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|	32	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|
33	* \| Cmd \| A \| S \| D \| F \| G \|------\| \|------\| H \| J \| K \| L \| ;: \|Entr/Cmd\|	33	* \| Cmd/"' \| A \| S \| D \| F \| G \|------\| \|------\| H \| J \| K \| L \| ;: \|Cmd/Entr\|
34	* \|--------+------+------+------+------+------\| Down \| \| PgDn \|------+------+------+------+------+--------\|	34	* \|--------+------+------+------+------+------\| Down \| \| PgDn \|------+------+------+------+------+--------\|
35	* \| Shft \| Z \| X \| C \| V \| B \| \| \| \| N \| M \| ,< \| .> \| /? \| Shft \|	35	* \| Shft \| Z \| X \| C \| V \| B \| \| \| \| N \| M \| ,< \| .> \| /? \| Shft \|
36	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'	36	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
37	* \| Alt \| x \| x \| x \| Left \| \|Right \| Bks \| x \| x \| Alt \|	37	* \| Alt \| x \| x \| x \| Left \| \|Right \| Bks \| x \| x \| Alt \|
38	* `----------------------------------' `----------------------------------'	38	* `----------------------------------' `----------------------------------'
39	* ,-------------. ,-------------.	39	* ,-------------. ,-------------.
40	* \| Mute \| VolUp\| \| Play \| Del \|	40	* \|Teensy\| VolUp\| \| Play \| Del \|
41	* ,------\|------\|------\| \|------+--------+------.	41	* ,------\|------\|------\| \|------+--------+------.
42	* \| \| \| VolDn\| \| Next \| \| \|	42	* \| \| \| VolDn\| \| Next \| \| \|
43	* \|Sp/~L1\| L2 \|------\| \|------\| L2 \|'"/~L1\|	43	* \|Sp/~L1\| L2 \|------\| \|------\| L2 \|'"/~L1\|
44	* \| \| \|Teensy\| \| Prev \| \| \|	44	* \| \| \| Mute \| \| Prev \| \| \|
45	* `--------------------' `----------------------'	45	* `--------------------' `----------------------'
46	*/	46	*/
47	[BASE] = KEYMAP( // layer 0 : default	47	[BASE] = KEYMAP( // layer 0 : default
48	// left hand	48	// left hand
49	KC_UNDS, KC_1, KC_1, KC_UNDS, KC_ESC, ALL_T(KC_NO), KC_HOME,	49	KC_UNDS, KC_1, KC_1, KC_UNDS, KC_ESC, ALL_T(KC_NO), KC_HOME,
50	CTL_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_UP,	50	CTL_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_UP,
51	KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G,	51	GUI_T(KC_QUOT), KC_A, KC_S, KC_D, KC_F, KC_G,
52	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN,	52	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN,
53	KC_LALT, KC_1, KC_1, KC_1, KC_LEFT,	53	KC_LALT, KC_1, KC_1, KC_1, KC_LEFT,
54	KC_MUTE, KC_VOLU,	54	RESET, KC_VOLU,
55	KC_VOLD,	55	KC_VOLD,
56	LT(SYMB, KC_SPC), TG(MDIA), RESET,	56	LT(SYMB, KC_SPC), TG(MDIA), KC_MUTE,
57	// right hand	57	// right hand
58	KC_END, ALL_T(KC_NO), KC_LBRC, KC_RBRC, KC_1, KC_GRV, KC_BSPC,	58	KC_END, ALL_T(KC_NO), KC_LBRC, KC_RBRC, KC_GRV, KC_GRV, KC_BSPC,
59	KC_PGUP, KC_Y, TD(TD_U_LBRC), TD(TD_I_RBRC), KC_O, KC_P, KC_LCTRL,	59	KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCTRL,
60	KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_ENT),	60	KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_ENT),
61	KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,	61	KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
62	KC_RGHT, KC_BSPC, KC_1, KC_1, KC_RALT,	62	KC_RGHT, KC_BSPC, KC_1, KC_1, KC_RALT,