diff --git a/config/3x5.dtsi b/config/3x5.dtsi index a452ad35..6d417503 100644 --- a/config/3x5.dtsi +++ b/config/3x5.dtsi @@ -5,9 +5,6 @@ #ifdef EXTERNAL_POWER # include #endif -#ifdef MOUSE_KEYS -# include -#endif // Layer aliases #define DEF 0 @@ -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)) @@ -97,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>; @@ -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 = ; + bindings = <&kp BSPC>, <&kp TAB>; + mods = ; + keep-mods = ; + }; + 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>; }; }; @@ -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 < NAV BSPC < SYM SPACE &mt RSHFT RET T3_R_DEF + T3_L_DEF &mt LCTRL ESC <_bspc NAV 0 < SYM SPACE &mt RSHFT RET T3_R_DEF // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ >; }; @@ -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 < NAV BSPC < SYM SPACE &mt RSHFT RET T3_R_DEF + T3_L_DEF &mt LCTRL ESC <_bspc NAV 0 < SYM SPACE &mt RSHFT RET T3_R_DEF // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ >; }; @@ -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 &none &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 // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ @@ -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 }; }; 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 0ae83e23..00000000 --- a/config/mouse.dtsi +++ /dev/null @@ -1,26 +0,0 @@ -#include - -&mmv { - acceleration-exponent = <1>; // 1 - time-to-max-speed-ms = <400>; // 300 - delay-ms = <0>; // 0 -}; - -&mwh { - acceleration-exponent = <1>; // 0 - time-to-max-speed-ms = <40>; // 300 - delay-ms = <0>; // 0 -}; - -#define U_MOUSE_MOVE_MAX 1200 // 600 -#define U_MOUSE_SCROLL_MAX 20 // 10 - -#define M_UP MOVE_VERT(-U_MOUSE_MOVE_MAX) -#define M_DOWN MOVE_VERT(U_MOUSE_MOVE_MAX) -#define M_LEFT MOVE_HOR(-U_MOUSE_MOVE_MAX) -#define M_RIGHT MOVE_HOR(U_MOUSE_MOVE_MAX) - -#define S_UP SCROLL_VERT(U_MOUSE_SCROLL_MAX) -#define S_DOWN SCROLL_VERT(-U_MOUSE_SCROLL_MAX) -#define S_LEFT SCROLL_HOR(-U_MOUSE_SCROLL_MAX) -#define S_RIGHT SCROLL_HOR(U_MOUSE_SCROLL_MAX) 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: . diff --git a/keymap-drawer/corneish_zen.svg b/keymap-drawer/corneish_zen.svg index bdc0b487..c63bdf46 100644 --- a/keymap-drawer/corneish_zen.svg +++ b/keymap-drawer/corneish_zen.svg @@ -1,4 +1,4 @@ - + diff --git a/keymap-drawer/corneish_zen.yaml b/keymap-drawer/corneish_zen.yaml index f3ba1c57..87a85674 100644 --- a/keymap-drawer/corneish_zen.yaml +++ b/keymap-drawer/corneish_zen.yaml @@ -24,7 +24,7 @@ layers: - Z - X - C - - {t: D, h: MSE} + - D - V - J - H @@ -33,7 +33,7 @@ layers: - / - {t: ↹, h: Gui} - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} - {t: ⌦, h: Alt} @@ -61,7 +61,7 @@ layers: - '' - W - M - - {t: G, h: MSE} + - G - '' - '' - D @@ -70,7 +70,7 @@ layers: - '' - {t: ↹, h: Gui} - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} - {t: ⌦, h: Alt} @@ -134,8 +134,8 @@ layers: - → - End - '' - - Win Prev - - Win Next + - '' + - '' - Paste - ⏯ - '' @@ -186,43 +186,6 @@ layers: - {type: held} - Boot - '' - MSE: - - '' - - '' - - '' - - '' - - '' - - MW← - - MW↓ - - M↑ - - MW↑ - - MW→ - - Ctrl - - Gui - - Alt - - Shift - - '' - - '' - - M← - - M↓ - - M→ - - '' - - '' - - '' - - '' - - {type: held} - - '' - - '' - - Back Click - - Middle Click - - Forward Click - - '' - - '' - - '' - - '' - - Left Click - - Right Click - - '' combos: - p: [2, 3] k: J @@ -288,6 +251,3 @@ combos: k: BT CLR l: [FUN] a: bottom -- p: [31, 32] - k: MSE - l: [DEF, BRD] diff --git a/keymap-drawer/hypergolic.svg b/keymap-drawer/hypergolic.svg index 7d854b9f..5b5319ae 100644 --- a/keymap-drawer/hypergolic.svg +++ b/keymap-drawer/hypergolic.svg @@ -240,6 +240,7 @@ path.combo { ⌫ NAV +↹ @@ -453,6 +454,7 @@ path.combo { ⌫ NAV +↹ @@ -914,15 +916,9 @@ path.combo { - -WinPrev - - -WinNext - diff --git a/keymap-drawer/hypergolic.yaml b/keymap-drawer/hypergolic.yaml index bea3a397..744458d2 100644 --- a/keymap-drawer/hypergolic.yaml +++ b/keymap-drawer/hypergolic.yaml @@ -32,7 +32,7 @@ layers: - . - / - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} BRD: @@ -67,7 +67,7 @@ layers: - . - '' - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} GME: [↹, Q, W, E, R, Y, U, I, O, P, Esc, A, S, D, F, H, J, K, L, GME, Shift, Z, X, C, V, N, M, ',', ., /, Alt, ␣, NAV, ⏎] @@ -128,8 +128,8 @@ layers: - → - End - '' - - Win Prev - - Win Next + - '' + - '' - Paste - ⏯ - '' diff --git a/keymap-drawer/rommana.svg b/keymap-drawer/rommana.svg index e5acbaf5..c6102f68 100644 --- a/keymap-drawer/rommana.svg +++ b/keymap-drawer/rommana.svg @@ -1,4 +1,4 @@ - + @@ -408,7 +404,6 @@ path.combo { G -MSE @@ -431,6 +426,7 @@ path.combo { ⌫ NAV +↹ @@ -506,10 +502,6 @@ path.combo { / - - -MSE - @@ -863,15 +855,9 @@ path.combo { - -WinPrev - - -WinNext - @@ -1071,126 +1057,4 @@ path.combo { - -MSE: - - - - - - - - - - - - - - - - - - -MW← - - - -MW↓ - - - -M↑ - - - -MW↑ - - - -MW→ - - - -Ctrl - - - -Gui - - - -Alt - - - -Shift - - - - - - - - - -M← - - - -M↓ - - - -M→ - - - - - - - - - - - - - - - - -BackClick - - - - - -MiddleClick - - - - - -ForwardClick - - - - - - - - - - - -LeftClick - - - - - -RightClick - - - - diff --git a/keymap-drawer/rommana.yaml b/keymap-drawer/rommana.yaml index 51fffb99..ea777488 100644 --- a/keymap-drawer/rommana.yaml +++ b/keymap-drawer/rommana.yaml @@ -23,12 +23,12 @@ layers: - {t: O, h: Ctrl} - X - C - - {t: D, h: MSE} + - D - H - ',' - . - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} BRD: @@ -54,12 +54,12 @@ layers: - {t: A, h: Ctrl} - W - M - - {t: G, h: MSE} + - G - D - ',' - . - {t: Esc, h: Ctrl} - - {t: ⌫, h: NAV} + - {t: ⌫, h: NAV, s: ↹} - {t: ␣, h: SYM} - {t: ⏎, h: Shift} GME: [↹, Q, W, E, R, Y, U, I, O, P, Esc, A, S, D, F, H, J, K, L, GME, Z, X, C, M, ',', ., Alt, ␣, NAV, ⏎] @@ -115,8 +115,8 @@ layers: - ↓ - → - End - - Win Prev - - Win Next + - '' + - '' - Paste - ⌦ - ⏮️ @@ -156,37 +156,6 @@ layers: - {type: held} - {type: held} - Boot - MSE: - - '' - - '' - - '' - - '' - - '' - - MW← - - MW↓ - - M↑ - - MW↑ - - MW→ - - Ctrl - - Gui - - Alt - - Shift - - '' - - '' - - M← - - M↓ - - M→ - - '' - - '' - - '' - - {type: held} - - Back Click - - Middle Click - - Forward Click - - '' - - '' - - Left Click - - Right Click combos: - p: [2, 3] k: J @@ -252,6 +221,3 @@ combos: k: BT CLR l: [FUN] a: bottom -- p: [26, 27] - k: MSE - l: [DEF, BRD]