summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorDaniel <danielallendeutsch@gmail.com>2016-11-27 16:12:32 -0600
committerDaniel <danielallendeutsch@gmail.com>2016-11-27 16:12:32 -0600
commita94eb16bd7d06bcb55136fa67c2b3ec99f146c72 (patch)
treeadf7272de3bcd3d367c8aae7e39d2ec897b49fb0 /keyboards
parentabee80929880f0813149eb458f968666a18dd6cc (diff)
removes the double actions from the metakeys.
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox/keymaps/common-nighthawk/keymap.c32
1 files 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
*