diff options
Diffstat (limited to 'waffle')
-rw-r--r-- | waffle/combos.def | 22 | ||||
-rw-r--r-- | waffle/tapping.c | 27 | ||||
-rw-r--r-- | waffle/waffle.h | 13 |
3 files changed, 17 insertions, 45 deletions
diff --git a/waffle/combos.def b/waffle/combos.def index b20c3a8..a1417a2 100644 --- a/waffle/combos.def +++ b/waffle/combos.def @@ -2,13 +2,15 @@ // SPDX-License-Identifier: GPL-2.0-or-later // name output keys -CMB(ru_ent, KC_ENT, KC_R, KC_U) -CMB(dk_eql, KC_EQL, LCTL_T(KC_D), RCTL_T(KC_K)) -CMB(gh_quot, TD(QUOT_DQUO), KC_G, KC_H) -CMB(ty_coln, KC_COLN, KC_T, KC_Y) -CMB(bn_unds, KC_UNDS, KC_B, KC_N) -CMB(er_cbkt, TD(CURLY_BRACKET), KC_E, KC_R) -CMB(ui_brkt, TD(SQR_BRACKET), KC_U, KC_I) -CMB(ccom_plus, KC_PLUS, KC_C, KC_COMM) -CMB(ei_bsls, TD(BSLS_PIPE), KC_E, KC_I) -CMB(vm_mins, TD(EM_DASH_MINS), KC_V, KC_M) +CMB(fg_coln, KC_COLN, KC_W, KC_E) +CMB(er_cbkt, TD(CURLY_BRACKET), KC_E, KC_R) +CMB(rt_pipe, KC_PIPE, KC_R, KC_T) +CMB(yu_dqou, KC_DQUO, KC_Y, KC_U) +CMB(ui_brkt, TD(SQR_BRACKET), KC_U, KC_I) +CMB(io_ent, KC_ENT, KC_I, KC_O) +CMB(sd_eql, KC_EQL, LGUI_T(KC_S), LCTL_T(KC_D)) +CMB(df_plus, KC_PLUS, LCTL_T(KC_D), LSFT_T(KC_F)) +CMB(fg_bsls, KC_BSLS, LSFT_T(KC_F), KC_G) +CMB(hj_quot, KC_QUOT, KC_H, RSFT_T(KC_J)) +CMB(jk_unds, KC_UNDS, RSFT_T(KC_J), RCTL_T(KC_K)) +CMB(kl_mins, TD(EM_DASH_MINS), RCTL_T(KC_K), RGUI_T(KC_L)) diff --git a/waffle/tapping.c b/waffle/tapping.c index 50fea91..0a01637 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -21,13 +21,10 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { case ESCLWR: case RSEBSP: return TAPPING_TERM - SPC_OFFSET; - case TD(QMK_LINKS): case TD(EM_DASH_MINS): case TD(PLY_NXT_PRV): case TD(CURLY_BRACKET): case TD(SQR_BRACKET): - case TD(BSLS_PIPE): - case TD(QUOT_DQUO): return TAPPING_TERM + 60; default: return TAPPING_TERM; @@ -39,28 +36,13 @@ void td_reset(tap_dance_state_t *state, void *user_data) { layer_clear(); } -void qmk_links(tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - tap_code16(C(KC_T)); - send_string(qmkstr); - tap_code(KC_ENT); - } else { - tap_code16(C(KC_T)); - send_string(confstr); - tap_code(KC_ENT); - } -} - void em_dash_mins(tap_dance_state_t *state, void *user_data) { switch (state->count) { - case 3: + case 2: #ifdef UNICODE_COMMON_ENABLE register_unicode(0x2014); // — #endif break; - case 2: - tap_code(KC_MINS), tap_code(KC_MINS); - break; default: tap_code(KC_MINS); } @@ -88,14 +70,11 @@ void raise_paste(tap_dance_state_t *state, void *user_data) { } tap_dance_action_t tap_dance_actions[] = { - [QMK_LINKS] = ACTION_TAP_DANCE_FN(qmk_links), [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins), [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv), [RAISE_PASTE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset), [CURLY_BRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), [SQR_BRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), - [BSLS_PIPE] = ACTION_TAP_DANCE_DOUBLE(KC_BSLS, KC_PIPE), - [QUOT_DQUO] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -120,10 +99,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("\b```suggestion\n```"); } break; - case REMOVE: - if (record->event.pressed) - SEND_STRING("This file should be removed."); - break; INTERCEPT_MOD_TAP(LALT_T, KC_EXLM) INTERCEPT_MOD_TAP(LGUI_T, KC_AT) INTERCEPT_MOD_TAP(LCTL_T, KC_HASH) diff --git a/waffle/waffle.h b/waffle/waffle.h index 5694ca3..3f5b9ba 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -18,20 +18,16 @@ typedef struct user_config { enum layers { _BASE, _LOWER, _RAISE, _ADJUST }; enum tapdances { - QMK_LINKS, EM_DASH_MINS, PLY_NXT_PRV, RAISE_PASTE, CURLY_BRACKET, - SQR_BRACKET, - BSLS_PIPE, - QUOT_DQUO + SQR_BRACKET }; enum custom_keycodes { UPDIR = QK_USER, NUKE, - REMOVE, TABLE1, TABLE2, KC_NOMODE, @@ -60,9 +56,8 @@ enum unicode_mode { }; #endif -#define LINKS TD(QMK_LINKS) #define PNP TD(PLY_NXT_PRV) -#define RSEPST TD(RAISE_PASTE) +#define PSTRSE TD(RAISE_PASTE) #define ESCLWR LT(_LOWER, KC_ESC) #define LWRSPC LT(_LOWER, KC_SPC) #define RSEBSP LT(_RAISE, KC_BSPC) @@ -73,11 +68,11 @@ enum unicode_mode { #define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P #define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN) #define ___BASE3___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH -#define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, RSEPST, PNP +#define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, PSTRSE, PNP #define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 #define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN) -#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU +#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, C(KC_BSPC), KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU #define ___LOWER4___ _______, _______, _______, _______, _______, _______ #define ___RAISE1___ RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE |