diff --git a/.helix/languages.toml b/.helix/languages.toml new file mode 100644 index 000000000..d0474ef50 --- /dev/null +++ b/.helix/languages.toml @@ -0,0 +1,4 @@ +[[language]] +name = "devicetree" +file-types = ["keymap", "dts", "dtsi", "overlay"] +auto-format = true diff --git a/config/totem.keymap b/config/totem.keymap index 5d6096877..56134e301 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -71,9 +71,7 @@ MORP_SHIFT(M_FSLH, &kp FSLH, &kp BSLH) #define SYMB_RET &tlt SYMB RET #define NAVI_SPC &tlt NAVI SPACE -#define SHFT_BSP &tmt LSHFT BSPC -#define SYMB_LANG &tlt SYMB LC(SPACE) - +#define SYMB_BSPC &tlt SYMB BSPC #define A_LEFT &kp LA(LEFT) #define A_RIGHT &kp LA(RIGHT) #define A_UP &kp LA(UP) @@ -91,7 +89,7 @@ ZMK_LAYER(base_layer, /* */&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &M_COMMA &M_DOT &M_FSLH /* ╰────────────┴────────────┴────────────┴────────────┴────────────╯╰────────────┴────────────┴────────────┴────────────┴────────────╯ ╭────────────╮ ╭────────────┬────────────┬────────────╮╭────────────┬────────────┬────────────╮ ╭────────────╮ -*/SCR_PRV &none SCR_NXT SYMB_RET NAVI_SPC SHFT_BSP SYMB_LANG &kp C_PP &none &kp APOS /* +*/SCR_PRV &none SCR_NXT SYMB_RET NAVI_SPC &sk LSHFT SYMB_BSPC &kp C_PP &none &kp APOS /* ╰────────────╯ ╰────────────┴────────────┴────────────╯╰────────────┴────────────┴────────────╯ ╰────────────╯ */) @@ -124,11 +122,6 @@ ZMK_LAYER(symb_layer, /* /*=====================*/ /* Combo */ /*=====================*/ -#define COMBO_TERM_FAST 18 -#define COMBO_TERM_SLOW 30 -#define COMBO_IDLE_FAST 150 -#define COMBO_IDLE_SLOW 50 - /* ╭─────────────────────╮ ╭─────────────────────╮ │ LT4 LT3 LT2 LT1 LT0 │ │ RT0 RT1 RT2 RT3 RT4 │ @@ -137,6 +130,23 @@ ZMK_LAYER(symb_layer, /* ╰───────────╮ LH2 LH1 LH0 │ │ RH0 RH1 RH2 ╭───────────╯ ╰─────────────╯ ╰─────────────╯ */ +#define COMBO_TERM_FAST 18 +#define COMBO_TERM_SLOW 30 +#define COMBO_IDLE_FAST 150 +#define COMBO_IDLE_SLOW 50 + +/* +╭────────────┬────────────┬────────────┬────────────┬────────────╮╭────────────┬────────────┬────────────┬────────────┬────────────╮ + LT4 LT3 - LT2 + LT1 LT0 RT0 RT1 ^ RT2 $ RT3 RT4 +├────────────┼──── - ─────┼──── / ─────┼──── * ─────┼────────────┤├────────────┼─── ( { ────┼─── ) } ────┼────────────┼────────────┤ + LM4 LM3 Tab LM2 Enter LM1 Bspc LM0 RM0 % RM1 ( { RM2 ) } RM3 RM4 +├────────────┼──── / ─────┼──── * ─────┼──── f ─────┼────────────┤├────────────┼────────────┼────────────┼────────────┼────────────┤ + LB4 LB3 | LB2 & LB1 LB0 RB0 RB1 < [ RB2 > ] RB3 RB4 +╰────────────┴────────────┴────────────┴────────────┴────────────╯╰────────────┴────────────┴────────────┴────────────┴────────────╯ +╭────────────╮ ╭────────────┬────────────┬────────────╮╭────────────┬────────────┬────────────╮ ╭────────────╮ + LA0 LH2 LH1 LH0 RH0 RH1 RH2 RA0 +╰────────────╯ ╰────────────┴────────────┴────────────╯╰────────────┴────────────┴────────────╯ ╰────────────╯ +*/ ZMK_COMBO(l_amps , &kp AMPS , LT1 LT2, BASE NAVI SYMB, COMBO_TERM_FAST, COMBO_IDLE_FAST) ZMK_COMBO(l_pipe , &kp PIPE , LT2 LT3, BASE NAVI SYMB, COMBO_TERM_FAST, COMBO_IDLE_FAST) ZMK_COMBO(l_bspc , &kp BSPC , LM0 LM1, BASE NAVI SYMB, COMBO_TERM_FAST, COMBO_IDLE_FAST) @@ -161,7 +171,7 @@ ZMK_COMBO(r_rbrc , RX34(RBRC) , RM3 RM4, BASE NAVI SYMB, COMBO_TERM_FAST, CO ZMK_COMBO(r_lt , &kp LT , RB1 RB2, BASE NAVI SYMB, COMBO_TERM_FAST, COMBO_IDLE_FAST) ZMK_COMBO(r_gt , &kp GT , RB2 RB3, BASE NAVI SYMB, COMBO_TERM_FAST, COMBO_IDLE_FAST) -ZMK_COMBO(r_symb , &mo SYMB , LH0 RH0, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) +ZMK_COMBO(r_lang , &kp LC(SPACE), LH0 RH0, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) ZMK_COMBO(r_scr_tab, SCR_TAB , LA0 LH2, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) ZMK_COMBO(ble_sel_1, &bt BT_SEL 1 , LT4 LB4, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) @@ -169,3 +179,4 @@ ZMK_COMBO(ble_sel_2, &bt BT_SEL 2 , LT3 LB3, BASE NAVI SYMB, COMBO_TERM_SLOW, CO ZMK_COMBO(ble_sel_3, &bt BT_SEL 3 , LT2 LB2, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) ZMK_COMBO(ble_sel_4, &bt BT_SEL 4 , LT1 LB1, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) ZMK_COMBO(ble_clear, &bt BT_CLR , LT0 LB0, BASE NAVI SYMB, COMBO_TERM_SLOW, COMBO_IDLE_SLOW) +