ficd/zmk
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Adaptive double-space a la iOS"

Browse source 
This reverts commit 548231cee3.
This commit is contained in:
urob 2023-05-11 23:10:52 -04:00
parent 548231cee3
commit 2364d03fae
2 changed files with 40 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

36
config/base.keymap
View file

@ -18,7 +18,6 @@
#define SYS 4 #define SYS 4
#define UC 5 #define UC 5
#define MOUSE 6 #define MOUSE 6
#define SPACE_LAYER 7
#include "combos.dtsi" // requires layer aliases #include "combos.dtsi" // requires layer aliases
#include "mouse.dtsi" #include "mouse.dtsi"
@ -32,7 +31,7 @@
#define QUICK_TAP_MS 175 #define QUICK_TAP_MS 175
&sk { // sticky-key config &sk { // sticky-key config
release-after-ms = <1200>; // release after 1.2s release-after-ms = <600>; // release after 0.6s
quick-release; // no double capitalization when rolling keys quick-release; // no double capitalization when rolling keys
}; };
@ -181,7 +180,7 @@ ZMK_BEHAVIOR(qexcl, mod_morph,
mods = <(MOD_LSFT|MOD_RSFT)>; mods = <(MOD_LSFT|MOD_RSFT)>;
) )
// tap: space | double-tap: dot -> space -> sticky shift | shift + tap: protected space | hold: activate layer // tap: space | shift + tap: dot -> space -> sticky shift | hold: activate layer
ZMK_BEHAVIOR(lt_spc, hold_tap, ZMK_BEHAVIOR(lt_spc, hold_tap,
flavor = "balanced"; flavor = "balanced";
tapping-term-ms = <200>; tapping-term-ms = <200>;
@ -189,28 +188,13 @@ ZMK_BEHAVIOR(lt_spc, hold_tap,
bindings = <&mo>, <&spc_morph>; bindings = <&mo>, <&spc_morph>;
) )
ZMK_BEHAVIOR(spc_morph, mod_morph, ZMK_BEHAVIOR(spc_morph, mod_morph,
bindings = <&spc_layer>, <&kp SPACE>; bindings = <&kp SPACE>, <&dot_spc>;
mods = <(MOD_LSFT|MOD_RSFT)>;
)
ZMK_BEHAVIOR(spc_layer, macro,
wait-ms = <0>;
tap-ms = <5>;
bindings = <&kp SPACE &sl SPACE_LAYER>;
)
ZMK_BEHAVIOR(lt_spc2, hold_tap,
flavor = "balanced";
tapping-term-ms = <200>;
quick-tap-ms = <QUICK_TAP_MS>;
bindings = <&mo>, <&spc_morph2>;
)
ZMK_BEHAVIOR(spc_morph2, mod_morph,
bindings = <&dot_spc>, <&kp SPACE>;
mods = <(MOD_LSFT|MOD_RSFT)>; mods = <(MOD_LSFT|MOD_RSFT)>;
) )
ZMK_BEHAVIOR(dot_spc, macro, ZMK_BEHAVIOR(dot_spc, macro,
wait-ms = <0>; wait-ms = <0>;
tap-ms = <5>; tap-ms = <5>;
bindings = <&kp BSPC &kp DOT &kp SPACE &sk LSHIFT>; bindings = <&kp DOT &kp SPACE &sk LSHFT>;
) )
// tap: backspace | lshft + tap: delete | rshft + tap: shift-delete // tap: backspace | lshft + tap: delete | rshft + tap: shift-delete
@ -339,16 +323,4 @@ ZMK_LAYER(mouse,
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ //╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
) )
ZMK_LAYER(space,
//╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮
X_LT ___ ___ ___ ___ ___ X_MT ___ ___ ___ ___ ___ X_RT
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LM ___ ___ ___ ___ ___ X_MM ___ ___ ___ ___ ___ X_RM
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LB ___ ___ ___ ___ ___ X_MB ___ ___ ___ ___ ___ X_RB
//├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
X_LH &lt_spc2 NAV 0 ___ X_MH ___ ___ X_RH
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)
/* vim: set ft=c tw=174: */ /* vim: set ft=c tw=174: */

72
config/combos.dtsi
View file

@ -21,53 +21,53 @@
#define HRC_RPAR &hmr_rpar_gt LA(LCTRL) 0 #define HRC_RPAR &hmr_rpar_gt LA(LCTRL) 0
/* Horizontal combos - left hand */ /* Horizontal combos - left hand */
ZMK_COMBO(esc, &kp ESC, LT3 LT2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(esc, &kp ESC, LT3 LT2, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(ret, &kp RETURN, LT2 LT1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(ret, &kp RETURN, LT2 LT1, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(mouse, &smart_mouse, LT3 LT1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(mouse, &smart_mouse, LT3 LT1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(tab, HRC_TAB, LM3 LM2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(tab, HRC_TAB, LM3 LM2, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(repeat,HRC_REPEAT, LM2 LM1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(repeat,HRC_REPEAT, LM2 LM1, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(cut, &kp LC(X), LB3 LB1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(cut, &kp LC(X), LB3 LB1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(copy, &kp LC(INS), LB3 LB2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(copy, &kp LC(INS), LB3 LB2, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(paste, &kp LS(INS), LB2 LB1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(paste, &kp LS(INS), LB2 LB1, DEF NAV NUM, COMBO_TERM_FAST)
/* Horizontal combos - right hand */ /* Horizontal combos - right hand */
ZMK_COMBO(bspc, &kp BSPC, RT1 RT2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(bspc, &kp BSPC, RT1 RT2, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(del, &kp DEL, RT2 RT3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(del, &kp DEL, RT2 RT3, DEF NAV NUM, COMBO_TERM_FAST)
ZMK_COMBO(lpar, HRC_LPAR, RM1 RM2, DEF NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(lpar, HRC_LPAR, RM1 RM2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(rpar, HRC_RPAR, RM2 RM3, DEF NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(rpar, HRC_RPAR, RM2 RM3, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(lt, &kp LT, RM1 RM2, NAV SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(lt, &kp LT, RM1 RM2, NAV , COMBO_TERM_FAST)
ZMK_COMBO(gt, &kp GT, RM2 RM3, NAV SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(gt, &kp GT, RM2 RM3, NAV , COMBO_TERM_FAST)
ZMK_COMBO(lbkt, &kp LBKT, RB1 RB2, DEF NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(lbkt, &kp LBKT, RB1 RB2, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(rbkt, &kp RBKT, RB2 RB3, DEF NUM SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(rbkt, &kp RBKT, RB2 RB3, DEF NUM, COMBO_TERM_FAST)
ZMK_COMBO(lbrc, &kp LBRC, RB1 RB2, NAV SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(lbrc, &kp LBRC, RB1 RB2, NAV , COMBO_TERM_FAST)
ZMK_COMBO(rbrc, &kp RBRC, RB2 RB3, NAV SPACE_LAYER, COMBO_TERM_FAST) ZMK_COMBO(rbrc, &kp RBRC, RB2 RB3, NAV , COMBO_TERM_FAST)
ZMK_COMBO(grk, &sl UC, RT1 RT3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(grk, &sl UC, RT1 RT3, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(cpgrk, &sls 0, RT1 RT2 RT3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(cpgrk, &sls 0, RT1 RT2 RT3, DEF NAV NUM, COMBO_TERM_SLOW)
/* Vertical combos - left hand */ /* Vertical combos - left hand */
ZMK_COMBO(at, &kp AT, LT3 LM3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(at, &kp AT, LT3 LM3, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(hash, &kp HASH, LT2 LM2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(hash, &kp HASH, LT2 LM2, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(dllr, &kp DLLR, LT1 LM1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(dllr, &kp DLLR, LT1 LM1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(prcnt, &kp PRCNT, LT0 LM0, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(prcnt, &kp PRCNT, LT0 LM0, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(grave, &kp GRAVE, LM3 LB3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(grave, &kp GRAVE, LM3 LB3, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(bslh, &kp BSLH, LM2 LB2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(bslh, &kp BSLH, LM2 LB2, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(equal, &kp EQUAL, LM1 LB1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(equal, &kp EQUAL, LM1 LB1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(tilde, &kp TILDE, LM0 LB0, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(tilde, &kp TILDE, LM0 LB0, DEF NAV NUM, COMBO_TERM_SLOW)
/* Vertical combos - right hand */ /* Vertical combos - right hand */
ZMK_COMBO(caret, &kp CARET, RT0 RM0, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(caret, &kp CARET, RT0 RM0, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(plus, &kp PLUS, RT1 RM1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(plus, &kp PLUS, RT1 RM1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(star, &kp STAR, RT2 RM2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(star, &kp STAR, RT2 RM2, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(amps, &kp AMPS, RT3 RM3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(amps, &kp AMPS, RT3 RM3, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(under, &kp UNDER, RM0 RB0, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(under, &kp UNDER, RM0 RB0, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(minus, &kp MINUS, RM1 RB1, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(minus, &kp MINUS, RM1 RB1, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(fslh, &kp FSLH, RM2 RB2, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(fslh, &kp FSLH, RM2 RB2, DEF NAV NUM, COMBO_TERM_SLOW)
ZMK_COMBO(pipe, &kp PIPE, RM3 RB3, DEF NAV NUM SPACE_LAYER, COMBO_TERM_SLOW) ZMK_COMBO(pipe, &kp PIPE, RM3 RB3, DEF NAV NUM, COMBO_TERM_SLOW)