qmk_me

commit d2ad968fbf55fe8f47b082815718d04ec4649476
parent 2fca34c71bde9606eff202aacf780cf43ec1690e
Author: Jack Sangdahl <jack@pngu.org>
Date:   Sun, 14 Dec 2025 19:46:25 -0700

More layout updates and fixes

Diffstat:
M
users/jack/jack.c
 | 
31
++++++++++++++-----------------
M
users/jack/jack.h
 | 
8
++++----
M
users/jack/rules.mk
 | 
2
+-

3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/users/jack/jack.c b/users/jack/jack.c
@@ -41,7 +41,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case ESC_L1:
-  case REP_L2:
+  case UND_L2:
   case SPC_L1:
   case BSPC_L2:
     return TAPPING_TERM - 40;
@@ -74,20 +74,16 @@ tap_dance_action_t tap_dance_actions[] = {
 
 #ifdef COMBO_ENABLE
 const uint16_t PROGMEM enter_combo[] = {RSFT_T(KC_J), RCTL_T(KC_K), COMBO_END};
-const uint16_t PROGMEM caps_combo[] = {LCTL_T(KC_D), LSFT_T(KC_F), COMBO_END};
 
-combo_t key_combos[] = {
-    COMBO(enter_combo, KC_ENT),
-    COMBO(caps_combo, KC_CAPS),
-};
+combo_t key_combos[] = {COMBO(enter_combo, KC_ENT)};
 #endif
 
-bool remember_last_key_user(uint16_t keycode, keyrecord_t *record,
-                            uint8_t *remembered_mods) {
-  if (keycode == REP_L2)
-    return false;
-  return true;
-}
+#ifdef KEY_OVERRIDE_ENABLE
+const key_override_t volume_key_override =
+    ko_make_basic(MOD_MASK_SHIFT, KC_VOLU, KC_VOLD);
+
+const key_override_t *key_overrides[] = {&volume_key_override};
+#endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (!process_record_keymap(keycode, record))
@@ -119,15 +115,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed)
       SEND_STRING("jack@pngu.org");
     break;
-  case REP_L2:
-    if (record->tap.count) {
-      repeat_key_invoke(&record->event);
+
+  case LT(LAYER2, KC_UNDS):
+    if (record->tap.count && record->event.pressed) {
+      tap_code16(KC_UNDS);
       return false;
     }
     break;
-    INTERCEPT_MOD_TAP(LALT_T, KC_PLUS)
+    INTERCEPT_MOD_TAP(LSFT_T, KC_PLUS)
     INTERCEPT_MOD_TAP(LALT_T, KC_EXLM)
-    INTERCEPT_MOD_TAP(LCTL_T, KC_ASTR)
+    INTERCEPT_MOD_TAP(LGUI_T, KC_ASTR)
     INTERCEPT_MOD_TAP(RSFT_T, KC_LPRN)
     INTERCEPT_MOD_TAP(RCTL_T, KC_RPRN)
     INTERCEPT_MOD_TAP(RALT_T, KC_DQUO)
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -54,7 +54,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #endif
 
 #define ESC_L1 LT(LAYER1, KC_ESC)
-#define REP_L2 LT(LAYER2, KC_NO)
+#define UND_L2 LT(LAYER2, KC_UNDS)
 #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)
@@ -64,15 +64,15 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #define ___LAYER00___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
 #define ___LAYER01___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN)
 #define ___LAYER02___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT
-#define ___LAYER03___ ESC_L1, KC_SPC, KC_BSPC, REP_L2
+#define ___LAYER03___ ESC_L1, KC_SPC, KC_BSPC, UND_L2
 
 // #define ___LAYER00___ KC_V, KC_M, KC_L, KC_C, KC_P, KC_X, KC_F, KC_O, KC_U, KC_J
 // #define ___LAYER01___ KC_S, KC_T, KC_R, KC_D, KC_Y, KC_DOT, KC_N, KC_A, KC_E, KC_I
 // #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_PLUS, KC_MINS, KC_ASTR, KC_SLSH), REMOVE, KC_LEFT, HRMR(KC_DOWN, KC_UP, KC_RGHT, _______)
-#define ___LAYER12___ KC_VOLD, TD(PLY_NXT_PRV), KC_VOLU, UPDIR, USRNME, _______, _______, _______, _______, _______
+#define ___LAYER11___ HRML(KC_SLSH, KC_ASTR, KC_MINS, KC_PLUS), KC_TAB, KC_LEFT, HRMR(KC_DOWN, KC_UP, KC_RGHT, KC_CAPS)
+#define ___LAYER12___ KC_VOLU, TD(PLY_NXT_PRV), REMOVE, UPDIR, USRNME, _______, _______, _______, _______, _______
 #define ___LAYER13___ _______, _______, _______, _______
 
 #define ___LAYER20___ KC_GRV, KC_LABK, KC_RABK, KC_MINS, KC_PIPE, KC_CIRC, KC_LCBR, KC_RCBR, KC_DLR, KC_BSLS
diff --git a/users/jack/rules.mk b/users/jack/rules.mk
@@ -9,10 +9,10 @@ EXTRAKEY_ENABLE = yes
 BOOTMAGIC_ENABLE = yes
 CAPS_WORD_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-REPEAT_KEY_ENABLE = yes
 SPACE_CADET_ENABLE = no
 AUTOCORRECT_ENABLE = yes
 OS_DETECTION_ENABLE = yes
+KEY_OVERRIDE_ENABLE = yes
 INTROSPECTION_KEYMAP_C = jack.c
 
 SRC += $(USER_PATH)/callbacks.c