zmk_build

commit 1e5622a23c9fac7d0ab388dfdcae7ad983070c6d
parent 99b637aaec57ca06bd70e1bbfeb2cf1eebfe09d1
Author: Jack Sangdahl <jack@pngu.org>
Date:   Wed, 17 Dec 2025 10:53:22 -0700

Layout updates to reflect recent changes

Diffstat:
M
build.sh
 | 
5
+++--
M
config/flake.keymap
 | 
47
++++++++++++++++++++++-------------------------
M
config/revxlp.keymap
 | 
52
+++++++++++++++++++++++++---------------------------
M
config/util.h
 | 
14
+++++++++++---

4 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/build.sh b/build.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
-ZMK_DIR=~/git/zmk
 RED=$(tput setaf 1)
 GREEN=$(tput setaf 2)
 YELLOW=$(tput setaf 3)
 BLUE=$(tput setaf 4)
 BOLD=$(tput bold)
 NORMAL=$(tput sgr0)
-source $ZMK_DIR/.venv/bin/activate
 set -e
 
+ZMK_DIR=$HOME/git/zmk
+source $ZMK_DIR/.venv/bin/activate
+
 build() {
     printf "building ${GREEN}$1${NORMAL} for ${BLUE}$2${NORMAL}...\n"
     (cd $ZMK_DIR/app
diff --git a/config/flake.keymap b/config/flake.keymap
@@ -10,25 +10,32 @@
     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
-          &none &none  &updir  &lt 1 ESC  &kp SPACE &kp BSPC  &lt 2 RS(RC(V)) &pnp  &none &none
+          &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
+          &none &none  &none  &lt 1 ESC  &kp SPACE &kp BSPC  &mo 2 &none  &none &none
         >;
       };
       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 &trans &trans &trans &trans &trans &trans &trans
-
+          &kp  N1    &kp N2 &kp N3 &kp N4    &kp N5           &kp N6    &kp  N7   &kp N8     &kp N9     &kp N0
+          HRML(X,        X,      X,     X) &kp TAB        &kp LEFT HRMR(DOWN,    UP,     RIGHT,      CAPS)
+          &kp  C_VOL_DN &trans &trans &trans &trans        &trans  &trans &trans     &trans  &kp C_VOL_UP
+          &trans &trans &trans &trans &trans &trans &mo 3 &trans &trans &trans
         >;
       };
       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 GRAVE &leq &geq  &td_min_dash   &kp PIPE        &kp CARET  &kp LBRC  &kp RBRC  &kp DLLR  &kp BSLH 
+          &kp EXCL  &kp STAR &kp FSLH  &kp EQUAL  &kp AMPS        &kp HASH  &kp LPAR  &kp RPAR  &kp SQT  &kp DQT
+          &kp TILDE &kp PLUS     &kp LBKT &kp RBKT &kp PRCNT       &kp AT &kp COLON &trans &trans &trans
+          &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+        >;
+      };
+      3 {
+        bindings = <
+          &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  &bootloader
           &kp F1      &kp F2     &kp F3 &kp F4 &kp F5       &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
           &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
         >;
@@ -37,20 +44,10 @@
 
   combos {
     compatible = "zmk,combos";
-      //    name     output        pos.
-      COMBO(we_eqal, &kp EQUAL,    1 2)
-      COMBO(er_cbkt, &td_cbrkt,    2 3)
-      COMBO(rt_bsls, &kp BSLH,     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 DQT,      15 16)
-      COMBO(jk_entr, &kp ENTER,    16 17)
-      COMBO(kl_unds, &kp UNDER,    17 18)
-      COMBO(fj_capw, &caps_word,   13 16)
+      //    name     output      pos.
+      COMBO(df_unds, &kp UNDER,  12 13)
+      COMBO(jk_entr, &kp ENTER,  16 17)
+      COMBO(fj_capw, &caps_word, 13 16)
 
   };
 };
diff --git a/config/revxlp.keymap b/config/revxlp.keymap
@@ -10,45 +10,43 @@
     compatible = "zmk,keymap";
       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  &trans
-                     &updir &lt 1 ESC &kp SPACE      &kp BSPC &lt 2 RS(RC(V)) &pnp
+          &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
+          &none  &lt 1 ESC  &kp SPACE &kp BSPC  &mo 2 &none
         >;
       };
       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
-          &trans &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
-                                                 &none &trans &none      &none &none &none
+          &kp  N1    &kp N2 &kp N3 &kp N4    &kp N5           &kp N6    &kp  N7   &kp N8     &kp N9     &kp N0
+          HRML(X,        X,      X,     X) &kp TAB        &kp LEFT HRMR(DOWN,    UP,     RIGHT,      CAPS)
+          &kp  C_VOL_DN &trans &trans &trans &trans        &trans  &trans &trans     &trans  &kp C_VOL_UP
+          &trans &trans &trans &trans &mo 3 &trans
         >;
       };
       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
-          &trans &kp F1      &kp F2     &kp F3 &kp F4 &kp F5      &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
-                                           &none &none &none      &none &trans &none
+          &kp GRAVE &leq &geq  &td_min_dash   &kp PIPE        &kp CARET  &kp LBRC  &kp RBRC  &kp DLLR  &kp BSLH 
+          &kp EXCL  &kp STAR &kp FSLH  &kp EQUAL  &kp AMPS        &kp HASH  &kp LPAR  &kp RPAR  &kp SQT  &kp DQT
+          &kp TILDE &kp PLUS     &kp LBKT &kp RBKT &kp PRCNT       &kp AT &kp COLON &trans &trans &trans
+          &trans &trans &trans &trans &trans &trans
         >;
       };
-  };
+      3 {
+        bindings = <
+          &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  &bootloader
+          &kp F1      &kp F2     &kp F3 &kp F4 &kp F5       &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
+          &trans &trans &trans &trans &trans &trans
+        >;
+      };
+    };
 
   combos {
     compatible = "zmk,combos";
-      //    name     output        pos.
-      COMBO(we_eqal, &kp EQUAL,    2 3)
-      COMBO(er_cbkt, &td_cbrkt,    3 4)
-      COMBO(rt_bsls, &kp BSLH,     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,     14 15)
-      COMBO(df_coln, &kp COLON,    15 16)
-      COMBO(fg_pipe, &kp PIPE,     16 17)
-      COMBO(hj_dquo, &kp DQT,      18 19)
-      COMBO(jk_entr, &kp ENTER,    19 20)
-      COMBO(kl_unds, &kp UNDER,    20 21)
-      COMBO(fj_capw, &caps_word,   16 19)
+      //    name     output      pos.
+      COMBO(df_unds, &kp UNDER,  15 16)
+      COMBO(jk_entr, &kp ENTER,  19 20)
+      COMBO(fj_capw, &caps_word, 16 19)
   };
 };
diff --git a/config/util.h b/config/util.h
@@ -41,9 +41,7 @@ td_##name: name {                        \
       tapping-term-ms = <210>;
       bindings = <&kp C_PLAY>, <&kp C_NEXT>, <&kp C_PREV>;
     };
-    TAP_DANCE(cbrkt,     &kp LBRC, &kp RBRC, &none)
-    TAP_DANCE(brkt,      &kp LBKT, &kp RBKT, &none)
-    TAP_DANCE(min_dash,  &kp MINUS, &dbl_min, &emdash)
+    TAP_DANCE(min_dash, &kp MINUS, &dbl_min, &emdash)
   };
 
   macros {
@@ -52,6 +50,16 @@ td_##name: name {                        \
       #binding-cells = <0>;
       bindings = <&macro_tap &kp DOT &kp DOT &kp FSLH>;
     };
+    leq: leq {
+      compatible = "zmk,behavior-macro";
+      #binding-cells = <0>;
+      bindings = <&macro_tap &kp LT &kp EQUAL>;
+    }
+    geq: geq {
+      compatible = "zmk,behavior-macro";
+      #binding-cells = <0>;
+      bindings = <&macro_tap &kp GT &kp EQUAL>;
+    }
     dbl_min: dbl_min {
       compatible = "zmk,behavior-macro";
       #binding-cells = <0>;