diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 0284568..4d81215 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -12,10 +12,8 @@ /* Layers */ #define DEF_L 0 #define NAV_L 1 -#define UPP_L 2 -#define SYM_L 3 -#define NUM_L 4 -#define EXL_L 5 +#define SYM_L 2 +#define NUM_L 3 /* Behavior Settings */ &caps_word { @@ -33,92 +31,6 @@ macros { #include "macros.dtsi" }; - ZMK_MACRO(mo_nav, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo NAV_L> - , <¯o_pause_for_release> - , <¯o_release &mo NAV_L>;) - - ZMK_MACRO(mo_upp, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo UPP_L> - , <¯o_pause_for_release> - , <¯o_release &mo UPP_L>;) - - ZMK_MACRO(leq, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp LT &kp EQUAL>;) - - ZMK_MACRO(eq, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp EQUAL &kp EQUAL>;) - - ZMK_MACRO(geq, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp GT &kp EQUAL>;) - - ZMK_MACRO(neq, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp EXCL &kp EQUAL>;) - - ZMK_MACRO(gprev, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp SPACE &kp M &kp P>;) - - ZMK_MACRO(gnext, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp SPACE &kp M &kp N>;) - - ZMK_MACRO(pprev, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp SPACE &kp O &kp B>;) - - ZMK_MACRO(pnext, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp SPACE &kp O &kp F>;) - - ZMK_MACRO(neoclip, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp SPACE &kp O &kp Y>;) - - ZMK_MACRO(arrow, - wait-ms = <30>; - tap-ms = <40>; - bindings = <&kp MINUS &kp GT>;) - - ZMK_MACRO(mo_sym, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo SYM_L> - , <¯o_pause_for_release> - , <¯o_release &mo SYM_L>;) - - ZMK_MACRO(mo_exl, - wait-ms = <0>; - tap-ms = <0>; - bindings - = <¯o_tap &kp K_CANCEL> - , <¯o_press &mo EXL_L> - , <¯o_pause_for_release> - , <¯o_release &mo EXL_L>;) - combos { compatible = "zmk,combos"; @@ -144,14 +56,14 @@ macros { COMBO(forward_slash, &kp FSLH, 19 20, DEF_L) /* Brackets */ - COMBO(left_bracket, &kp LBKT, 0 9, DEF_L UPP_L SYM_L NUM_L) - COMBO(right_bracket, &kp RBKT, 7 16, DEF_L UPP_L SYM_L NUM_L) - COMBO(left_parenthesis, &kp LPAR, 1 10, DEF_L UPP_L SYM_L NUM_L) - COMBO(right_parenthesis, &kp RPAR, 6 15, DEF_L UPP_L SYM_L NUM_L) - COMBO(left_brace, &kp LBRC, 2 11, DEF_L UPP_L SYM_L NUM_L) - COMBO(right_brace, &kp RBRC, 5 14, DEF_L UPP_L SYM_L NUM_L) - COMBO(less_than, &kp LT, 3 12, DEF_L UPP_L SYM_L NUM_L) - COMBO(grather_than, &kp GT, 4 13, DEF_L UPP_L SYM_L NUM_L) + COMBO(left_bracket, &kp LBKT, 0 9, DEF_L SYM_L NUM_L) + COMBO(right_bracket, &kp RBKT, 7 16, DEF_L SYM_L NUM_L) + COMBO(left_parenthesis, &kp LPAR, 1 10, DEF_L SYM_L NUM_L) + COMBO(right_parenthesis, &kp RPAR, 6 15, DEF_L SYM_L NUM_L) + COMBO(left_brace, &kp LBRC, 2 11, DEF_L SYM_L NUM_L) + COMBO(right_brace, &kp RBRC, 5 14, DEF_L SYM_L NUM_L) + COMBO(less_than, &kp LT, 3 12, DEF_L SYM_L NUM_L) + COMBO(grather_than, &kp GT, 4 13, DEF_L SYM_L NUM_L) /* Convenience */ COMBO(lshift, &sk LSHFT, 9 10, DEF_L) @@ -170,13 +82,6 @@ macros { }; - conditional_layers { - compatible = "zmk,conditional-layers"; - tri_layer { - if-layers = ; - then-layer = ; - }; - }; keymap { compatible = "zmk,keymap"; @@ -207,19 +112,6 @@ macros { >; }; - upper_layer { - label = "Upp"; - bindings = < - // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &kp LS(P) &kp LS(U) &kp LS(O) &kp LS(K) &kp LS(B) &kp LS(D) &kp LS(R) &kp LS(F) - &kp LS(W) &kp LS(I) &kp LS(E) &kp LS(A) &kp GT &kp LS(G) &kp LS(T) &kp LS(N) &kp LS(S) &kp LS(H) - &kp LS(J) &kp LS(Y) &kp DQT &kp LT &kp LS(M) &kp LS(L) &kp LS(C) &kp LS(Q) - // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ - &trans &kp LS(SPACE) &trans &trans - // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ - >; - }; - sym_layer { label = "Sym"; bindings = < @@ -246,17 +138,5 @@ macros { >; }; - exl_layer { - label = "Exl"; - bindings = < - // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &none &none &none &none &exl_nav_beg &exl_sel_row &exl_cmt_ins &exl_sel_col - &none &none &none &none &none &exl_nav_end &exl_sel_pre &kp F2 &exl_sel_dep &exl_auto_sum - &none &none &none &none &exl_cur_fmt &exl_pct_fmt &exl_num_fmt &none - // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ - &none &none &exl_rpt_act &exl_tgl_df - // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ - >; - }; }; };