Skip to content

Commit

Permalink
Remove custom ZMK enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
@caksoylar
caksoylar committed Sep 8, 2023
1 parent 5b64d74 commit fa632de
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 4,647 deletions.
63 changes: 22 additions & 41 deletions config/3x5.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
#ifdef EXTERNAL_POWER
# include <dt-bindings/zmk/ext_power.h>
#endif
#ifdef MOUSE_KEYS
# include <dt-bindings/zmk/mouse.h>
#endif

// Layer aliases
#define DEF 0
Expand All @@ -16,7 +13,6 @@
#define SYM 3
#define NAV 4
#define FUN 5
#define MSE 6

// Desktop and tab navigation shortcuts
#define D_LT LC(LG(LEFT))
Expand Down Expand Up @@ -97,13 +93,6 @@
# define FN_EXTRA2 &kp PAUSE_BREAK
#endif

#ifdef MOUSE_KEYS
# include "mouse.dtsi"
# define MS_ACT(key) &lt MSE key
#else
# define MS_ACT(key) &kp key
#endif

&mt {
flavor = "hold-preferred";
tapping-term-ms = <150>;
Expand All @@ -130,7 +119,7 @@
bindings = <&kp>, <&kp>;
hold-trigger-key-positions = <KEYS_R THUMBS>;
hold-trigger-on-release;
global-quick-tap-ms = <100>;
global-quick-tap;
};
asl: alpha_shift_l {
compatible = "zmk,behavior-hold-tap";
Expand All @@ -153,7 +142,7 @@
bindings = <&kp>, <&kp>;
hold-trigger-key-positions = <KEYS_L THUMBS>;
hold-trigger-on-release;
global-quick-tap-ms = <100>;
global-quick-tap;
};
asr: alpha_shift_r {
compatible = "zmk,behavior-hold-tap";
Expand All @@ -167,13 +156,22 @@
hold-trigger-on-release;
};

// Swapper for smart alt+tab
swapper: swapper {
compatible = "zmk,behavior-tri-state";
label = "SWAPPER";
// Easy alt-tab with alt+backspace thumb using mod-morphs
bstab: backspace_tab {
compatible = "zmk,behavior-mod-morph";
label = "BSPC_TAB";
#binding-cells = <0>;
bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
ignored-key-positions = <SWP_POS>;
bindings = <&kp BSPC>, <&kp TAB>;
mods = <MOD_LALT>;
keep-mods = <MOD_LALT>;
};
lt_bspc: layer_tap_backspace_tab {
compatible = "zmk,behavior-hold-tap";
label = "LT_BT";
#binding-cells = <2>;
tapping-term-ms = <150>;
flavor = "balanced";
bindings = <&mo>, <&bstab>;
};
};

Expand Down Expand Up @@ -208,9 +206,9 @@
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
&aml LCTRL A &aml LGUI R &aml LALT S &asl LSHFT T &kp G &kp M &asr RSHFT N &amr RALT E &amr RGUI I &amr RCTRL O
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
P_L_DEF &kp X &kp C MS_ACT(D) I_L_DEF I_R_DEF &kp H &kp COMMA &kp DOT P_R_DEF
P_L_DEF &kp X &kp C &kp D I_L_DEF I_R_DEF &kp H &kp COMMA &kp DOT P_R_DEF
// ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
T3_L_DEF &mt LCTRL ESC &lt NAV BSPC &lt SYM SPACE &mt RSHFT RET T3_R_DEF
T3_L_DEF &mt LCTRL ESC &lt_bspc NAV 0 &lt SYM SPACE &mt RSHFT RET T3_R_DEF
// ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯
>;
};
Expand All @@ -223,9 +221,9 @@
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
&aml LCTRL R &aml LGUI S &aml LALT N &asl LSHFT T &kp P &kp K &asr RSHFT H &amr RALT E &amr RGUI I &amr RCTRL A
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
ALP_XXX &kp W &kp M MS_ACT(G) ALP_XXX ALP_XXX &kp D &kp COMMA &kp DOT ALP_XXX
ALP_XXX &kp W &kp M &kp G ALP_XXX ALP_XXX &kp D &kp COMMA &kp DOT ALP_XXX
// ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
T3_L_DEF &mt LCTRL ESC &lt NAV BSPC &lt SYM SPACE &mt RSHFT RET T3_R_DEF
T3_L_DEF &mt LCTRL ESC &lt_bspc NAV 0 &lt SYM SPACE &mt RSHFT RET T3_R_DEF
// ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯
>;
};
Expand Down Expand Up @@ -268,7 +266,7 @@
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
&kp LCTRL &kp LGUI &kp LALT &mt LSHFT TAB &kp C_VOL_DN &kp HOME &kp LEFT &kp DOWN &kp RIGHT &kp END
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
ALP_XXX &kp LS(TAB) &swapper &kp LS(INS) ALP_PP ALP_XXX &kp DEL &kp C_PREV &kp C_NEXT ALP_XXX
ALP_XXX &kp LS(TAB) &none &kp LS(INS) ALP_PP ALP_XXX &kp DEL &kp C_PREV &kp C_NEXT ALP_XXX
// ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
T3_L_SYM &sys_reset &trans &trans &kp LSHFT T3_R_SYM
// ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯
Expand All @@ -289,22 +287,5 @@
// ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯
>;
};

#ifdef MOUSE_KEYS
mouse_layer {
label = "MSE";
bindings = <
// ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
&none &none &none &none &none &mwh S_LEFT &mwh S_DOWN &mmv M_UP &mwh S_UP &mwh S_RIGHT
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
&kp LCTRL &kp LGUI &kp LALT &kp LSHFT &none &none &mmv M_LEFT &mmv M_DOWN &mmv M_RIGHT &none
// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
ALP_XXX &none &none &none ALP_XXX ALP_XXX &mkp MB4 &mkp MCLK &mkp MB5 ALP_XXX
// ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
T3_XXX &none &none &mkp LCLK &mkp RCLK T3_XXX
// ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯
>;
};
#endif
};
};
81 changes: 32 additions & 49 deletions config/combos.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,68 +15,51 @@
╰───────╮ 26 27 │ │ 28 29 ╭───────╯
╰────────╯ ╰────────╯ */

#define COMBO(NAME, BINDINGS, KEYPOS, LAYERS, TERM, QUICKTAP, ...) \
combo_##NAME { \
timeout-ms = <TERM>; \
bindings = <BINDINGS>; \
key-positions = <KEYPOS>; \
layers = <LAYERS>; \
global-quick-tap-ms = <QUICKTAP>; \
__VA_ARGS__ \
};
#define COMBO(NAME, BINDINGS, KEYPOS, LAYERS, TERM) \
combo_##NAME { \
timeout-ms = <TERM>; \
bindings = <BINDINGS>; \
key-positions = <KEYPOS>; \
layers = <LAYERS>; \
};

/ {
combos {
compatible = "zmk,combos";

COMBO(j, &kp J, 2 3, DEF, 80, 50)
COMBO(q, &kp Q, 2 3, BRD, 80, 50)
COMBO(v_brd, &kp V, 1 2, BRD, 80, 50)
COMBO(semi, &kp SEMI, 6 7, DEF BRD, 40, 100)
COMBO(grave, &kp GRAVE, 7 8, DEF BRD, 40, 100)
COMBO(lpar, &kp LPAR, 12 13, DEF BRD, 40, 100)
COMBO(rpar, &kp RPAR, 16 17, DEF BRD, 40, 100)
COMBO(lbkt, &kp LBKT, 11 12, DEF BRD, 40, 100)
COMBO(rbkt, &kp RBKT, 17 18, DEF BRD, 40, 100)
COMBO(tab, &kp TAB, 11 13, DEF BRD, 40, 150)
COMBO(del, &kp DEL, 16 18, DEF BRD, 40, 150)
COMBO(j, &kp J, 2 3, DEF, 80)
COMBO(q, &kp Q, 2 3, BRD, 80)
COMBO(v_brd, &kp V, 1 2, BRD, 80)
COMBO(semi, &kp SEMI, 6 7, DEF BRD, 40)
COMBO(grave, &kp GRAVE, 7 8, DEF BRD, 40)
COMBO(lpar, &kp LPAR, 12 13, DEF BRD, 40)
COMBO(rpar, &kp RPAR, 16 17, DEF BRD, 40)
COMBO(lbkt, &kp LBKT, 11 12, DEF BRD, 40)
COMBO(rbkt, &kp RBKT, 17 18, DEF BRD, 40)
COMBO(tab, &kp TAB, 11 13, DEF BRD, 40)
COMBO(del, &kp DEL, 16 18, DEF BRD, 40)

COMBO(capswd, &caps_word, 13 16, DEF BRD, 60, 200)
COMBO(capswd, &caps_word, 13 16, DEF BRD, 60)

COMBO(play, &kp C_PP, 4 14, NAV, 200, 200)
COMBO(play, &kp C_PP, 4 14, NAV, 200)

#ifdef ALPHA_23332
COMBO(z, &kp Z, 20 21, DEF BRD, 80, 50)
COMBO(v, &kp V, 21 22, DEF, 40, 50)
COMBO(bslh, &kp BSLH, 23 24, DEF BRD, 80, 100)
COMBO(slsh, &kp SLASH, 24 25, DEF BRD, 80, 50)
COMBO(z, &kp Z, 20 21, DEF BRD, 80)
COMBO(v, &kp V, 21 22, DEF, 40)
COMBO(bslh, &kp BSLH, 23 24, DEF BRD, 80)
COMBO(slsh, &kp SLASH, 24 25, DEF BRD, 80)

COMBO(f12, &kp F12, 20 21, FUN, 100, 200)
COMBO(btclr, &bt BT_CLR, 24 25, FUN, 100, 200)
COMBO(f12, &kp F12, 20 21, FUN, 100)
COMBO(btclr, &bt BT_CLR, 24 25, FUN, 100)
#else
COMBO(z, &kp Z, 21 22, DEF BRD, 80, 50)
COMBO(v, &kp V, 22 23, DEF, 40, 50)
COMBO(bslh, &kp BSLH, 26 27, DEF BRD, 80, 100)
COMBO(slsh, &kp SLASH, 27 28, DEF BRD, 80, 50)
COMBO(z, &kp Z, 21 22, DEF BRD, 80)
COMBO(v, &kp V, 22 23, DEF, 40)
COMBO(bslh, &kp BSLH, 26 27, DEF BRD, 80)
COMBO(slsh, &kp SLASH, 27 28, DEF BRD, 80)

COMBO(f12, &kp F12, 21 22, FUN, 100, 200)
COMBO(btclr, &bt BT_CLR, 27 28, FUN, 100, 200)
COMBO(f12, &kp F12, 21 22, FUN, 100)
COMBO(btclr, &bt BT_CLR, 27 28, FUN, 100)
#endif

#ifdef MOUSE_KEYS
# ifdef THREE_THUMBS
# ifdef ALPHA_23332
COMBO(mse_l, &mo MSE, 27 28, DEF BRD, 150, 0, slow-release;)
# else
COMBO(mse_l, &mo MSE, 31 32, DEF BRD, 150, 0, slow-release;)
# endif
# else
# ifdef ALPHA_23332
COMBO(mse_l, &mo MSE, 26 27, DEF BRD, 150, 0, slow-release;)
# else
COMBO(mse_l, &mo MSE, 30 31, DEF BRD, 150, 0, slow-release;)
# endif
# endif
#endif
};
};
14 changes: 0 additions & 14 deletions config/corneish_zen.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
# Require passkey on pairing
CONFIG_ZMK_BLE_PASSKEY_ENTRY=y

# Zen display tweaks
CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
# Stock status screen
#CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
#CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
#CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
# 8-bit status screen
CONFIG_ZEN_STATUS_SCREEN_8BIT=y
CONFIG_ZEN_STATUS_SCREEN_8BIT_HALF=y

# Sleep timeout to 30 min
CONFIG_ZMK_SLEEP=y
CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000

# Mouse keys, higher tick duration prevents freezes
CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_MOUSE_TICK_DURATION=16
1 change: 0 additions & 1 deletion config/corneish_zen.keymap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#define THREE_THUMBS
#define MOUSE_KEYS

#include "3x5.dtsi"

Expand Down
26 changes: 0 additions & 26 deletions config/mouse.dtsi
View file

This file was deleted.

4 changes: 0 additions & 4 deletions config/rommana.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
# Sleep timeout to 30 min
CONFIG_ZMK_SLEEP=y
CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000

# Mouse keys, higher tick duration prevents freezes
CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_MOUSE_TICK_DURATION=16
6 changes: 2 additions & 4 deletions config/west.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ manifest:
remotes:
- name: zmkfirmware
url-base: https://github.com/zmkfirmware
- name: caksoylar
url-base: https://github.com/caksoylar
projects:
- name: zmk
remote: caksoylar
revision: caksoylar/zen-8bit
remote: zmkfirmware
revision: main
import: app/west.yml
self:
path: config
23 changes: 0 additions & 23 deletions config/zen-status-screen.md
View file

This file was deleted.

Loading

0 comments on commit fa632de

Please sign in to comment.