Skip to content

Commit

Permalink
3.50: remove ; and / tap-dances
Browse files Browse the repository at this point in the history 
also increase `&capsy` and `&shifty` combo timeouts
  • Loading branch information
Seth Milliken committed Apr 8, 2024
1 parent d5a9fde commit d02d714
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 23 deletions.
10 changes: 6 additions & 4 deletions config/corne.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// HEADERS {{{
#include <behaviors.dtsi>
#include <behaviors/mouse_keys.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/bt.h>
Expand All @@ -21,8 +23,8 @@
display-name = "araxia";
bindings = <
&mirror_sl &lttp WIN_LEFT Q &kp W &kp E &kp R &kp T &kp Y &kp U &iI &kp O &lttp WIN_RIGHT P &macro_sl_test
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrsq RCTRL 0 &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &slashtick &dis_tog
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrmr RCTRL SEMI &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &kp SLASH &dis_tog
&mthp LGUI RETURN &lthp LNUM LC(W) &lthp SYMBOLS ESC &lthp MEDIA ESC &lttp NUMPAD SPACE &lthp MIRROR COLON
>;
};
Expand Down Expand Up @@ -132,8 +134,8 @@
display-name = "mirror";
bindings = <
&to DEFAULT &lttp WIN_RIGHT P &kp O &iI &kp U &kp Y &kp T &kp R &kp E &kp W &lttp WIN_LEFT Q &to DEFAULT
&none &hrsq RCTRL 0 &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &slashtick &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&none &hrmr RCTRL SEMI &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &kp SLASH &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&lthp DEFAULT COLON &lthp NUMPAD SPACE &lthp MEDIA ESC &lthp SYMBOLS ESC &lthp LNUM LC(W) &mthp LGUI RETURN
>;
};
Expand Down
10 changes: 6 additions & 4 deletions config/corneish_zen.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// HEADERS {{{
#include <behaviors.dtsi>
#include <behaviors/mouse_keys.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/bt.h>
Expand Down Expand Up @@ -28,8 +30,8 @@
display-name = "araxia";
bindings = <
&mirror_sl &lttp WIN_LEFT Q &kp W &kp E &kp R &kp T &kp Y &kp U &iI &kp O &lttp WIN_RIGHT P &mirror_sl
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrsq RCTRL 0 &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &slashtick &dis_tog
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrmr RCTRL SEMI &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &kp SLASH &dis_tog
&mthp LGUI RETURN &lthp LNUM LC(W) &lthp SYMBOLS ESC &lthp MEDIA ESC &lttp NUMPAD SPACE &lthp MIRROR COLON
>;
};
Expand Down Expand Up @@ -139,8 +141,8 @@
display-name = "mirror";
bindings = <
&to DEFAULT &lttp WIN_RIGHT P &kp O &iI &kp U &kp Y &kp T &kp R &kp E &kp W &lttp WIN_LEFT Q &to DEFAULT
&none &hrsq RCTRL 0 &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &slashtick &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&none &hrmr RCTRL SEMI &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &kp SLASH &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&lthp DEFAULT COLON &lthp NUMPAD SPACE &lthp MEDIA ESC &lthp SYMBOLS ESC &lthp LNUM LC(W) &mthp LGUI RETURN
>;
};
Expand Down
10 changes: 6 additions & 4 deletions config/planck_rev6.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// HEADERS {{{
#include <behaviors.dtsi>
#include <behaviors/mouse_keys.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/bt.h>
Expand All @@ -22,8 +24,8 @@
display-name = "araxia";
bindings = <
&lttp WIN_LEFT Q &kp W &kp E &kp R &kp T &kp F1 &kp F2 &kp Y &kp U &iI &kp O &lttp WIN_RIGHT P
&hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &kp F3 &point_tog &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrsq RCTRL 0
&kp Z &kp X &kp C &kp V &kp B &kp F4 &kp F5 &kp N &m_cr &kp COMMA &kp DOT &slashtick
&hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &kp F3 &point_tog &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrmr RCTRL SEMI
&kp Z &kp X &kp C &kp V &kp B &kp F4 &kp F5 &kp N &m_cr &kp COMMA &kp DOT &kp SLASH
&lttp SYMBOLS C_PP &kp F6 &mthp LGUI RETURN &lthp LNUM LC(W) &lthp SYMBOLS ESC &kp F7 &kp F8 &lthp MEDIA ESC &lttp NUMPAD SPACE &mttp MIRROR COLON &point_tog &dis_tog
>;
sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
Expand Down Expand Up @@ -141,8 +143,8 @@
display-name = "mirror";
bindings = <
&lttp WIN_RIGHT P &kp O &iI &kp U &kp Y &trans &trans &kp T &kp R &kp E &kp W &lttp WIN_LEFT Q
&hrsq RCTRL 0 &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &trans &trans &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A
&slashtick &kp DOT &kp COMMA &m_cr &kp N &trans &trans &kp B &kp V &kp C &kp X &kp Z
&hrmr RCTRL SEMI &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &trans &trans &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A
&kp SLASH &kp DOT &kp COMMA &m_cr &kp N &trans &trans &kp B &kp V &kp C &kp X &kp Z
&trans &trans &lthp DEFAULT COLON &lthp NUMPAD SPACE &lthp MEDIA ESC &trans &trans &lthp SYMBOLS ESC &lthp LNUM LC(W) &mthp LGUI RETURN &trans &trans
>;
};
Expand Down
15 changes: 8 additions & 7 deletions config/shared.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define VER_PATCH N9
#define VER_MINOR N4
#define VER_PATCH N0
#define VER_MINOR N5
#define VER_MAJOR N3

// DEFINES {{{
Expand All @@ -15,6 +15,7 @@

// Timing Defaults

#define CAPS_COMBO_MS 125
#define VERT_COMBO_MS 75
#define TRI_COMBO_MS 50
#define ROLL_COMBO_MS 25
Expand Down Expand Up @@ -584,14 +585,14 @@
layers = <DEFAULT>;
};
combo_capsy: combo_capsy {
timeout-ms = <ROLL_COMBO_MS>;
timeout-ms = <CAPS_COMBO_MS>;
slow-release;
key-positions = <16 19>;
bindings = <&capsy>;
layers = <DEFAULT>;
};
combo_shifty: combo_shifty {
timeout-ms = <ROLL_COMBO_MS>;
timeout-ms = <CAPS_COMBO_MS>;
slow-release;
key-positions = <13 22>;
bindings = <&shifty>;
Expand Down Expand Up @@ -744,7 +745,7 @@
<&kp>,
<&kp>;
};
hrsq: home_row_semi_quote {
/omit-if-no-ref/ hrsq: home_row_semi_quote {
compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>;
tapping-term-ms = <200>;
Expand Down Expand Up @@ -892,13 +893,13 @@
tapping-term-ms = <250>;
bindings = <&kp I>, <&kp LS(I)>;
};
semiquote: semicolon_single_quote_uripunc {
/omit-if-no-ref/ semiquote: semicolon_single_quote_uripunc {
compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>;
tapping-term-ms = <250>;
bindings = <&kp SEMICOLON>, <&kp SINGLE_QUOTE>, <&uripunc>;
};
slashtick: slash_backtick_trigrave {
/omit-if-no-ref/ slashtick: slash_backtick_trigrave {
compatible = "zmk,behavior-tap-dance";
#binding-cells = <0>;
tapping-term-ms = <250>;
Expand Down
10 changes: 6 additions & 4 deletions config/splitkb_aurora_corne.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// HEADERS {{{
#include <behaviors.dtsi>
#include <behaviors/mouse_keys.dtsi>
#include <behaviors/mouse_move.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/bt.h>
Expand Down Expand Up @@ -37,8 +39,8 @@
display-name = "araxia";
bindings = <
&mirror_sl &lttp WIN_LEFT Q &kp W &kp E &kp R &kp T &kp Y &kp U &iI &kp O &lttp WIN_RIGHT P &mirror_sl
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrsq RCTRL 0 &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &slashtick &dis_tog
&point_tog &hrml LCTRL A &hrml LGUI S &hrml LALT D &hrsl LSHIFT F &hrml GLOBE G &h_bs &hrsr RSHIFT J &hrmr RALT K &hrmr RGUI L &hrmr RCTRL SEMI &point_tog
&dis_tog &kp Z &kp X &kp C &kp V &kp B &kp N &m_cr &kp COMMA &kp DOT &kp SLASH &dis_tog
&mthp LGUI RETURN &lthp LNUM LC(W) &lthp SYMBOLS ESC &lthp MEDIA ESC &lttp NUMPAD SPACE &lthp MIRROR COLON
>;
//sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
Expand Down Expand Up @@ -152,8 +154,8 @@
display-name = "mirror";
bindings = <
&to DEFAULT &lttp WIN_RIGHT P &kp O &iI &kp U &kp Y &kp T &kp R &kp E &kp W &lttp WIN_LEFT Q &to DEFAULT
&none &hrsq RCTRL 0 &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &slashtick &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&none &hrmr RCTRL SEMI &hrmr RGUI L &hrmr RALT K &hrsr RSHIFT J &h_bs &hrml GLOBE G &hrsl LSHIFT F &hrml LALT D &hrml LGUI S &hrml RCTRL A &none
&none &kp SLASH &kp DOT &kp COMMA &m_cr &kp N &kp B &kp V &kp C &kp X &kp Z &none
&lthp DEFAULT COLON &lthp NUMPAD SPACE &lthp MEDIA ESC &lthp SYMBOLS ESC &lthp LNUM LC(W) &mthp LGUI RETURN
>;
};
Expand Down

0 comments on commit d02d714

Please sign in to comment.