Skip to content

Commit

Permalink
fix 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@englmaxi
englmaxi authored Sep 22, 2024
1 parent 948be63 commit 985ec32
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
66 changes: 33 additions & 33 deletions config/keymap/behaviors.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@
bindings = <&kp>, <TAP>; \
hold-trigger-key-positions = <HT_KEYPOS THUMBS>; \
hold-trigger-on-release; \
display-name = "HRM " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
__VA_ARGS__ \
};

/ {
behaviors {
HM(hsl, Shift Left, &kp, KEYS_R, 0, hold-while-undecided;)
HM(hcl, Ctrl Left, &kp, KEYS_R, 200, hold-while-undecided;)
HM(hml, Mods Left, &kp, KEYS_R, 200)
HM(hml_m, Mods-Mouse Left, &mkp, KEYS_R, 200)
HM(hsr, Shift Right, &kp, KEYS_L, 0, hold-while-undecided;)
HM(hcr, Ctrl Right, &kp, KEYS_L, 200, hold-while-undecided;)
HM(hmr, Mods Left, &kp, KEYS_L, 200)
HM(hsl, HRM Shift Left, &kp, KEYS_R, 0, hold-while-undecided;)
HM(hcl, HRM Ctrl Left, &kp, KEYS_R, 200, hold-while-undecided;)
HM(hml, HRM Mods Left, &kp, KEYS_R, 200)
HM(hml_m, HRM Mods-Mouse Left, &mkp, KEYS_R, 200)
HM(hsr, HRM Shift Right, &kp, KEYS_L, 0, hold-while-undecided;)
HM(hcr, HRM Ctrl Right, &kp, KEYS_L, 200, hold-while-undecided;)
HM(hmr, HRM Mods Left, &kp, KEYS_L, 200)
};
};

Expand All @@ -102,7 +102,7 @@
bindings = <TAP>, <SHIFTED>; \
mods = <(MOD_RSFT|MOD_LSFT)>; \
keep-mods = <(MOD_RSFT)>; \
display-name = "SM " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
};

#define CM(NAME, DISPLAY_NAME, TAP, CONTROLED) \
Expand All @@ -111,7 +111,7 @@
#binding-cells = <0>; \
bindings = <TAP>, <CONTROLED>; \
mods = <(MOD_RCTL|MOD_LCTL)>; \
display-name = "CM " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
};

#define GM(NAME, DISPLAY_NAME, TAP, GUIED) \
Expand All @@ -120,7 +120,7 @@
#binding-cells = <0>; \
bindings = <TAP>, <GUIED>; \
mods = <(MOD_RGUI|MOD_LGUI)>; \
display-name = "GM " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
};

#define MASKED(NAME, DISPLAY_NAME, MODS, BINDING) \
Expand All @@ -129,29 +129,29 @@
#binding-cells = <0>; \
bindings = <BINDING>, <BINDING>; \
mods = <MODS>; \
display-name = "Masked " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
};

/ {
behaviors {
SM(qexcl, Qmark-Excl, &kp DE_QMARK, &kp DE_EXCL)
SM(bspc_del, BSp-Del, &kp BSPC, &kp DEL)
SM(qexcl, SM Qmark-Excl, &kp DE_QMARK, &kp DE_EXCL)
SM(bspc_del, SM BSp-Del, &kp BSPC, &kp DEL)

SM(sqt_dqt, Sqt-Dqt, &kp DE_SQT, &kp DE_DQT)
CM(qt_grv, Qt-Grv, &sqt_dqt, &kp DE_ACUTE)
SM(sqt_dqt_macro, Macro Sqt-Dqt, &sqt_macro, &dqt_macro)
SM(grv_dgrv, Grv-DGrqu, &kp DE_GRAVE, &dgrv_macro)
SM(sqt_dqt, SM Sqt-Dqt, &kp DE_SQT, &kp DE_DQT)
CM(qt_grv, CM Qt-Grv, &sqt_dqt, &kp DE_ACUTE)
SM(sqt_dqt_macro, SM Macro Sqt-Dqt, &sqt_macro, &dqt_macro)
SM(grv_dgrv, SM Grv-DGrqu, &kp DE_GRAVE, &dgrv_macro)

SM(lpar_lbkt, LPar-LBkt, &kp DE_LPAR, &kp DE_LBKT)
SM(rpar_rbkt, RPar-LBkt, &kp DE_RPAR, &kp DE_RBKT)
SM(par_bkt, Macro Par-Bkt, &par_macro, &bkt_macro)
SM(lpar_lbkt, SM LPar-LBkt, &kp DE_LPAR, &kp DE_LBKT)
SM(rpar_rbkt, SM RPar-LBkt, &kp DE_RPAR, &kp DE_RBKT)
SM(par_bkt, SM Macro Par-Bkt, &par_macro, &bkt_macro)

SM(lbrc_lt, LBrc-LT, &kp DE_LBRC, &kp DE_LT)
SM(rbrc_gt, RBrc-GT, &kp DE_RBRC, &kp DE_GT)
SM(brc_lgt, Macro Brc-LGT, &brc_macro, &lgt_macro)
SM(lbrc_lt, SM LBrc-LT, &kp DE_LBRC, &kp DE_LT)
SM(rbrc_gt, SM RBrc-GT, &kp DE_RBRC, &kp DE_GT)
SM(brc_lgt, SM Macro Brc-LGT, &brc_macro, &lgt_macro)

SM(p_tab_desk, Prev Tab-Desk, &kp LC(LS(TAB)), &kp LC(LG(LEFT)))
SM(n_tab_desk, Next Tab-Desk, &kp LC(TAB), &kp LC(LG(RIGHT)))
SM(p_tab_desk, SM Prev Tab-Desk, &kp LC(LS(TAB)), &kp LC(LG(LEFT)))
SM(n_tab_desk, SM Next Tab-Desk, &kp LC(TAB), &kp LC(LG(RIGHT)))

MASKED(left_masked, Masked Left, (MOD_RSFT|MOD_LSFT), &kp LEFT)
MASKED(u_masked, Masked U, (MOD_RSFT|MOD_LSFT), &kp U)
Expand All @@ -166,22 +166,22 @@
#binding-cells = <0>; \
tapping-term-ms = <200>; \
bindings = <TAP1>, <TAP2> __VA_OPT__(, <)__VA_ARGS__ __VA_OPT__(>); \
display-name = "TD " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
};

/ {
behaviors {
TD(td_sqt_dqt, Sqt-Dqt, &sqt_dqt, &sqt_dqt_macro)

TD(bts_0, BT0 Sel-Disc, &bts 0, &bt BT_DISC 0)
TD(bts_1, BT1 Sel-Disc, &bts 1, &bt BT_DISC 1)
TD(bts_2, BT2 Sel-Disc, &bts 2, &bt BT_DISC 2)
TD(bts_0, TD BT0 Sel-Disc, &bts 0, &bt BT_DISC 0)
TD(bts_1, TD BT1 Sel-Disc, &bts 1, &bt BT_DISC 1)
TD(bts_2, TD BT2 Sel-Disc, &bts 2, &bt BT_DISC 2)

TD(kns_lock, CLCK-NLCK-SLCK, &kp CLCK, &kp KP_NLCK, &kp SLCK)
TD(kns_lock, TD CLCK-NLCK-SLCK, &kp CLCK, &kp KP_NLCK, &kp SLCK)

TD(pp_n, PlayPause-Next, &kp C_PP, &kp C_NEXT)
TD(pp_n, TD PlayPause-Next, &kp C_PP, &kp C_NEXT)

TD(close_reopen, Tab Close-Reopen, &mt LA(F4) LC(W), &kp LC(LS(T)))
TD(close_reopen, TD Tab Close-Reopen, &mt LA(F4) LC(W), &kp LC(LS(T)))
};
};

Expand Down
18 changes: 9 additions & 9 deletions config/keymap/macros.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
= <& ## NAME ## _sym1_masked> \
, <& ## NAME ## _sym2_masked> \
, <&left_masked>; \
display-name = "Macro " #DISPLAY_NAME; \
display-name = #DISPLAY_NAME; \
)

/ {
macros {
AP(par_macro, ( ) <-, &kp DE_LPAR, &kp DE_RPAR)
AP(bkt_macro, [ ] <-, &kp DE_LBKT, &kp DE_RBKT)
AP(sqt_macro, ' ' <-, &kp DE_SQT, &kp DE_SQT)
AP(dqt_macro, " " <-, &kp DE_DQT, &kp DE_DQT)
AP(dgrv_macro, ` ` <-, &kp DE_GRAVE, &kp DE_GRAVE)
AP(brc_macro, { } <-, &kp DE_LBRC, &kp DE_RBRC)
AP(lgt_macro, < > <-, &kp DE_LT, &kp DE_GT)
AP(par_macro, Macro ( ) <-, &kp DE_LPAR, &kp DE_RPAR)
AP(bkt_macro, Macro [ ] <-, &kp DE_LBKT, &kp DE_RBKT)
AP(sqt_macro, Macro ' ' <-, &kp DE_SQT, &kp DE_SQT)
AP(dqt_macro, Macro \" \" <-, &kp DE_DQT, &kp DE_DQT)
AP(dgrv_macro, Macro ` ` <-, &kp DE_GRAVE, &kp DE_GRAVE)
AP(brc_macro, Macro { } <-, &kp DE_LBRC, &kp DE_RBRC)
AP(lgt_macro, Macro < > <-, &kp DE_LT, &kp DE_GT)

ZMK_MACRO(qu,
bindings
Expand Down Expand Up @@ -76,7 +76,7 @@
= <&out OUT_BLE>
, <&macro_param_1to2>
, <&bt BT_SEL MACRO_PLACEHOLDER>;
display-name = "Macro BT Select";
display-name = "BT Select";
)
};
};

0 comments on commit 985ec32

Please sign in to comment.