Delete .dir-locals.el

.dir-locals.el

@@ -1,5 +0,0 @@
-;;; Directory Local Variables            -*- no-byte-compile: t -*-
-;;; For more information see (info "(emacs) Directory Variables")
-
-((auto-mode-alist . (("\\.keymap\\'" . c-mode)))
- (c-mode . ((tab-width . 4))))

config/cradio.keymap

@@ -16,6 +16,8 @@
 #define WNAV 3
 #define NUM 4
 #define FUN 5
+#define MODS 6
+#define FRA 7
 #define VOL_DN C_VOL_DN
 #define VOL_UP C_VOL_UP
 
@@ -49,7 +51,7 @@
         hml: hml {
             compatible = "zmk,behavior-hold-tap";
             flavor = "balanced";
-            tapping-term-ms = <220>;
+            tapping-term-ms = <280>;
             quick-tap-ms = <175>;                // repeat on tap-into-hold
             require-prior-idle-ms = <150>;
             #binding-cells = <2>;
@@ -61,7 +63,7 @@
         hmr: hmr {
             compatible = "zmk,behavior-hold-tap";
             flavor = "balanced";
-            tapping-term-ms = <220>;
+            tapping-term-ms = <280>;
             quick-tap-ms = <175>;                // repeat on tap-into-hold
             require-prior-idle-ms = <150>;
             #binding-cells = <2>;
@@ -69,34 +71,6 @@
             hold-trigger-key-positions = <KEYS_L THUMBS>;
             hold-trigger-on-release;             // delay positional check until key-release
         };
-
-        lpar_lt: lpar_lt {
-            compatible = "zmk,behavior-mod-morph";
-            mods = <(MOD_LSFT | MOD_RSFT)>;
-            #binding-cells = <0>;
-            bindings = <&kp LPAR>, <&kp LT>;
-        };
-
-        rpar_gt: rpar_gt {
-            compatible = "zmk,behavior-mod-morph";
-            mods = <(MOD_LSFT | MOD_RSFT)>;
-            #binding-cells = <0>;
-            bindings = <&kp RPAR>, <&kp GT>;
-        };
-
-        lbrc_lbkt: lbrc_lbkt {
-            compatible = "zmk,behavior-mod-morph";
-            mods = <(MOD_LSFT | MOD_RSFT)>;
-            #binding-cells = <0>;
-            bindings = <&kp LBRC>, <&kp LBKT>;
-        };
-
-        rbrc_rbkt: rbrc_rbkt {
-            compatible = "zmk,behavior-mod-morph";
-            mods = <(MOD_LSFT | MOD_RSFT)>;
-            #binding-cells = <0>;
-            bindings = <&kp RBRC>, <&kp RBKT>;
-        };
     };
 
     conditional_layers {
@@ -109,7 +83,12 @@
 
     combos {
         compatible = "zmk,combos";
-
+        combo_clear {
+            timeout-ms = <25>;
+            key-positions = <LT1 LT0>;
+            bindings = <&kp K_CANCEL>;
+            layers = <BASE>;
+        };
         combo_escape {
             timeout-ms = <25>;
             key-positions = <LT2 LT1>;
@@ -125,7 +104,7 @@
         combo_tab {
             timeout-ms = <25>;
             key-positions = <LM2 LM1>;
-            bindings = <&kp TAB>;
+            bindings = <&lt MODS TAB>;
             layers = <BASE>;
         };
 
@@ -143,64 +122,31 @@
             layers = <BASE>;
         };
 
-        combo_lpar {
-            timeout-ms = <40>;
-            key-positions = <LT1 LM1>;
-            bindings = <&lpar_lt>;
-            layers = <BASE>;
-        };
-        combo_rpar {
-            timeout-ms = <40>;
-            key-positions = <RT1 RM1>;
-            bindings = <&rpar_gt>;
-            layers = <BASE>;
-        };
-
-        combo_lbrc {
-            timeout-ms = <40>;
-            key-positions = <LT2 LM2>;
-            bindings = <&lbrc_lbkt>;
-            layers = <BASE>;
-        };
-        combo_rbrc {
-            timeout-ms = <40>;
-            key-positions = <RT2 RM2>;
-            bindings = <&rbrc_rbkt>;
-            layers = <BASE>;
-        };
-
         combo_minus {
             timeout-ms = <40>;
-            key-positions = <LT0 LM0>;
+            key-positions = <LT1 LM1>;
             bindings = <&kp MINUS>;
             layers = <BASE>;
         };
         combo_underscore {
             timeout-ms = <40>;
-            key-positions = <LM0 LB0>;
+            key-positions = <LM1 LB1>;
             bindings = <&kp UNDERSCORE>;
             layers = <BASE>;
         };
 
         combo_colon {
             timeout-ms = <40>;
-            key-positions = <RT0 RM0>;
+            key-positions = <RT1 RM1>;
             bindings = <&kp COLON>;
             layers = <BASE>;
         };
         combo_semi {
             timeout-ms = <40>;
-            key-positions = <RM0 RB0>;
+            key-positions = <RM1 RB1>;
             bindings = <&kp SEMI>;
             layers = <BASE>;
         };
-
-        combo_boot {
-            timeout-ms = <40>;
-            key-positions = <LB4 LB3>;
-            bindings = <&bootloader>;
-            layers = <BASE>;
-        };
     };
 
     keymap {
@@ -224,7 +170,7 @@
 
         sym {
             bindings = <
-       //╭──────────┬──────────┬──────────┬──────────┬──────────╮   ╭──────────┬──────────┬──────────┬──────────┬──────────╮
+        //╭──────────┬──────────┬──────────┬──────────┬──────────╮   ╭──────────┬──────────┬──────────┬──────────┬──────────╮
         //│  ~       │  &       │  *       │  +       │          │   │          │  =       │  \       │  |       │  `       │
             &kp TILDE  &kp AMPS   &kp STAR   &kp PLUS   &none          &none      &kp EQUAL  &kp BSLH   &kp PIPE   &kp GRAVE
         //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
@@ -306,5 +252,22 @@
         //                                 ╰──────────┴──────────╯   ╰──────────┴──────────╯
             >;
         };
+
+        mods {
+            bindings = <
+        //╭──────────┬──────────┬──────────┬──────────┬──────────╮   ╭──────────┬──────────┬──────────┬──────────┬──────────╮
+        //│          │          │          │          │          │   │          │          │          │          │          │
+          &bootloader  &trans     &trans     &trans     &trans         &none      &none      &none      &none      &none
+        //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
+        //│  -       │          │          │          │          │   │          │  CTRL    │  ALT     │  CMD     │  SHIFT   │
+            &trans     &trans     &trans     &trans     &trans         &none      &sk LCTRL  &sk LALT   &sk LCMD   &sk LSHFT
+        //├──────────┼──────────┼──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┼──────────┼──────────┤
+        //│          │          │          │          │          │   │          │          │  RALT    │          │          │
+            &trans     &trans     &trans     &trans     &trans         &none      &none      &sk RALT   &none      &none
+        //╰──────────┴──────────┴──────────┼──────────┼──────────┤   ├──────────┼──────────┼──────────┴──────────┴──────────╯
+                                             &trans     &trans         &trans     &trans
+        //                                 ╰──────────┴──────────╯   ╰──────────┴──────────╯
+            >;
+        };
     };
 };

keymap-drawer/config.yaml

@@ -8,7 +8,7 @@ draw_config:
   key_ry: 6.0
   dark_mode: false
   n_columns: 1
-  separate_combo_diagrams: true
+  separate_combo_diagrams: false
   combo_diagrams_scale: 2
   inner_pad_w: 2.0
   inner_pad_h: 2.0
@@ -133,21 +133,6 @@ parse_config:
       tap: $$mdi:bluetooth-connect$$
       shifted: '4'
       type: text_with_symblol
-
-    '&bootloader': "BOOT"
-
-    '&lpar_lt':
-      tap: "("
-      hold: "<"
-    '&rpar_gt':
-      tap: ")"
-      hold: ">"
-    '&lbrc_lbkt':
-      tap: '{'
-      hold: '['
-    '&rbrc_rbkt':
-      tap: '}'
-      hold: ']'
   sticky_label: $$mdi:circle-small$$
   toggle_label: $$mdi:toggle-switch$$
   tap_toggle_label: tap-toggle

keymap-drawer/cradio.yaml

@@ -1,4 +1,4 @@
-layout: {zmk_keyboard: cradio}
+layout: {qmk_keyboard: ferris/sweep}
 layers:
   base:
   - Q
@@ -210,7 +210,45 @@ layers:
   - {type: held}
   - {type: held}
   - {t: '$$mdi:chevron-down$$', type: trans}
+  mods:
+  - '&bootloader'
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - ''
+  - ''
+  - ''
+  - ''
+  - ''
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {type: held}
+  - {type: held}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - ''
+  - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'}
+  - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
+  - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'}
+  - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - ''
+  - ''
+  - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'}
+  - ''
+  - ''
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
+  - {t: '$$mdi:chevron-down$$', type: trans}
 combos:
+- p: [3, 4]
+  k: CANCEL
+  l: [base]
 - p: [2, 3]
   k: $$mdi:keyboard-esc$$
   l: [base]
@@ -218,7 +256,7 @@ combos:
   k: '='
   l: [base]
 - p: [12, 13]
-  k: $$mdi:keyboard-tab$$
+  k: {t: '$$mdi:keyboard-tab$$', h: mods}
   l: [base]
 - p: [7, 8]
   k: $$mdi:backspace-outline$$
@@ -227,29 +265,14 @@ combos:
   k: $$mdi:keyboard-return$$
   l: [base]
 - p: [3, 13]
-  k: {t: (, h: <}
-  l: [base]
-- p: [6, 16]
-  k: {t: ), h: '>'}
-  l: [base]
-- p: [2, 12]
-  k: {t: '{', h: '['}
-  l: [base]
-- p: [7, 17]
-  k: {t: '}', h: ']'}
-  l: [base]
-- p: [4, 14]
   k: '-'
   l: [base]
-- p: [14, 24]
+- p: [13, 23]
   k: _
   l: [base]
-- p: [5, 15]
+- p: [6, 16]
   k: ':'
   l: [base]
-- p: [15, 25]
+- p: [16, 26]
   k: ;
   l: [base]
-- p: [20, 21]
-  k: BOOT
-  l: [base]