tidy up for main

This reverts commit 84c7f2a043.

.gitea/workflows/build.yml

@@ -1,93 +0,0 @@
-on: [push, pull_request, workflow_dispatch]
-
-name: Build
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: zmkfirmware/zmk-build-arm:stable
-    name: Build
-    steps:
-      - name: Install Dependencies
-        run: |
-          apt-get update;
-          apt-get install --yes --no-install-recommends \
-            nodejs \
-            zstd \
-            zip
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Hash west modules
-        id: hash-west
-        run: |
-          FILE_PATH=zephyr/west.yml
-          FILES=$(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort)
-          HASH="$(echo -n $FILES | sha256sum | head -c 64)"
-          echo "hash=$HASH" >> "$GITHUB_OUTPUT"
-          echo "computed hash: $HASH"
-
-      - name: Cache west modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-zephyr-modules
-        with:
-          path: |
-            modules/
-            tools/
-            zephyr/
-            bootloader/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.hash-west.outputs.hash }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-        timeout-minutes: 5
-        continue-on-error: true
-
-      - name: West Init
-        run: west init -l config
-      
-      - name: West Update
-        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
-        run: cp build/zephyr/zmk.uf2 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
-        run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
-
-      - name: Zip Artifacts
-        run: zip firmware.zip corne_left_nice_nano_v2.uf2 corne_right_nice_nano_v2.uf2
-
-      - name: Hash west modules
-        id: hash-west
-        run: |
-          FILE_PATH=zephyr/west.yml
-          FILES=$(find . -name build.yml -o -name west.yml -type f -exec sha256sum \; | sort)
-          HASH="$(echo -n $FILES | sha256sum | head -c 64)"
-          echo "hash=$HASH" >> "$GITHUB_OUTPUT"
-          echo "computed hash: $HASH"
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          path: firmware.zip
-          name: firmware.zip

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         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:
@@ -42,30 +42,31 @@ jobs:
         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
-        run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
-      - name: Archive (Corne Left)
-        uses: actions/upload-artifact@v3
-        with:
-          name: firmware
-          path: corne_left_nice_nano_v2.uf2
+    # - name: Rename zmk.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
+    # - name: Archive (Corne Left)
+    #   uses: https://github.com/actions/upload-artifact@v3
+    #   with:
+    #     name: firmware
+    #     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
-        run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
-      - name: Archive (Corne Right)
-        uses: actions/upload-artifact@v3
-        with:
-          name: firmware
-          path: corne_right_nice_nano_v2.uf2
+    # - name: Rename zmk.uf2
+    #   run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
+    # - name: Archive (Corne Right)
+    #   uses: https://github.com/actions/upload-artifact@v3
+    #   with:
+    #     name: firmware
+    #     path: corne_right_nice_nano_v2.uf2
+    #       - name: Release
 
-      - name: Upload artifacts as release
-        uses: 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
+    # - 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

@@ -9,6 +9,6 @@
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_TIMEOUT=30000
 # Sleep timeout to 15 minutes
-CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
 
-CONFIG_ZMK_KEYBOARD_NAME="Daimon Scriptor"
+CONFIG_ZMK_USB_LOGGING=y

config/corne.keymap

@@ -10,7 +10,7 @@
 #include <dt-bindings/zmk/outputs.h>
 
 &sl {
-    release-after-ms = <250>;
+    release-after-ms = <1000>;
 };
 
 &sk {
@@ -24,28 +24,37 @@
         default_layer {
             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
- &kp LSHFT  &kp A  &kp S     &kp D      &kp F      &kp G       &kp H     &kp J      &kp K    &kp L  &kp SEMI  &kp SQT
-&kp LCTRL  &kp Z  &kp X     &kp C      &kp V      &kp B       &kp N     &kp M  &kp COMMA  &kp DOT  &kp FSLH  &mo 1
-                         &kp LGUI  &sl 2  &kp SPACE       &kp LC(BSPC)  &kp CAPS  &kp LALT
+ &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  &mo 1
+                         &kp LGUI  &sk LCTRL  &kp SPACE       &kp LC(LALT)  &sl 2  &sk LALT
             >;
         };
 
         adjust_layer {
             bindings = <
-&bt BT_SEL 0  &bt BT_SEL 1  &bt BT_SEL 2  &bt BT_SEL 3  &bt BT_SEL 4  &bt BT_CLR      &none         &none         &none  &none  &kp C_PP    &kp C_VOL_UP
-&kp F1        &kp F2        &kp F3        &kp F4        &kp F5        &kp F6          &out OUT_BLE  &out OUT_USB  &none  &none  &none       &kp C_VOL_DN
-&kp F7        &kp F8        &kp F9        &kp F10       &kp F11       &kp F12         &none         &none         &none  &none  &kp C_MUTE  &kp PAUSE_BREAK
+&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        &tog 3        &none         &none         &none         &none         &kp PAUSE_BREAK
                                               &trans    &trans    &none        &none        &trans        &none
             >;
         };
 
         neo_layer_4 {
             bindings = <
-&trans &kp PG_UP &kp BSPC &kp UP     &kp DEL   &kp PG_DN      &none  &kp N7  &kp N8  &kp N9  &none  &none
-&trans &kp HOME  &kp LEFT &kp DOWN   &kp RIGHT &kp END        &none  &kp N4  &kp N5  &kp N6  &kp N0 &none
+&none  &kp PG_UP &kp BSPC &kp UP     &kp DEL   &kp PG_DN      &none  &kp N7  &kp N8  &kp N9  &none  &none
+&none  &kp HOME  &kp LEFT &kp DOWN   &kp RIGHT &kp END        &none  &kp N4  &kp N5  &kp N6  &kp N0 &none
 &trans &kp ESC   &kp TAB  &kp INSERT &kp ENTER &kp K_UNDO     &kp N0 &kp N1  &kp N2  &kp N3  &none  &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
+            >;
+        };
     };
 };