Skip to content

Commit

Permalink
2.21: add better placed combo winswap; adjust outer column move bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
@SethMilliken @github-actions
SethMilliken authored and github-actions[bot] committed Dec 14, 2023
1 parent a63e8c9 commit 2fb7bec
Show file tree
Hide file tree
Showing 14 changed files with 185 additions and 74 deletions.
14 changes: 7 additions & 7 deletions config/corne.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@
window_left {
display-name = "move [L]";
bindings = <
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_next &win_quad &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &winswap &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_quad &win_next &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &kp C_POWER &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
>;
};

/* 6 Layer */
window_right {
display-name = "move [R]";
bindings = <
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_quad &win_next &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &winswap &kp C_SLEEP
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_next &win_quad &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &kp C_POWER &kp C_SLEEP
&none &none &none &none &none &none
>;
};
Expand Down
14 changes: 7 additions & 7 deletions config/corneish_zen.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,20 @@
window_left {
display-name = "move [L]";
bindings = <
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_next &win_quad &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &winswap &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_quad &win_next &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &kp C_POWER &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
>;
};

/* 6 Layer */
window_right {
display-name = "move [R]";
bindings = <
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_quad &win_next &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &winswap &kp C_SLEEP
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_next &win_quad &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &kp C_POWER &kp C_SLEEP
&none &none &none &none &none &none
>;
};
Expand Down
8 changes: 7 additions & 1 deletion config/planck_overrides.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,16 @@
&combo_swap_right {
key-positions = <19 35>;
};
&combo_winswap_left {
key-positions = <24 27>;
};
&combo_winswap_right {
key-positions = <32 35>;
};
// }}}
// BEHAVIORS {{{
&winswap {
ignored-key-positions = <0 24 11 35 19 20 21 22 44>;
ignored-key-positions = <24 27 32 35 19 20 21 22 44>;
};
&swap {
// must include activating combo keys too (15 24, 19 35) or else tri-state will complete immediately for Mac
Expand Down
12 changes: 6 additions & 6 deletions config/planck_rev6.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
window_left {
display-name = "move [L]";
bindings = <
&trans &forward &backward &tab_next &tab_prev &trans &trans &act Y &act U &act I &act O &act P
&win_next &win_quad &win_third &win_half &win_full &trans &trans &act H &act J &act K &act L &act COLON
&winswap &win_vquad &win_vthird &win_vhalf &win_screen &trans &trans &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
&trans &forward &backward &tab_next &tab_prev &trans &trans &act Y &act U &act I &act O &act P
&win_quad &win_next &win_third &win_half &win_full &trans &trans &act H &act J &act K &act L &act COLON
&kp C_POWER &win_vquad &win_vthird &win_vhalf &win_screen &trans &trans &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>;
};

Expand All @@ -88,8 +88,8 @@
display-name = "move [R]";
bindings = <
&act Q &act W &act E &act R &act T &trans &trans &tab_prev &tab_next &backward &forward &trans
&act A &act S &act D &act F &act G &trans &trans &win_full &win_half &win_third &win_quad &win_next
&act Z &act X &act C &act V &act B &trans &trans &win_screen &win_vhalf &win_vthird &win_vquad &winswap
&act A &act S &act D &act F &act G &trans &trans &win_full &win_half &win_third &win_next &win_quad
&act Z &act X &act C &act V &act B &trans &trans &win_screen &win_vhalf &win_vthird &win_vquad &kp C_POWER
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>;
};
Expand Down
26 changes: 24 additions & 2 deletions config/shared.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define VER_PATCH N0
#define VER_PATCH N1
#define VER_MINOR N2
#define VER_MAJOR N2
/* Key Positions
Expand Down Expand Up @@ -445,6 +445,18 @@
bindings = <&swap_ht 0 LG(TAB)>;
layers = <0>;
};
combo_winswap_left: combo_winswap_left {
timeout-ms = <75>;
key-positions = <25 28>;
bindings = <&winswap_ht 0 LG(TAB)>;
layers = <0>;
};
combo_winswap_right: combo_winswap_right {
timeout-ms = <75>;
key-positions = <31 34>;
bindings = <&winswap_ht 0 LG(TAB)>;
layers = <0>;
};
combo_lighting: combo_lighting {
timeout-ms = <75>;
slow-release;
Expand Down Expand Up @@ -545,6 +557,16 @@
<&swap>,
<&kp>;
};
winswap_ht: windows_swapper_with_hold_tap {
compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>;
tapping-term-ms = <300>;
quick-tap-ms = <150>;
flavor = "tap-preferred";
bindings =
<&winswap>,
<&kp>;
};
m_cr: true_cr_for_control_m {
compatible = "zmk,behavior-mod-morph";
#binding-cells = <0>;
Expand All @@ -568,7 +590,7 @@
<&kt LALT>,
<&kp TAB>,
<&kt LALT>;
ignored-key-positions = <1 25 10 34 18 19 20 21 40>;
ignored-key-positions = <1 25 28 10 31 34 18 19 20 21 40>;
ignored-layers = <0 3>;
};
swap: swapper_mac {
Expand Down
14 changes: 7 additions & 7 deletions config/splitkb_aurora_corne.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,20 @@
window_left {
display-name = "move [L]";
bindings = <
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_next &win_quad &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &winswap &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
&none &trans &forward &backward &tab_next &tab_prev &act Y &act U &act I &act O &act P &none
&kp C_POWER &win_quad &win_next &win_third &win_half &win_full &act H &act J &act K &act L &act COLON &none
&kp C_SLEEP &kp C_POWER &win_vquad &win_vthird &win_vhalf &win_screen &act N &act M &act LESS_THAN &act GREATER_THAN &act QUESTION &none
&none &none &none &none &none &none
>;
};

/* 6 Layer */
window_right {
display-name = "move [R]";
bindings = <
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_quad &win_next &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &winswap &kp C_SLEEP
&none &act Q &act W &act E &act R &act T &tab_prev &tab_next &backward &forward &trans &none
&none &act A &act S &act D &act F &act G &win_full &win_half &win_third &win_next &win_quad &kp C_POWER
&none &act Z &act X &act C &act V &act B &win_screen &win_vhalf &win_vthird &win_vquad &kp C_POWER &kp C_SLEEP
&none &none &none &none &none &none
>;
};
Expand Down
28 changes: 21 additions & 7 deletions svg/corne.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions svg/corne.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ layers:
- '&act P'
- ''
- $$mdi:power$$
- '&win_next'
- '&win_quad'
- '&win_next'
- '&win_third'
- '&win_half'
- '&win_full'
Expand All @@ -241,7 +241,7 @@ layers:
- '&act :'
- ''
- $$mdi:power-sleep$$
- '&winswap'
- $$mdi:power$$
- '&win_vquad'
- '&win_vthird'
- '&win_vhalf'
Expand Down Expand Up @@ -280,8 +280,8 @@ layers:
- '&win_full'
- '&win_half'
- '&win_third'
- '&win_quad'
- '&win_next'
- '&win_quad'
- $$mdi:power$$
- ''
- '&act Z'
Expand All @@ -293,7 +293,7 @@ layers:
- '&win_vhalf'
- '&win_vthird'
- '&win_vquad'
- '&winswap'
- $$mdi:power$$
- $$mdi:power-sleep$$
- ''
- ''
Expand Down Expand Up @@ -571,6 +571,12 @@ combos:
a: top
o: 1.05
arc_scale: 1.055
- p: [25, 28]
k: {t: LG(TAB), h: '&winswap'}
l: [araxia]
- p: [31, 34]
k: {t: LG(TAB), h: '&winswap'}
l: [araxia]
- p: [1, 10]
k: lighting
l: [araxia]
Expand Down
Loading

0 comments on commit 2fb7bec

Please sign in to comment.