tidy up for main

This reverts commit 84c7f2a043.

.github/workflows/build.yml

@@ -9,10 +9,14 @@ jobs:
       image: zmkfirmware/zmk-build-arm:stable
     name: Build
     steps:
+      - name: Install Dependencies
+        run: apt update; apt install -y nodejs ssh
+      - name: Setup Node
+        uses: actions/setup-node@v3
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Cache west modules
-        uses: actions/cache@v2
+        uses: https://github.com/actions/cache@v2
         env:
           cache-name: cache-zephyr-modules
         with:
@@ -33,26 +37,36 @@ jobs:
         run: west update
       - name: West Zephyr export
         run: west zephyr-export
+
       - name: West Build (Corne Left)
         run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
       - name: Corne Left Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
-      - name: Rename zmk.uf2
+    # - name: Rename zmk.uf2
-        run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
-      - name: Archive (Corne Left)
+    # - name: Archive (Corne Left)
-        uses: actions/upload-artifact@v2
+    #   uses: https://github.com/actions/upload-artifact@v3
-        with:
+    #   with:
-          name: firmware
+    #     name: firmware
-          path: corne_left_nice_nano_v2.uf2
+    #     path: corne_left_nice_nano_v2.uf2
+
       - name: West Build (Corne Right)
         run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
-
       - name: Corne Right Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
-      - name: Rename zmk.uf2
+    # - name: Rename zmk.uf2
-        run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
-      - name: Archive (Corne Right)
+    # - name: Archive (Corne Right)
-        uses: actions/upload-artifact@v2
+    #   uses: https://github.com/actions/upload-artifact@v3
-        with:
+    #   with:
-          name: firmware
+    #     name: firmware
-          path: corne_right_nice_nano_v2.uf2
+    #     path: corne_right_nice_nano_v2.uf2
+    #       - name: Release
+
+    # - name: Upload artifacts as release
+    #   uses: https://github.com/softprops/action-gh-release@v1
+    #   if: startsWith(github.ref, 'refs/tags/')
+    #   with:
+    #     files: |
+    #       corne_left_nice_nano_v2.uf2
+    #       corne_right_nice_nano_v2.uf2

config/corne.conf

@@ -10,3 +10,5 @@ CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_TIMEOUT=30000
 # Sleep timeout to 15 minutes
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
+
+CONFIG_ZMK_USB_LOGGING=y

config/corne.keymap

@@ -9,96 +9,15 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 
-#define DEFAULT 0
+&sl {
-#define LOWER  1
+    release-after-ms = <1000>;
-#define ADJUST 2
+};
 
 &sk {
     quick-release;
 };
 
 / {
-    behaviors {
-        td_i3_workspace: tap_dance_0 {
-            compatible = "zmk,behavior-tap-dance";
-            label = "TAP_DANCE_0";
-            #binding-cells = <0>;
-            tapping-term-ms = <160>;
-            bindings = <&kp LGUI>, <&sl 2>;
-        };
-    };
-    macros {
-        i3_ws_0: i3_ws_0 {
-            label = "ZM_i3_ws_0";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 0>;
-        };
-        i3_ws_1: i3_ws_1 {
-            label = "ZM_i3_ws_1";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 1>;
-        };
-        i3_ws_2: i3_ws_2 {
-            label = "ZM_i3_ws_2";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 2>;
-        };
-        i3_ws_3: i3_ws_3 {
-            label = "ZM_i3_ws_3";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 3>;
-        };
-        i3_ws_4: i3_ws_4 {
-            label = "ZM_i3_ws_4";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 4>;
-        };
-        i3_ws_5: i3_ws_5 {
-            label = "ZM_i3_ws_5";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 5>;
-        };
-        i3_ws_6: i3_ws_6 {
-            label = "ZM_i3_ws_6";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 6>;
-        };
-        i3_ws_7: i3_ws_7 {
-            label = "ZM_i3_ws_7";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 7>;
-        };
-        i3_ws_8: i3_ws_8 {
-            label = "ZM_i3_ws_8";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 8>;
-        };
-        i3_ws_9: i3_ws_9 {
-            label = "ZM_i3_ws_9";
-            compatible = "zmk,behavior-macro";
-            #binding-cells = <0>;
-            bindings
-                = <&kp LGUI &kp 9>;
-        };
-    };
     keymap {
         compatible = "zmk,keymap";
 
@@ -106,8 +25,8 @@
             bindings = <
   &kp ESC  &kp Q  &kp W     &kp E      &kp R      &kp T       &kp Y     &kp U      &kp I    &kp O     &kp P  &kp LBKT
  &sk CAPS  &kp A  &kp S     &kp D      &kp F      &kp G       &kp H     &kp J      &kp K    &kp L  &kp SEMI  &kp SQT
-&sk LSHFT  &kp Z  &kp X     &kp C      &kp V      &kp B       &kp N     &kp M  &kp COMMA  &kp DOT  &kp FSLH  &sk RSHIFT
+&sk LSHFT  &kp Z  &kp X     &kp C      &kp V      &kp B       &kp N     &kp M  &kp COMMA  &kp DOT  &kp FSLH  &mo 1
-                  &td_i3_workspace &sk LCTRL  &kp SPACE       &kp LC(BSPC)  &sk RALT      &mo 1
+                         &kp LGUI  &sk LCTRL  &kp SPACE       &kp LC(LALT)  &sl 2  &sk LALT
             >;
         };
 
@@ -115,16 +34,26 @@
             bindings = <
 &kp C_MUTE  &kp C_VOL_DN  &kp C_VOL_UP  &kp C_PREV  &kp C_NEXT  &kp C_PP       &bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4  &bt BT_CLR
 &kp F1      &kp F2        &kp F3        &kp F4      &kp F5      &kp F6         &out OUT_BLE  &out OUT_USB  &none         &none         &none         &none
-&kp F7      &kp F8        &kp F9        &kp F10     &kp F11     &kp F12        &none         &none         &none         &none         &none         &kp PAUSE_BREAK
+&kp F7      &kp F8        &kp F9        &kp F10     &kp F11     &kp F12        &tog 3        &none         &none         &none         &none         &kp PAUSE_BREAK
                                               &trans    &trans    &none        &none        &trans        &none
             >;
         };
-        i3_layer {
+
+        neo_layer_4 {
             bindings = <
-&trans  &trans  &trans  &trans  &trans  &trans       &trans  &i3_ws_7  &i3_ws_8  &i3_ws_9  &trans  &trans
+&none  &kp PG_UP &kp BSPC &kp UP     &kp DEL   &kp PG_DN      &none  &kp N7  &kp N8  &kp N9  &none  &none
-&trans  &trans  &trans  &trans  &trans  &trans       &trans  &i3_ws_4  &i3_ws_5  &i3_ws_6  &trans  &trans
+&none  &kp HOME  &kp LEFT &kp DOWN   &kp RIGHT &kp END        &none  &kp N4  &kp N5  &kp N6  &kp N0 &none
-&trans  &trans  &trans  &trans  &trans  &trans       &trans  &i3_ws_1  &i3_ws_2  &i3_ws_3  &trans  &trans
+&trans &kp ESC   &kp TAB  &kp INSERT &kp ENTER &kp K_UNDO     &kp N0 &kp N1  &kp N2  &kp N3  &none  &none
-                    &trans    &trans    &i3_ws_0          &none        &trans        &none
+                                   &trans  &trans  &trans     &trans    &trans     &trans
+            >;
+        };
+
+        gaming_layer {
+            bindings = <
+&kp TAB    &kp Q  &kp W  &kp E  &kp R  &kp T       &none   &kp N7  &kp N8  &kp N9  &none   &kp C_PP
+&kp LSHFT  &kp A  &kp S  &kp D  &kp F  &kp G       &none   &kp N4  &kp N5  &kp N6  &kp N0  &kp C_VOL_UP
+&kp LCTRL  &kp Z  &kp X  &kp C  &kp V  &kp B       &kp N0  &kp N1  &kp N2  &kp N3  &none   &kp C_VOL_DN
+              &kp LGUI  &kp LCTRL  &kp SPACE       &tog 3  &kp ESC  &none
             >;
         };
     };