Remove custom ZMK enhancements

caksoylar · Oct 26, 2023 · 7829b61 · 7829b61
1 parent 94e4c80
commit 7829b61
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 127 deletions.
diff --git a/config/3x5.dtsi b/config/3x5.dtsi
@@ -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
@@ -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) &lt 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+space thumb using mod-morphs
+        stab: space_tab {
+            compatible = "zmk,behavior-mod-morph";
+            label = "SPC_TAB";
             #binding-cells = <0>;
-            bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
-            ignored-key-positions = <SWP_POS>;
+            bindings = <&kp SPACE>, <&kp TAB>;
+            mods = <MOD_LALT>;
+            keep-mods = <MOD_LALT>;
+        };
+        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>;
         };
     };
 
@@ -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 SPACE     &lt SYM BSPC  &mt RSHFT RET T3_R_DEF
+                                 T3_L_DEF      &mt LCTRL ESC &lt_spc NAV 0     &lt SYM BSPC  &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 &lt NAV SPACE     &lt SYM BSPC  &mt RSHFT RET T3_R_DEF
+                                 T3_L_DEF      &mt LCTRL ESC &lt_spc NAV 0     &lt SYM BSPC  &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 SPACE     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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 #define THREE_THUMBS
-#define MOUSE_KEYS
 
 #include "3x5.dtsi"
 

diff --git a/config/mouse.dtsi b/config/mouse.dtsi
diff --git 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
@@ -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