aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorItsWaffIe <[email protected]>2021-07-31 01:01:51 -0600
committerItsWaffIe <[email protected]>2021-07-31 01:01:51 -0600
commit0be6f1d8b0a20949286634a936dda81af65e2e3a (patch)
treebeda82e7059b511e5a4c0c7b908f70520e1fe7a7 /config
parent5f1fa8c58510b5a3e892e87faa7f3306bd10f663 (diff)
parentd402e419f097a100bab792af3015f62871f77e4c (diff)
downloadzmk_build-0be6f1d8b0a20949286634a936dda81af65e2e3a.tar.gz
zmk_build-0be6f1d8b0a20949286634a936dda81af65e2e3a.zip
fix merge conflicts
Diffstat (limited to 'config')
-rw-r--r--config/corne.conf1
-rw-r--r--config/corne.keymap27
-rw-r--r--config/microdox.conf7
-rw-r--r--config/microdox.keymap105
-rw-r--r--config/qaz.conf1
-rw-r--r--config/qaz.keymap5
6 files changed, 82 insertions, 64 deletions
diff --git a/config/corne.conf b/config/corne.conf
index 974243c..b39a592 100644
--- a/config/corne.conf
+++ b/config/corne.conf
@@ -4,3 +4,4 @@
# Uncomment the following line to enable the Corne OLED Display
# CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_SLEEP=y \ No newline at end of file
diff --git a/config/corne.keymap b/config/corne.keymap
index 25dda1f..1dc090b 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -8,12 +8,13 @@
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
-&mt {
+/*&mt {
tapping_term_ms = <420>;
-};
+};*/
-&lt {
- tapping_term_ms = <350>;
+&mt {
+ quick_tap_ms = <150>;
+ retro-tap;
};
/ {
@@ -63,25 +64,25 @@
default_layer {
bindings = <
- &trans &mt LALT Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &mt RALT P &cp C_NEXT
- &trans &mt LSHFT A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt LSHFT SEMI &cp C_PLAY
- &trans &mt LCTL Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &mt RCTL FSLH &cp C_PREV
+ &trans &mt LALT Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &mt RALT P &trans
+ &trans &mt LSHFT A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt LSHFT SEMI &trans
+ &trans &mt LCTL Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &mt RCTL FSLH &trans
&kp LGUI &mo 1 &kp SPACE &kp BSPC &mo 2 &kp RC(RS(V))
>;
};
lower_layer {
bindings = <
- &bt BT_CLR &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp PSCRN
- &trans &mt LSHFT EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPERSAND &kp ASTRK &kp LPAR &mt RSHFT RPAR &trans
- &trans &mt LCTL ESC &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp RCTL &kp RC(S)
+ &bt BT_CLR &mt LALT N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &mt RALT N0 &trans
+ &reset &mt LSHFT EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPERSAND &kp ASTRK &kp LPAR &mt RSHFT RPAR &trans
+ &bootloader &mt LCTL ESC &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp RCTL &trans
&kp LGUI &trans &kp SPACE &cp C_VOL_UP &trans &kp RGUI
>;
};
raise_layer {
bindings = <
- &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &trans &trans &trans &trans &trans &bt BT_CLR
- &trans &mt LSHFT UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &trans &trans &trans &trans &kp LSHFT &trans
- &trans &mt LCTL F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &mt RCTL F10 &trans
+ &bt BT_NXT &mt LALT MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &trans &trans &trans &trans &kp RALT &bt BT_CLR
+ &bt BT_PRV &mt LSHFT UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &trans &trans &trans &trans &kp LSHFT &reset
+ &trans &mt LCTL F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &mt RCTL F10 &bootloader
&kp LGUI &trans &cp C_VOL_DN &kp BSPC &trans &kp RGUI
>;
};
diff --git a/config/microdox.conf b/config/microdox.conf
index 0d38398..7a82124 100644
--- a/config/microdox.conf
+++ b/config/microdox.conf
@@ -1,6 +1,7 @@
# Uncomment the following lines to enable the Microdox RGB Underglow
-# CONFIG_ZMK_RGB_UNDERGLOW=y
-# CONFIG_WS2812_STRIP=y
+#CONFIG_ZMK_RGB_UNDERGLOW=y
+#CONFIG_WS2812_STRIP=y
# Uncomment the following line to enable the Microdox OLED Display
-# CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_DISPLAY=y
+CONFIG_ZMK_SLEEP=y \ No newline at end of file
diff --git a/config/microdox.keymap b/config/microdox.keymap
index c9298ff..da46328 100644
--- a/config/microdox.keymap
+++ b/config/microdox.keymap
@@ -8,65 +8,78 @@
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
+&mt {
+ quick_tap_ms = <150>;
+ retro-tap;
+};
+
+ / {
+ combos {
+ compatible = "zmk,combos";
+ combo_ent {
+ timeout-ms = <50>;
+ key-positions = <3 6>;
+ bindings = <&kp ENTER>;
+ };
+ combo_quote {
+ timeout-ms = <50>;
+ key-positions = <14 15>;
+ bindings = <&kp SQT>;
+ };
+ combo_ques {
+ timeout-ms = <50>;
+ key-positions = <23 26>;
+ bindings = <&kp QUESTION>;
+ };
+ combo_dquote {
+ timeout-ms = <50>;
+ key-positions = <22 26>;
+ bindings = <&kp DQT>;
+ };
+ combo_col {
+ timeout-ms = <50>;
+ key-positions = <4 5>;
+ bindings = <&kp COLON>;
+ };
+ combo_unds {
+ timeout-ms = <50>;
+ key-positions = <24 25>;
+ bindings = <&kp UNDER>;
+ };
+ combo_mins {
+ timeout-ms = <50>;
+ key-positions = <13 16>;
+ bindings = <&kp MINUS>;
+ };
+ };
+};
+
/ {
keymap {
compatible = "zmk,keymap";
-
default_layer {
-// -----------------------------------------------------------------------------------------
-// | Q | W | E | R | T | | Y | U | I | O | P |
-// | A | S | D | F | G | | H | J | K | L | ; |
-// | Z | X | C | V | B | | N | M | , | . | / |
-// | GUI | NAV | SHFT | | SPC | SYM | ALT |
bindings = <
- &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
- &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
- &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
- &kp LGUI &mo 1 &kp LSHFT &kp SPACE &mo 2 &kp RALT
+ &mt LALT Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &mt RALT P
+ &mt LSHFT A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt RSHFT SEMI
+ &mt LCTL Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &mt RCTL FSLH
+ &kp LGUI &mo 1 &kp SPACE &kp BSPC &mo 2 &kp RC(RS(V))
>;
};
nav_layer {
-// -----------------------------------------------------------------------------------------
-// |BTCLR| | ESC | ~ | | | TAB | HOME | UP | END | DEL |
-// | BT1 | GUI | ALT | CTRL | NUM | | / | LEFT | DOWN | RGT | BKSP |
-// | BT2 | | | | | | \ | ENT | | | |
-// | | | | | | | |
bindings = <
- &bt BT_CLR &trans &kp ESC &kp TILDE &trans &kp TAB &kp HOME &kp UP &kp END &kp DEL
- &bt BT_SEL 0 &kp K_CMENU &kp RALT &kp LCTRL &mo 3 &kp FSLH &kp LEFT &kp DOWN &kp RIGHT &kp BSPC
- &bt BT_SEL 1 &trans &trans &trans &trans &kp BSLH &kp RET &trans &trans &trans
- &trans &trans &trans &trans &trans &trans
+ &mt LALT N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &mt RALT N0
+ &mt LSHFT EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPERSAND &kp ASTRK &kp LPAR &mt RSHFT RPAR
+ &mt LCTL ESC &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp RCTL
+ &kp LGUI &trans &kp SPACE &kp C_VOL_UP &trans &kp C_BRI_UP
>;
};
-
sym_layer {
-// -----------------------------------------------------------------------------------------
-// | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
-// | | | | | | | - | = | { | } | "|" |
-// | | | | | | | _ | + | [ | ] | \ |
-// | GUI | | SPC | | ENT | | ALT |
bindings = <
- &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR
- &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp PIPE
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp BSLH
- &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT
- >;
- };
-
-// This layer is unreachable until "tri layer state" is sorted out.
-// Leaving it here for completeness.
- num_layer {
-// -----------------------------------------------------------------------------------------
-// | | | | | | | A | 7 | 8 | 9 | D |
-// | | | | | | | B | 4 | 5 | 6 | E |
-// | | | | | | | C | 1 | 2 | 3 | F |
-// | | | | | 0 | . | |
- bindings = <
- &trans &trans &trans &trans &trans &kp A &kp N7 &kp N8 &kp N9 &kp D
- &trans &trans &trans &trans &trans &kp B &kp N4 &kp N5 &kp N6 &kp E
- &trans &trans &trans &trans &trans &kp C &kp N1 &kp N2 &kp N3 &kp F
- &trans &trans &trans &kp N0 &kp DOT &trans
+ &mt LALT MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &bt BT_PRV &bt BT_NXT &bt BT_CLR &trans &kp RALT
+ &mt LSHFT UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &reset &bootloader &trans &trans &kp LSHFT
+ &mt LCTL F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &mt RCTL F10
+ &kp C_BRI_DN &trans &kp C_VOL_DN &kp BSPC &trans &kp RGUI
>;
};
};
-};
+}; \ No newline at end of file
diff --git a/config/qaz.conf b/config/qaz.conf
index e69de29..1fb80fd 100644
--- a/config/qaz.conf
+++ b/config/qaz.conf
@@ -0,0 +1 @@
+CONFIG_ZMK_SLEEP=y \ No newline at end of file
diff --git a/config/qaz.keymap b/config/qaz.keymap
index 7a37c7c..866e5df 100644
--- a/config/qaz.keymap
+++ b/config/qaz.keymap
@@ -7,6 +7,7 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/ext_power.h>
&mt {
quick_tap_ms = <150>;
@@ -70,7 +71,7 @@
&mt LALT Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &mt RALT P
&mt LSHFT A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt RSHFT SEMI
&mt LCTL Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &mt RCTL DOT
- &kp C_VOL_DN &trans &kp LGUI &lt LOWER SPACE &lt RAISE BSPC &kp RC(RS(V)) &trans &kp C_VOL_UP
+ &kp C_VOL_DN &kp C_BRI_DEC &kp LGUI &lt LOWER SPACE &lt RAISE BSPC &kp RC(RS(V)) &kp C_BRI_INC &kp C_VOL_UP
>;
};
lower {
@@ -87,7 +88,7 @@
&kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &none &none &none &none &none
&kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &none &none &none &none &none
&none &none &none &none &none &none &none &none &none
- &bootloader &reset &bt BT_CLR &kp SEMI &trans &none &none &none
+ &bootloader &reset &bt BT_CLR &kp SEMI &trans &none &bt BT_PRV &bt BT_NXT
>;
};
};