Compare commits

..

1 Commits
master ... main

Author SHA1 Message Date
532b92f493 i3wm workspace selector 2023-02-20 16:07:25 +01:00
4 changed files with 103 additions and 131 deletions

View File

@ -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

View File

@ -9,12 +9,8 @@ jobs:
image: zmkfirmware/zmk-build-arm:stable image: zmkfirmware/zmk-build-arm:stable
name: Build name: Build
steps: steps:
- name: Install Dependencies
run: apt update; apt install -y nodejs ssh
- name: Setup Node
uses: actions/setup-node@v3
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
- name: Cache west modules - name: Cache west modules
uses: actions/cache@v2 uses: actions/cache@v2
env: env:
@ -37,7 +33,6 @@ jobs:
run: west update run: west update
- name: West Zephyr export - name: West Zephyr export
run: west zephyr-export run: west zephyr-export
- name: West Build (Corne Left) - name: West Build (Corne Left)
run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Corne Left Kconfig file - name: Corne Left Kconfig file
@ -45,27 +40,19 @@ jobs:
- 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@v3 uses: actions/upload-artifact@v2
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) - name: West Build (Corne Right)
run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config" run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
- name: Corne Right Kconfig file - name: Corne Right Kconfig file
run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" 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@v3 uses: actions/upload-artifact@v2
with: with:
name: firmware name: firmware
path: corne_right_nice_nano_v2.uf2 path: corne_right_nice_nano_v2.uf2
- 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

View File

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

View File

@ -9,42 +9,122 @@
#include <dt-bindings/zmk/bt.h> #include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/outputs.h> #include <dt-bindings/zmk/outputs.h>
&sl { #define DEFAULT 0
release-after-ms = <250>; #define LOWER 1
}; #define ADJUST 2
&sk { &sk {
quick-release; 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 { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
default_layer { default_layer {
bindings = < 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 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 &sk CAPS &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 &sk LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &sk RSHIFT
&kp LGUI &sl 2 &kp SPACE &kp LC(BSPC) &kp CAPS &kp LALT &td_i3_workspace &sk LCTRL &kp SPACE &kp LC(BSPC) &sk RALT &mo 1
>; >;
}; };
adjust_layer { adjust_layer {
bindings = < 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 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 &kp C_VOL_DN &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 &kp C_MUTE &kp PAUSE_BREAK &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &none &none &none &none &none &kp PAUSE_BREAK
&trans &trans &none &none &trans &none &trans &trans &none &none &trans &none
>; >;
}; };
i3_layer {
neo_layer_4 {
bindings = < bindings = <
&trans &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_7 &i3_ws_8 &i3_ws_9 &trans &trans
&trans &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_4 &i3_ws_5 &i3_ws_6 &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 &trans &trans &trans &trans &trans &i3_ws_1 &i3_ws_2 &i3_ws_3 &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &i3_ws_0 &none &trans &none
>; >;
}; };
}; };