diff --git a/config/3x5.dtsi b/config/3x5.dtsi index f1e9fe55..10d4590d 100644 --- a/config/3x5.dtsi +++ b/config/3x5.dtsi @@ -13,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)) @@ -94,13 +93,6 @@ # define FN_EXTRA2 &kp PAUSE_BREAK #endif -#ifdef MOUSE_KEYS -# include "mouse.dtsi" -# define MS_ACT(key) < MSE key -#else -# define MS_ACT(key) &kp key -#endif - &mt { flavor = "hold-preferred"; tapping-term-ms = <150>; @@ -160,12 +152,21 @@ hold-trigger-on-release; }; - // Swapper for smart alt+tab - swapper: swapper { - compatible = "zmk,behavior-tri-state"; + // Easy alt-tab with alt+space thumb using mod-morphs + stab: space_tab { + compatible = "zmk,behavior-mod-morph"; #binding-cells = <0>; - bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>; - ignored-key-positions = ; + bindings = <&kp SPACE>, <&kp TAB>; + mods = ; + keep-mods = ; + }; + lt_spc: layer_tap_space_tab { + compatible = "zmk,behavior-hold-tap"; + label = "LT_BT"; + #binding-cells = <2>; + tapping-term-ms = <150>; + flavor = "balanced"; + bindings = <&mo>, <&stab>; }; }; @@ -200,9 +201,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 < NAV SPACE < SYM BSPC &mt RSHFT RET T3_R_DEF + T3_L_DEF &mt LCTRL ESC <_spc NAV 0 < SYM BSPC &mt RSHFT RET T3_R_DEF // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ >; }; @@ -215,9 +216,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 < NAV SPACE < SYM BSPC &mt RSHFT RET T3_R_DEF + T3_L_DEF &mt LCTRL ESC <_spc NAV 0 < SYM BSPC &mt RSHFT RET T3_R_DEF // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ >; }; @@ -260,7 +261,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 &none &none &kp LS(INS) ALP_PP ALP_XXX &kp DEL &kp C_PREV &kp C_NEXT ALP_XXX // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯ T3_L_SYM &none &trans &trans &kp SPACE T3_R_SYM // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ @@ -281,22 +282,5 @@ // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ >; }; - -#ifdef MOUSE_KEYS - mouse_layer { - display-name = "MSE"; - bindings = < -// ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &none &none &none &none &none &msc SCRL_LEFT &msc SCRL_DOWN &mmv MOVE_UP &msc SCRL_UP &msc SCRL_RIGHT -// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ - &kp LCTRL &kp LGUI &kp LALT &kp LSHFT &none &none &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_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 }; }; diff --git a/config/combos.dtsi b/config/combos.dtsi index bf49a1f4..2f1357c1 100644 --- a/config/combos.dtsi +++ b/config/combos.dtsi @@ -61,22 +61,6 @@ COMBO(slsh, &kp SLASH, 27 28, DEF BRD, 80, 50) COMBO(f12, &kp F12, 21 22, FUN, 100, 200) COMBO(btclr, &bt BT_CLR, 27 28, FUN, 100, 200) -#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 }; }; diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf index 7d35ca67..841ecd13 100644 --- a/config/corneish_zen.conf +++ b/config/corneish_zen.conf @@ -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 diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap index 7ecbcd99..13447a4a 100644 --- a/config/corneish_zen.keymap +++ b/config/corneish_zen.keymap @@ -1,5 +1,4 @@ #define THREE_THUMBS -#define MOUSE_KEYS #include "3x5.dtsi" diff --git a/config/mouse.dtsi b/config/mouse.dtsi deleted file mode 100644 index ea8ade87..00000000 --- a/config/mouse.dtsi +++ /dev/null @@ -1,16 +0,0 @@ -#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500 // 600 -#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20 // 10 - -#include - -&mmv { - acceleration-exponent = <1>; // 1 - time-to-max-speed-ms = <500>; // 300 - delay-ms = <0>; // 0 -}; - -&msc { - acceleration-exponent = <1>; // 0 - time-to-max-speed-ms = <40>; // 300 - delay-ms = <0>; // 0 -}; diff --git a/config/rommana.conf b/config/rommana.conf index 1ed0fcdb..841ecd13 100644 --- a/config/rommana.conf +++ b/config/rommana.conf @@ -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 diff --git a/config/west.yml b/config/west.yml index 48033478..379d2919 100644 --- a/config/west.yml +++ b/config/west.yml @@ -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 diff --git a/config/zen-status-screen.md b/config/zen-status-screen.md deleted file mode 100644 index fa6c3c38..00000000 --- a/config/zen-status-screen.md +++ /dev/null @@ -1,23 +0,0 @@ -# 8-bit status screen for Corne-ish Zen - -![Picture of status screen](https://repository-images.githubusercontent.com/340512296/020f96b5-a5cd-4d94-939a-2f70d6075a18) - -## Output widget - -Ranks: -- `J`/`Q`: BLE/peripheral paired & connected -- ❗: paired but not connected -- ❓: not paired, advertising -- 🔌: USB output - -Suits: -- ♠️: BLE profile 1/5 -- ♥️: BLE profile 2 -- ♦️: BLE profile 3 -- ♣️: BLE profile 4 - -## Battery widget - -A few pixels at the top of the display covertly shows the battery level, using the length of the line starting from top left and stretching to the right. - -The pixel art is not original, it is a design that was adapted from the creator of the 8bit deck: .