commit c419ea6cdc63863dd4a509eb8f1949a17fa36a2a
parent 037a30af6facf84b784c38c2e45f6b11a3c34a18
Author: Jack Sangdahl <jack@pngu.org>
Date: Fri, 12 Dec 2025 17:28:04 -0700
Layout updates and more updates
Diffstat:
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/users/jack/config.h b/users/jack/config.h
@@ -7,6 +7,7 @@
#define TAPPING_TERM 140
#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
#define COMBO_TERM 40
+#define TAP_HOLD_CAPS_DELAY TAP_CODE_DELAY
#define NO_ACTION_ONESHOT
#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
diff --git a/users/jack/jack.c b/users/jack/jack.c
@@ -109,6 +109,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
tap_code(KC_UP);
}
break;
+ case REP_L2:
+ if (!record->tap.count) {
+ repeat_key_invoke(&record->event);
+ return false;
+ }
+ break;
+ INTERCEPT_MOD_TAP(LALT_T, KC_EXLM)
+ INTERCEPT_MOD_TAP(LCTL_T, KC_PLUS)
+ INTERCEPT_MOD_TAP(RSFT_T, KC_COLN)
+ INTERCEPT_MOD_TAP(RCTL_T, KC_LPRN)
+ INTERCEPT_MOD_TAP(RGUI_T, KC_RPRN)
+ INTERCEPT_MOD_TAP(RALT_T, KC_QUES)
}
return true;
}
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -60,7 +60,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
#endif
#define ESC_L1 LT(LAYER1, KC_ESC)
-#define REP_L2 LT(LAYER2, QK_REP)
+#define REP_L2 LT(LAYER2, KC_NO)
#define SPC_L1 LT(LAYER1, KC_SPC)
#define BSPC_L2 LT(LAYER2, KC_BSPC)
#define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4)
@@ -77,17 +77,17 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
// #define ___LAYER02___ KC_Z, KC_K, KC_Q, KC_G, KC_W, KC_B, KC_H, KC_QUOT, KC_SCLN, KC_COMM
#define ___LAYER10___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0
-#define ___LAYER11___ HRML(KC_VOLD, KC_VOLU, KC_TAB, KC_CAPS), _______, KC_LEFT, HRMR(KC_DOWN, KC_UP, KC_RGHT, _______)
+#define ___LAYER11___ HRML(KC_VOLD, KC_VOLU, _______, _______), TD(PLY_NXT_PRV), KC_LEFT, HRMR(KC_DOWN, KC_UP, KC_RGHT, _______)
#define ___LAYER12___ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
#define ___LAYER13___ _______, _______, _______, _______
-#define ___LAYER20___ KC_GRV, KC_LABK, KC_RABK, KC_DQUO, KC_DOT, KC_AMPR, REMOVE, KC_LBRC, KC_RBRC, KC_PERC
-#define ___LAYER21___ KC_EXLM, TD(EM_DASH_MINS), KC_PLUS, KC_EQL, KC_HASH, KC_PIPE, KC_COLN, KC_LPRN, KC_RPRN, KC_QUES
+#define ___LAYER20___ KC_GRV, KC_LABK, KC_RABK, KC_DQUO, KC_TAB, KC_AMPR, REMOVE, KC_LBRC, KC_RBRC, KC_PERC
+#define ___LAYER21___ HRML(KC_EXLM, TD(EM_DASH_MINS), KC_PLUS, KC_EQL), KC_HASH, KC_PIPE, HRMR(KC_COLN, KC_LPRN, KC_RPRN, KC_QUES)
#define ___LAYER22___ KC_CIRC, KC_SLSH, KC_ASTR, KC_BSLS, UPDIR, KC_TILD, KC_DLR, KC_LCBR, KC_RCBR, KC_AT
#define ___LAYER23___ _______, _______, _______, _______
-#define ___LAYER30___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, _______, _______, _______, _______, QK_MAKE
-#define ___LAYER31___ _______, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, _______, _______, _______, _______, QK_BOOT
+#define ___LAYER30___ XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, XRGB_TOG, _______, _______, _______, _______, QK_MAKE
+#define ___LAYER31___ XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, _______, _______, _______, _______, _______, QK_BOOT
#define ___LAYER32___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
#define ___LAYER33___ _______, _______, _______, _______
// clang-format on
diff --git a/users/jack/user_introspection.c b/users/jack/user_introspection.c
@@ -11,7 +11,12 @@ tap_dance_action_t tap_dance_actions[] = {
#ifdef COMBO_ENABLE
const uint16_t PROGMEM enter_combo[] = {KC_J, KC_K, COMBO_END};
-combo_t key_combos[] = {COMBO(enter_combo, KC_ENT)};
+const uint16_t PROGMEM caps_combo[] = {KC_D, KC_F, COMBO_END};
+
+combo_t key_combos[] = {
+ COMBO(enter_combo, KC_ENT),
+ COMBO(caps_combo, KC_CAPS),
+};
#endif
#ifdef ENCODER_MAP_ENABLE