aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack <[email protected]>2023-02-10 23:18:51 -0700
committerjack <[email protected]>2023-02-10 23:18:51 -0700
commitfef77eb5ea08264bb12c984c9ffd6ae486798475 (patch)
treec4f1395ce1df9e7a5590fcfde701262933c0fb53
parent7a4c3f536b526d50b11ad19b5a129c5281c72212 (diff)
downloadzmk_build-fef77eb5ea08264bb12c984c9ffd6ae486798475.tar.gz
zmk_build-fef77eb5ea08264bb12c984c9ffd6ae486798475.zip
omit udisksctl usage (manually mount)
clean up keymap & remove colemak finally add readme rofl
-rwxr-xr-xbuild.sh9
-rw-r--r--config/corne.keymap45
-rw-r--r--readme.md10
-rw-r--r--util.h11
4 files changed, 37 insertions, 38 deletions
diff --git a/build.sh b/build.sh
index e2a18db..0f729d6 100755
--- a/build.sh
+++ b/build.sh
@@ -28,13 +28,14 @@ build() {
flash() {
read -p "flash? (y/n) " -n 1 -r
if [[ $REPLY =~ ^[Yy]$ ]]; then
- udisksctl mount -b /dev/sdb
- cp ~/$1.uf2 /run/media/jack/$2
+ sleep 10
+ sudo mount /dev/sdb /tmp/disk
+ cp ~/$1.uf2 /tmp/disk/$2
echo "success :^)"
if (( $3 )); then
sleep 30
- udisksctl mount -b /dev/sdb
- cp ~/$4.uf2 /run/media/jack/$2
+ sudo mount /dev/sdb /tmp/disk
+ cp ~/$4.uf2 /tmp/disk/$2
echo "success :^)"
fi
fi
diff --git a/config/corne.keymap b/config/corne.keymap
index 7afad1d..2e41a34 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -13,23 +13,15 @@
/ {
keymap {
compatible = "zmk,keymap";
- qwerty {
+ 0 {
bindings = <
&none &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &none
&none HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) &none
&none &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &none
- &updir &lt 2 ESC &kp SPACE &kp BSPC &lt 3 RS(RC(V)) &pnp
+ &updir &lt 1 ESC &kp SPACE &kp BSPC &lt 2 RS(RC(V)) &pnp
>;
};
- colemak {
- bindings = <
- &trans &kp Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SEMI &trans
- &trans HRML(A, R, S, T) &kp D &kp H HRMR(N, E, I, O) &trans
- &trans &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &trans
- &trans &trans &trans &trans &trans &trans
- >;
- };
- 2 {
+ 1 {
bindings = <
&trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans
&trans HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR) &trans
@@ -37,7 +29,7 @@
&none &trans &none &none &none &none
>;
};
- 3 {
+ 2 {
bindings = <
&trans &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none &trans
&trans &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none &trans
@@ -52,7 +44,7 @@
compatible = "zmk,behavior-hold-tap";
label = "HOMEROW_MODS";
#binding-cells = <2>;
- tapping-term-ms = <140>;
+ tapping-term-ms = <130>;
quick_tap_ms = <0>;
flavor = "tap-preferred";
bindings = <&kp>, <&kp>;
@@ -83,20 +75,17 @@
combos {
compatible = "zmk,combos";
- // name output pos. layer
- COMBO(ru_ent, &kp RET, 4 7, 0 1)
- COMBO(dk_eql, &kp EQUAL, 15 20, 0 1)
- COMBO(gh_quot, &td_quot_dquo, 17 18, 0 1)
- COMBO(vm_ques, &kp QMARK, 28 31, 0 1)
- COMBO(ty_coln, &kp COLON, 5 6, 0 1)
- COMBO(bn_unds, &kp UNDER, 29 30, 0 1)
- COMBO(er_cbkt, &td_cbrkt, 3 4, 0 1)
- COMBO(ui_brkt, &td_brkt, 7 8, 0 1)
- COMBO(sl_plus, &kp PLUS, 14 21, 0 1)
- COMBO(ei_bsls, &td_bsls_pipe, 3 8, 0 1)
- COMBO(wo_mins, &kp MINUS, 2 9, 0 1)
- COMBO(fj_capw, &caps_word, 16 19, 0 1)
- COMBO(qp_clmk, &tog 1, 1 10, 0)
- COMBO(qp_qwrt, &tog 0, 1 10, 1)
+ // 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, &kp MINUS, 28 31)
+ COMBO(fj_capw, &caps_word, 16 19)
};
};
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..941681c
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,10 @@
+### zmk build repository
+my [zmk](https://zmk.dev) configuration & keyboard code!
+
+![keyboard](https://i.imgur.com/4kl6spPh.jpg)
+
+### misc
+* [`util.h`](util.h) contains some simple macros for combos, 2-key tap dance, & home-row mods.
+* [`build.sh`](build.sh) is a (convolute) script to build and flash firmware.\
+coincidentally, my primary zmk keyboards use an identical layout, so the necessary files can be temporarily copied over at build time
+* **layout** is near identical to my layout [here (keymapdb)](https://keymapdb.com/keymaps/waffle87), sans a couple things line unicode
diff --git a/util.h b/util.h
index 75da5eb..e8b33a9 100644
--- a/util.h
+++ b/util.h
@@ -1,12 +1,11 @@
// Copyright 2022 jack (@waffle87)
// SPDX-License-Identifier: MIT
-#define COMBO(name, keypress, keypos, layer) \
-combo_##name { \
- layers = <layer>; \
- timeout-ms = <50>; \
- bindings = <keypress>; \
- key-positions = <keypos>; \
+#define COMBO(name, keypress, keypos) \
+combo_##name { \
+ timeout-ms = <50>; \
+ bindings = <keypress>; \
+ key-positions = <keypos>; \
};
#define TAP_DANCE(name, keypress1, keypress2) \