Skip to content

Commit 7486328

Browse files
NaughtyusernameNaughtyusername
committed
updateds from qmk
1 parent 652dce7 commit 7486328

File tree

6 files changed

+95
-20
lines changed

6 files changed

+95
-20
lines changed

‎config/behaviors.dtsi‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ skq: sticky_key_quick_release {
9595
// =====================================================================================
9696
// LEADER KEY BEHAVIOR
9797
// =====================================================================================
98+
key_repeat: key_repeat {
99+
compatible = "zmk,behavior-key-repeat";
100+
#binding-cells = <0>;
101+
};
102+
98103
leader: leader {
99104
compatible = "zmk,behavior-leader-key";
100105
#binding-cells = <0>;
@@ -192,6 +197,11 @@ skq: sticky_key_quick_release {
192197
#binding-cells = <0>;
193198
bindings = <&kp EQUAL &kp EQUAL>; // ==
194199
};
200+
macro_noteq: macro_noteq {
201+
compatible = "zmk,behavior-macro";
202+
#binding-cells = <0>;
203+
bindings = <&kp EXCL &kp EQUAL>; // !=
204+
};
195205

196206
// =====================================================================================
197207
// LEADER KEY SEQUENCE MACROS

‎config/bullet_train.keymap‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
combo_as_bspc {
5050
key-positions = <19 20>; // A S
5151
};
52-
combo_hn_equal {
53-
key-positions = <24 36>; // H N
52+
combo_ui_equal {
53+
key-positions = <13 14>; // U I
5454
};
5555
combo_df_underscore {
5656
key-positions = <21 22>; // D F
@@ -121,6 +121,18 @@
121121
combo_op_rgui {
122122
key-positions = <15 16>; // O P
123123
};
124+
// =====================================================================================
125+
// BASE-only top row combos
126+
// =====================================================================================
127+
combo_qw_noteq {
128+
key-positions = <7 8>; // Q W
129+
};
130+
combo_er_repeat {
131+
key-positions = <9 10>; // E R
132+
};
133+
combo_io_colon {
134+
key-positions = <14 15>; // I O
135+
};
124136
combo_return_to_base {
125137
key-positions = <7 8 9>; // Q W E
126138
};

‎config/combos.dtsi‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
// │ COMBO_DF_UNDS │ D+F │ KC_UNDS │ MED │ BASE VIM LOWER │
5353
// │ COMBO_VB_SPACE │ V+B │ KC_SPACE │ MED │ BASE VIM LOWER │
5454
// │ COMBO_AS_BSPC │ A+S │ KC_BSPC │ MED │ BASE VIM LOWER │
55-
// │ COMBO_HN_EQUAL │ H+N │ KC_EQUAL │ MED │ BASE VIM LOWER │
55+
// │ COMBO_UI_EQUAL │ U+I │ KC_EQUAL │ MED │ BASE LOWER │
5656
// │ │ │ │ │ │
5757
// │ COMBO_CV_MINS │ C+V │ KC_MINS │ SLOW │ BASE VIM LOWER │
5858
// │ COMBO_ZX_DEL │ Z+X │ KC_DEL │ SLOW │ BASE VIM LOWER │
@@ -74,13 +74,18 @@
7474
// │ ONE-SHOT MODS (GACS) │ │ │ │ │
7575
// │ COMBO_RT_OSM_LSFT │ R+T │ OSM SHIFT │ FAST │ BASE VIM │
7676
// │ COMBO_YU_OSM_RSFT │ Y+U │ OSM SHIFT │ FAST │ BASE VIM GAMING │
77-
// │ COMBO_QW_OSM_LGUI │ Q+W │ OSM GUI │ FAST │ VIM (freed BASE) │
78-
// │ COMBO_WE_OSM_LALT │ W+E │ OSM ALT │ FAST │ VIM (freed BASE) │
79-
// │ COMBO_ER_OSM_LCTL │ E+R │ OSM CTRL │ FAST │ VIM (freed BASE) │
77+
// │ COMBO_QW_OSM_LGUI │ Q+W │ OSM GUI │ FAST │ VIM only │
78+
// │ COMBO_WE_OSM_LALT │ W+E │ OSM ALT │ FAST │ VIM only │
79+
// │ COMBO_ER_OSM_LCTL │ E+R │ OSM CTRL │ FAST │ VIM only │
8080
// │ COMBO_UI_OSM_RCTL │ U+I │ OSM CTRL │ FAST │ VIM GAMING │
8181
// │ COMBO_IO_OSM_RALT │ I+O │ OSM ALT │ FAST │ VIM GAMING │
8282
// │ COMBO_OP_OSM_RGUI │ O+P │ OSM GUI │ FAST │ VIM GAMING │
8383
// ├────────────────────────┼──────┼────────────┼─────────┼──────────────────┤
84+
// │ BASE TOP ROW │ │ │ │ │
85+
// │ COMBO_QW_NOTEQ │ Q+W │ != │ FAST │ BASE │
86+
// │ COMBO_ER_REPEAT │ E+R │ Repeat │ FAST │ BASE │
87+
// │ COMBO_IO_COLON │ I+O │ KC_COLON │ FAST │ BASE │
88+
// ├────────────────────────┼──────┼────────────┼─────────┼──────────────────┤
8489
// │ LAYER SWITCHING │ │ │ │ │
8590
// │ COMBO_QWE_TO_BASE │ QWE │ TO(BASE) │ SLOW │ !BASE (anywhere) │
8691
// │ COMBO_ASD_TO_GAMING │ ASD │ TO(GAMING) │ SLOW │ BASE │
@@ -102,7 +107,7 @@
102107
// OPEN SLOTS (no combo assigned):
103108
// 2-key: ZX, XC (left bottom)
104109
// 3-key: ZXC, ERT, DFG, CVB, IOP, KL;, ,./
105-
// vert: QA, WS, ED, RF, TG, UJ, IK, OL, P;, L., ;/
110+
// vert: QA, WS, ED, RF, TG, HN, UJ, IK, OL, P;, L., ;/
106111
// cross: A;, SL, DK, FJ
107112
//
108113
// =====================================================================================
@@ -180,11 +185,11 @@
180185
bindings = <&kp BSPC>;
181186
layers = <BASE VIM LOWER>;
182187
};
183-
combo_hn_equal {
188+
combo_ui_equal {
184189
timeout-ms = <30>;
185190
key-positions = <0 1>;
186191
bindings = <&kp EQUAL>;
187-
layers = <BASE VIM LOWER>;
192+
layers = <BASE LOWER>;
188193
};
189194
combo_kl_sqt {
190195
timeout-ms = <30>;
@@ -366,6 +371,30 @@
366371
layers = <VIM GAMING>;
367372
};
368373
// =====================================================================================
374+
// BASE-only top row combos (same physical keys as VIM OSM mods, layer-filtered)
375+
// =====================================================================================
376+
combo_qw_noteq {
377+
timeout-ms = <COMBO_TERM_FAST>;
378+
require-prior-idle-ms = <100>;
379+
key-positions = <0 1>;
380+
bindings = <&macro_noteq>;
381+
layers = <BASE>;
382+
};
383+
combo_er_repeat {
384+
timeout-ms = <COMBO_TERM_FAST>;
385+
require-prior-idle-ms = <100>;
386+
key-positions = <0 1>;
387+
bindings = <&key_repeat>;
388+
layers = <BASE>;
389+
};
390+
combo_io_colon {
391+
timeout-ms = <COMBO_TERM_FAST>;
392+
require-prior-idle-ms = <100>;
393+
key-positions = <0 1>;
394+
bindings = <&kp COLON>;
395+
layers = <BASE>;
396+
};
397+
// =====================================================================================
369398
// end of combos
370399
// =====================================================================================
371400
};

‎config/cradio.keymap‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
combo_as_bspc {
5757
key-positions = <10 11>;
5858
};
59-
combo_hn_equal {
60-
key-positions = <15 25>; // H + N
59+
combo_ui_equal {
60+
key-positions = <6 7>; // U + I
6161
};
6262
combo_df_underscore {
6363
key-positions = <12 13>;
@@ -130,6 +130,18 @@
130130
key-positions = <8 9>;
131131
};
132132
// =====================================================================================
133+
// BASE-only top row combos
134+
// =====================================================================================
135+
combo_qw_noteq {
136+
key-positions = <0 1>; // Q + W
137+
};
138+
combo_er_repeat {
139+
key-positions = <2 3>; // E + R
140+
};
141+
combo_io_colon {
142+
key-positions = <7 8>; // I + O
143+
};
144+
// =====================================================================================
133145
// Three-Finger goto layer combos
134146
// =====================================================================================
135147
combo_return_to_base { // QWE on all layers to return home

‎config/sofle.keymap‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
combo_as_bspc {
5050
key-positions = <25 26>;
5151
};
52-
combo_hn_equal {
53-
key-positions = <30 44>; // H + N
52+
combo_ui_equal {
53+
key-positions = <19 20>; // U + I
5454
};
5555
combo_df_underscore {
5656
key-positions = <27 28>;
@@ -135,6 +135,18 @@
135135
key-positions = <21 22>;
136136
};
137137
// =====================================================================================
138+
// BASE-only top row combos
139+
// =====================================================================================
140+
combo_qw_noteq {
141+
key-positions = <13 14>; // Q + W
142+
};
143+
combo_er_repeat {
144+
key-positions = <15 16>; // E + R
145+
};
146+
combo_io_colon {
147+
key-positions = <20 21>; // I + O
148+
};
149+
// =====================================================================================
138150
// Three-finger layer switching combos
139151
// =====================================================================================
140152
combo_return_to_base {

‎config/wrappers.dtsi‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@
130130
#define ___RAISE_R3___ &kp RBRC &kp AT &kp LT &kp GT &kp QMARK
131131

132132
/* --------------------------------------------------------------------------
133-
* LOWER LAYER - Numbers and Programming Operators
133+
* LOWER LAYER - Symbols (mirrors RAISE left) and Numpad
134134
* --------------------------------------------------------------------------
135-
* 1 2 3 4 5 6 7 8 9 0
136-
* <= < * - = . 4 5 6
137-
* >= > / + == , 1 2 3
135+
* \ $ | - [ 6 7 8 9 0
136+
* ~ & * = ( . 4 5 6
137+
* ` ! ' " { , 1 2 3
138138
*/
139-
#define ___LOWER_L1___ &kp N1 &kp N2 &kp N3 &kp N4 &kp N5
140-
#define ___LOWER_L2___ &macro_lteq &kp LT &kp STAR &kp MINUS &kp EQUAL
141-
#define ___LOWER_L3___ &macro_gteq &kp GT &kp FSLH &kp PLUS &macro_eqeq
139+
#define ___LOWER_L1___ &kp BSLH &kp DLLR &kp PIPE &kp MINUS &kp LBKT
140+
#define ___LOWER_L2___ &kp TILDE &kp AMPS &kp STAR &kp EQUAL &kp LPAR
141+
#define ___LOWER_L3___ &kp GRAVE &kp EXCL &kp SQT &kp DQT &kp LBRC
142142

143143
#define ___LOWER_R1___ &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
144144
#define ___LOWER_R2___ &kp DOT &kp N4 &kp N5 &kp N6 XXX

0 commit comments

Comments
 (0)