aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Sangdahl <[email protected]>2024-07-08 10:23:55 -0600
committerJack Sangdahl <[email protected]>2024-07-08 10:23:55 -0600
commit189fe5e50fea7d3c86b2c35a867bae0fae120187 (patch)
tree1cd03253751e31e7e78f64d0f200987aa1a39071
parent12d087d778d9bc325e079e3a4fff00de65ee70db (diff)
downloadzmk_build-189fe5e50fea7d3c86b2c35a867bae0fae120187.tar.gz
zmk_build-189fe5e50fea7d3c86b2c35a867bae0fae120187.zip
update license headers and new combos
-rw-r--r--config/corne.keymap28
-rw-r--r--config/corneish_zen_v1.keymap28
-rw-r--r--config/revxlp.keymap28
-rw-r--r--config/splitkb_aurora_sweep.keymap79
-rw-r--r--config/util.h6
-rw-r--r--readme.md2
6 files changed, 90 insertions, 81 deletions
diff --git a/config/corne.keymap b/config/corne.keymap
index 5673fdf..a1dc164 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -1,4 +1,4 @@
-// Copyright 2024 jack (@waffle87)
+// Copyright 2024 [email protected]
// SPDX-License-Identifier: MIT
#include <behaviors.dtsi>
@@ -37,17 +37,19 @@
combos {
compatible = "zmk,combos";
- // name output pos.
- COMBO(ru_ent, &kp RET, 4 7)
- COMBO(dk_eql, &kp EQUAL, 15 20)
- COMBO(gh_quot, &td_quot_dquo, 17 18)
- COMBO(ty_coln, &kp COLON, 5 6)
- COMBO(bn_unds, &kp UNDER, 29 30)
- COMBO(er_cbkt, &td_cbrkt, 3 4)
- COMBO(ui_brkt, &td_brkt, 7 8)
- COMBO(ccom_plus, &kp PLUS, 27 32)
- COMBO(ei_bsls, &td_bsls_pipe, 3 8)
- COMBO(vm_mins, &td_min_dash, 28 31)
- COMBO(fj_capw, &caps_word, 16 19)
+ // name output pos.
+ COMBO(we_eqal, &kp EQUAL, 2 3)
+ COMBO(er_cbkt, &td_cbrkt, 3 4)
+ COMBO(rt_bsls, &kp BSLS, 4 5)
+ COMBO(yu_quot, &kp QUOT, 6 7)
+ COMBO(ui_brkt, &td_brkt, 7 8)
+ COMBO(io_mins, &td_min_dash, 8 9)
+ COMBO(sd_plus, &kp PLUS, 12 13)
+ COMBO(df_coln, &kp COLON, 13 14)
+ COMBO(fg_pipe, &kp PIPE, 14 15)
+ COMBO(hj_dquo, &kp DQUO, 16 17)
+ COMBO(jk_entr, &kp ENTER, 17 18)
+ COMBO(kl_unds, &kp UNDER, 18 19)
+ COMBO(fj_capw, &caps_word, 16 19)
};
};
diff --git a/config/corneish_zen_v1.keymap b/config/corneish_zen_v1.keymap
index 5673fdf..a1dc164 100644
--- a/config/corneish_zen_v1.keymap
+++ b/config/corneish_zen_v1.keymap
@@ -1,4 +1,4 @@
-// Copyright 2024 jack (@waffle87)
+// Copyright 2024 [email protected]
// SPDX-License-Identifier: MIT
#include <behaviors.dtsi>
@@ -37,17 +37,19 @@
combos {
compatible = "zmk,combos";
- // name output pos.
- COMBO(ru_ent, &kp RET, 4 7)
- COMBO(dk_eql, &kp EQUAL, 15 20)
- COMBO(gh_quot, &td_quot_dquo, 17 18)
- COMBO(ty_coln, &kp COLON, 5 6)
- COMBO(bn_unds, &kp UNDER, 29 30)
- COMBO(er_cbkt, &td_cbrkt, 3 4)
- COMBO(ui_brkt, &td_brkt, 7 8)
- COMBO(ccom_plus, &kp PLUS, 27 32)
- COMBO(ei_bsls, &td_bsls_pipe, 3 8)
- COMBO(vm_mins, &td_min_dash, 28 31)
- COMBO(fj_capw, &caps_word, 16 19)
+ // name output pos.
+ COMBO(we_eqal, &kp EQUAL, 2 3)
+ COMBO(er_cbkt, &td_cbrkt, 3 4)
+ COMBO(rt_bsls, &kp BSLS, 4 5)
+ COMBO(yu_quot, &kp QUOT, 6 7)
+ COMBO(ui_brkt, &td_brkt, 7 8)
+ COMBO(io_mins, &td_min_dash, 8 9)
+ COMBO(sd_plus, &kp PLUS, 12 13)
+ COMBO(df_coln, &kp COLON, 13 14)
+ COMBO(fg_pipe, &kp PIPE, 14 15)
+ COMBO(hj_dquo, &kp DQUO, 16 17)
+ COMBO(jk_entr, &kp ENTER, 17 18)
+ COMBO(kl_unds, &kp UNDER, 18 19)
+ COMBO(fj_capw, &caps_word, 16 19)
};
};
diff --git a/config/revxlp.keymap b/config/revxlp.keymap
index 5673fdf..a1dc164 100644
--- a/config/revxlp.keymap
+++ b/config/revxlp.keymap
@@ -1,4 +1,4 @@
-// Copyright 2024 jack (@waffle87)
+// Copyright 2024 [email protected]
// SPDX-License-Identifier: MIT
#include <behaviors.dtsi>
@@ -37,17 +37,19 @@
combos {
compatible = "zmk,combos";
- // name output pos.
- COMBO(ru_ent, &kp RET, 4 7)
- COMBO(dk_eql, &kp EQUAL, 15 20)
- COMBO(gh_quot, &td_quot_dquo, 17 18)
- COMBO(ty_coln, &kp COLON, 5 6)
- COMBO(bn_unds, &kp UNDER, 29 30)
- COMBO(er_cbkt, &td_cbrkt, 3 4)
- COMBO(ui_brkt, &td_brkt, 7 8)
- COMBO(ccom_plus, &kp PLUS, 27 32)
- COMBO(ei_bsls, &td_bsls_pipe, 3 8)
- COMBO(vm_mins, &td_min_dash, 28 31)
- COMBO(fj_capw, &caps_word, 16 19)
+ // name output pos.
+ COMBO(we_eqal, &kp EQUAL, 2 3)
+ COMBO(er_cbkt, &td_cbrkt, 3 4)
+ COMBO(rt_bsls, &kp BSLS, 4 5)
+ COMBO(yu_quot, &kp QUOT, 6 7)
+ COMBO(ui_brkt, &td_brkt, 7 8)
+ COMBO(io_mins, &td_min_dash, 8 9)
+ COMBO(sd_plus, &kp PLUS, 12 13)
+ COMBO(df_coln, &kp COLON, 13 14)
+ COMBO(fg_pipe, &kp PIPE, 14 15)
+ COMBO(hj_dquo, &kp DQUO, 16 17)
+ COMBO(jk_entr, &kp ENTER, 17 18)
+ COMBO(kl_unds, &kp UNDER, 18 19)
+ COMBO(fj_capw, &caps_word, 16 19)
};
};
diff --git a/config/splitkb_aurora_sweep.keymap b/config/splitkb_aurora_sweep.keymap
index 7dd75a1..e2e1f06 100644
--- a/config/splitkb_aurora_sweep.keymap
+++ b/config/splitkb_aurora_sweep.keymap
@@ -1,4 +1,4 @@
-// Copyright 2024 jack (@waffle87)
+// Copyright 2024 [email protected]
// SPDX-License-Identifier: MIT
#include <behaviors.dtsi>
@@ -8,46 +8,49 @@
/ {
keymap {
- compatible = "zmk,keymap";
- 0 {
- bindings = <
- &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
- HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI)
- &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
- &lt 1 ESC &kp SPACE &kp BSPC &lt 2 RS(RC(V))
- >;
+ compatible = "zmk,keymap";
+ 0 {
+ bindings = <
+ &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
+ HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI)
+ &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
+ &lt 1 ESC &kp SPACE &kp BSPC &lt 2 RS(RC(V))
+ >;
+ };
+ 1 {
+ bindings = <
+ &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
+ HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR)
+ &kp C_VOL_DN &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_VOL_UP
+ &trans &trans &trans &pnp
+ >;
+ };
+ 2 {
+ bindings = <
+ &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none
+ &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none
+ &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
+ &trans &trans &trans &trans
+ >;
+ };
};
- 1 {
- bindings = <
- &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0
- HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR)
- &kp C_VOL_DN &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_VOL_UP
- &trans &trans &trans &pnp
- >;
- };
- 2 {
- bindings = <
- &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none
- &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none
- &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
- &trans &trans &trans &trans
- >;
- };
- };
combos {
compatible = "zmk,combos";
- // name output pos.
- COMBO(ru_ent, &kp RET, 3 6)
- COMBO(dk_eql, &kp EQUAL, 12 17)
- COMBO(gh_quot, &td_quot_dquo, 14 15)
- COMBO(ty_coln, &kp COLON, 4 5)
- COMBO(bn_unds, &kp UNDER, 24 25)
- COMBO(er_cbkt, &td_cbrkt, 2 3)
- COMBO(ui_brkt, &td_brkt, 6 7)
- COMBO(ccom_plus, &kp PLUS, 22 27)
- COMBO(ei_bsls, &td_bsls_pipe, 2 7)
- COMBO(vm_mins, &td_min_dash, 23 26)
- COMBO(fj_capw, &caps_word, 13 16)
+ // name output pos.
+ COMBO(we_eqal, &kp EQUAL, 1 2)
+ COMBO(er_cbkt, &td_cbrkt, 2 3)
+ COMBO(rt_bsls, &kp BSLS, 3 4)
+ COMBO(yu_quot, &kp QUOT, 5 6)
+ COMBO(ui_brkt, &td_brkt, 6 7)
+ COMBO(io_mins, &td_min_dash, 7 8)
+ COMBO(sd_plus, &kp PLUS, 11 12)
+ COMBO(df_coln, &kp COLON, 12 13)
+ COMBO(fg_pipe, &kp PIPE, 13 14)
+ COMBO(hj_dquo, &kp DQUO, 15 16)
+ COMBO(jk_entr, &kp ENTER, 16 17)
+ COMBO(kl_unds, &kp UNDER, 17 18)
+ COMBO(fj_capw, &caps_word, 15 18)
+
};
};
diff --git a/config/util.h b/config/util.h
index 640b1d5..a658ea1 100644
--- a/config/util.h
+++ b/config/util.h
@@ -1,6 +1,7 @@
-// Copyright 2024 jack (@waffle87)
+// Copyright 2024 [email protected]
// SPDX-License-Identifier: MIT
+// clang-format off
#define COMBO(name, keypress, keypos) \
combo_##name { \
timeout-ms = <50>; \
@@ -43,8 +44,6 @@ td_##name: name { \
tapping-term-ms = <210>;
bindings = <&kp C_PLAY>, <&kp C_NEXT>, <&kp C_PREV>;
};
- TAP_DANCE(bsls_pipe, &kp BSLH, &kp PIPE)
- TAP_DANCE(quot_dquo, &kp SQT, &kp DQT)
TAP_DANCE(cbrkt, &kp LBRC, &kp RBRC)
TAP_DANCE(brkt, &kp LBKT, &kp RBKT)
TAP_DANCE(min_dash, &kp MINUS, &emdash)
@@ -67,3 +66,4 @@ td_##name: name { \
};
};
};
+// clang-format on
diff --git a/readme.md b/readme.md
index d802568..68e99be 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
### zmk build repository
my [zmk](https://zmk.dev) configuration & keyboard code
-![keyboard](https://i.imgur.com/bCRPsDyh.jpg)
+![keyboard](https://i.imgur.com/bCRPsDy.jpg)
### misc
* [`util.h`](util.h) contains some simple c macros for combos, 2-key tap dance, & home-row mods.