diff --git a/common/config.h b/common/config.h index 0b0f292..1552495 100644 --- a/common/config.h +++ b/common/config.h @@ -24,14 +24,14 @@ // many settings taken from https://github.com/filterpaper/qmk_userspace // Tap-hold settings -#define TAPPING_TERM 230 +#define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY #define PERMISSIVE_HOLD_PER_KEY #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Input intervals -#define QUICK_TAP_TERM TAPPING_TERM - 100 -#define SHIFT_TAP_TERM TAPPING_TERM - 80 +#define QUICK_TAP_TERM TAPPING_TERM - 70 +#define SHIFT_TAP_TERM TAPPING_TERM - 50 #define COMBO_IDLE_MS TAPPING_TERM + 100 #define INPUT_IDLE_MS QUICK_TAP_TERM diff --git a/common/keymap.h b/common/keymap.h index fda49ff..8a882cd 100644 --- a/common/keymap.h +++ b/common/keymap.h @@ -16,38 +16,38 @@ enum my_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( - KC_B, KC_F, KC_L, KC_K, KC_Q, KC_P, KC_G, KC_O, KC_U, KC_DOT, - RALT_T(KC_N), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_M, KC_Y, RSFT_T(KC_C), RCTL_T(KC_A), LALT_T(KC_E), RALT_T(KC_I), - KC_X, KC_V, KC_J, LGUI_T(KC_D), KC_Z, KC_QUOT, RGUI_T(KC_W), KC_SCLN, KC_SLSH, KC_COMM, - MO(_SYM), LT(_NUM, KC_R), LT(_NAV, KC_SPC), MO(_FN) + KC_B, KC_F, KC_L, KC_K, KC_Q, KC_P, KC_G, KC_O, KC_U, KC_DOT, + RALT_T(KC_N), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), LGUI_T(KC_M), RGUI_T(KC_Y), RSFT_T(KC_C), RCTL_T(KC_A), LALT_T(KC_E), RALT_T(KC_I), + KC_X, KC_V, KC_J, KC_D, KC_Z, KC_QUOT, KC_W, KC_SCLN, KC_SLSH, KC_COMM, + LT(_SYM, KC_MINS), LT(_NUM, KC_R), LT(_NAV, KC_SPC), LT(_FN, KC_EQL) ), [_NUM] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_RBT, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, - KC_RALT, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_EQL, KC_4, KC_5, KC_6, KC_SLSH, - XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, XXXXXXX, KC_BSLS, KC_1, KC_2, KC_3, KC_GRV, - XXXXXXX, XXXXXXX, KC_MINS, KC_0 + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_RBT, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, + KC_RALT, KC_LALT, KC_LCTL, KC_LSFT, KC_LGUI, KC_EQL, KC_4, KC_5, KC_6, KC_SLSH, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_1, KC_2, KC_3, KC_GRV, + XXXXXXX, XXXXXXX, KC_MINS, KC_0 ), [_NAV] = LAYOUT( - XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, XXXXXXX, QK_RBT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RALT, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX, - KC_TAB, KC_ENT, XXXXXXX, XXXXXXX + XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, XXXXXXX, QK_RBT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_RGUI, KC_RSFT, KC_RCTL, KC_LALT, KC_RALT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_TAB, KC_ENT, XXXXXXX, XXXXXXX ), [_SYM] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, - KC_RALT, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PLUS, KC_DLR, KC_PERC, KC_CIRC, KC_QUES, - XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, XXXXXXX, KC_PIPE, KC_EXLM, KC_AT, KC_HASH, KC_TILD, - XXXXXXX, XXXXXXX, KC_UNDS, KC_RPRN + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, + KC_RALT, KC_LALT, KC_LCTL, KC_LSFT, KC_LGUI, KC_PLUS, KC_DLR, KC_PERC, KC_CIRC, KC_QUES, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_EXLM, KC_AT, KC_HASH, KC_TILD, + XXXXXXX, XXXXXXX, KC_UNDS, KC_RPRN ), [_FN] = LAYOUT( - KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_F11, KC_F4, KC_F5, KC_F6, KC_DEL, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RALT, - KC_F10, KC_F1, KC_F2, KC_F3, KC_INS, XXXXXXX, KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX, - KC_BSPC, KC_ESC, XXXXXXX, XXXXXXX + KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F4, KC_F5, KC_F6, KC_DEL, KC_RGUI, KC_RSFT, KC_RCTL, KC_LALT, KC_RALT, + KC_F10, KC_F1, KC_F2, KC_F3, KC_INS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_BSPC, KC_ESC, XXXXXXX, XXXXXXX ) };