update

tsfd · Jul 12, 2024 · eb6184e · eb6184e
1 parent 69fa9a5
commit eb6184e
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 46 deletions.
diff --git a/config/adv360.keymap b/config/adv360.keymap
@@ -19,20 +19,110 @@
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/backlight.h>
 
+&lt {
+    flavor = "hold-preferred";
+};
+&mt {
+    flavor = "hold-preferred";
+};
 / {
   behaviors {
     #include "macros.dtsi"
     #include "version.dtsi"
 
-    hm: homerow_mods {
+    mokp: mokp_mods {
         compatible = "zmk,behavior-hold-tap";
-        label = "HOMEROW_MODS";
+        label = "MOKP_MODS";
         #binding-cells = <2>;
-        tapping-term-ms = <200>;
+        tapping-term-ms = <125>;
+        quick_tap_ms = <175>;
+        require-prior-idle-ms = <150>
+        flavor = "tap-preferred";
+        bindings = <&mo>, <&kp>;
+    };
+    kpkp: kpkp_mods {
+        compatible = "zmk,behavior-hold-tap";
+        label = "KPKP_MODS";
+        #binding-cells = <2>;
+        tapping-term-ms = <125>;
         quick_tap_ms = <175>;
+        require-prior-idle-ms = <150>
         flavor = "tap-preferred";
         bindings = <&kp>, <&kp>;
     };
+    percol: period_colon {
+        compatible = "zmk,behavior-mod-morph";
+        label = "PERIOD_COLON";
+        #binding-cells = <0>;
+        bindings = <&kp PERIOD>, <&kp COLON>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    comexc: comma_excl {
+        compatible = "zmk,behavior-mod-morph";
+        label = "COMMA_EXCL";
+        #binding-cells = <0>;
+        bindings = <&kp COMMA>, <&kp EXCL>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    quogra: quote_grave {
+        compatible = "zmk,behavior-mod-morph";
+        label = "QUOTE_GRAVE";
+        #binding-cells = <0>;
+        bindings = <&kp SINGLE_QUOTE>, <&kp GRAVE>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    semat: semi_at {
+        compatible = "zmk,behavior-mod-morph";
+        label = "SEMI_AT";
+        #binding-cells = <0>;
+        bindings = <&kp SEMI>, <&kp AT>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    spcl4: spc_layer4 {
+        compatible = "zmk,behavior-mod-morph";
+        label = "SPC_L4";
+        #binding-cells = <0>;
+        bindings = <&sands RSHFT SPC>, <&sl 4>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    sands: shift_and_space {
+        compatible = "zmk,behavior-hold-tap";
+        label = "SHIFT_AND_SPACE";
+        #binding-cells = <2>;
+        flavor = "hold-preferred";
+        tapping-term-ms = <250>;
+        bindings = <&kp>, <&kp>;
+    };
+    convl4: conv_layer4 {
+        compatible = "zmk,behavior-mod-morph";
+        label = "CONV_L4";
+        #binding-cells = <0>;
+        bindings = <&sandconv LSHFT INT4>, <&sl 4>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
+    sandconv: shift_and_conv {
+        compatible = "zmk,behavior-hold-tap";
+        label = "SHIFT_AND_CONV";
+        #binding-cells = <2>;
+        flavor = "hold-preferred";
+        tapping-term-ms = <250>;
+        bindings = <&kp>, <&kp>;
+    };
+    l5nconv: l5_and_nconv {
+        compatible = "zmk,behavior-hold-tap";
+        label = "L5_AND_NCONV";
+        #binding-cells = <2>;
+        flavor = "hold-preferred";
+        tapping-term-ms = <200>;
+        bindings = <&sl>, <&kp>;
+    };
+    l5ncn: l5nconv_and_none {
+        compatible = "zmk,behavior-mod-morph";
+        label = "l5NCON5_NONE";
+        #binding-cells = <0>;
+        bindings = <&l5nconv 5 INT5>, <&none>;
+        mods = <(MOD_LSFT|MOD_RSFT)>;
+    };
   };
 
     keymap {
@@ -43,9 +133,9 @@
             bindings = <
    &kp ESC           &kp N4     &kp N0    &kp N1     &kp N2   &kp N3                     &mo 6                                                                              &kp K_APP  &kp N7  &kp N6    &kp N5       &kp N9         &kp N8             &mo 3
    &kp TAB            &kp Q      &kp H     &kp O      &kp U    &kp X              &kp LEFT_WIN                                                                          &kp RIGHT_WIN   &kp W   &kp M     &kp R        &kp F          &kp Z  &kp LEFT_BRACKET
- &kp MINUS            &kp Y      &kp I     &mokp      &kp A  &percol                   &kp ESC  &mt LCTRL LA(TAB)    &mo 6                    &mo 6  &mt LCTRL LA(TAB)       &kp BSPC   &kp D   &kp S     &mokp        &kp N          &kp B            &semat
+ &kp MINUS            &kp Y      &kp I     &mokp 5 E  &kp A  &percol                   &kp ESC  &mt LCTRL LA(TAB)    &mo 6                    &mo 6  &mt LCTRL LA(TAB)       &kp BSPC   &kp D   &kp S     &mokp 5 T    &kp N          &kp B            &semat
   &kp LALT            &kp J  &kp SLASH   &comexc      &kp K  &quogra                                                 &mo 2                    &mo 2                                     &kp C   &kp G     &kp L        &kp P          &kp V     &kp RIGHT_ALT
- &kp LCTRL  &kp PRINTSCREEN   &kp CAPS  &kp LEFT  &kp RIGHT                     &mt LSHFT INT4         &lt 4 INT5  &kp DEL                  &kp INS              &mokp          &kpkp          &kp UP  &kp DOWN  &kp PAGE_UP  &kp PAGE_DOWN         &kp RCTRL
+ &kp LCTRL  &kp PRINTSCREEN   &kp CAPS  &kp LEFT  &kp RIGHT                     &mt LSHFT INT4         &lt 4 INT5  &kp DEL                  &kp INS            &mokp 5 ENTER &kpkp RSHFT SPACE &kp UP  &kp DOWN  &kp PAGE_UP  &kp PAGE_DOWN         &kp RCTRL
             >;
         };
 

diff --git a/config/cust_behaviors.json b/config/cust_behaviors.json
@@ -79,46 +79,6 @@
 		],
 		"type": "UD"
 	},
-	{
-		"code": "&mm",
-		"name": "&mm",
-		"params": [
-			"code"
-		],
-		"type": "UD"
-	},
-	{
-		"code": "&km",
-		"name": "&km",
-		"params": [
-			"code"
-		],
-		"type": "UD"
-	},
-	{
-		"code": "&",
-		"name": "&",
-		"params": [
-			"code"
-		],
-		"type": "UD"
-	},
-	{
-		"code": "&mkp",
-		"name": "&mkp",
-		"params": [
-			"code"
-		],
-		"type": "UD"
-	},
-	{
-		"code": "&mok",
-		"name": "&mok",
-		"params": [
-			"code"
-		],
-		"type": "UD"
-	},
 	{
 		"code": "&kpkp",
 		"name": "&kpkp",
@@ -135,4 +95,4 @@
 		],
 		"type": "UD"
 	}
-]
+]