refactor: update totem keymap and file structure for newer zephir

Author: simeonoff

Justfile

@@ -2,6 +2,7 @@ default:
     @just --list --unsorted
 
 config := absolute_path('config')
+module := absolute_path('config/zmk-user-module')
 build := absolute_path('.build')
 out := absolute_path('firmware')
 
@@ -11,25 +12,7 @@ _parse_combos:
     set -euo pipefail
     cconf="{{ config / 'combos.dtsi' }}"
     if [[ -f $cconf ]]; then
-        # set MAX_COMBOS_PER_KEY to the most frequent combos count
-        count=$(
-            tail -n +10 $cconf |
-                grep -Eo '[LR][TMBH][0-9]' |
-                sort | uniq -c | sort -nr |
-                awk 'NR==1{print $1}'
-        )
-        sed -Ei "/CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY/s/=.+/=$count/" "{{ config }}"/*.conf
-        echo "Setting MAX_COMBOS_PER_KEY to $count"
-
-        # set MAX_KEYS_PER_COMBO to the most frequent key count
-        count=$(
-            tail -n +10 $cconf |
-                grep -o -n '[LR][TMBH][0-9]' |
-                cut -d : -f 1 | uniq -c | sort -nr |
-                awk 'NR==1{print $1}'
-        )
-        sed -Ei "/CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO/s/=.+/=$count/" "{{ config }}"/*.conf
-        echo "Setting MAX_KEYS_PER_COMBO to $count"
+        echo "Combos are auto-calculated; no config updates needed."
     fi
 
 # parse build.yaml and filter targets by expression
@@ -49,6 +32,7 @@ _build_single $board $shield $snippet *west_args:
     echo "Building firmware for $artifact..."
     west build -s zmk/app -d "$build_dir" -b $board {{ west_args }} ${snippet:+-S "$snippet"} -- \
         ${shield:+-DSHIELD="$shield"} \
+        -DZMK_EXTRA_MODULES="{{ module }}" \
         -DZMK_CONFIG="{{ config }}" \
 
     if [[ -f "$build_dir/zephyr/zmk.uf2" ]]; then

build.yaml

@@ -18,13 +18,13 @@
 #
 ---
 include:
-  - board: nice_nano_v2
+  - board: nice_nano
     shield: splitkb_aurora_corne_left
     snippet: studio-rpc-usb-uart
     cmake-args: -DCONFIG_ZMK_STUDIO=y
-  - board: nice_nano_v2
+  - board: nice_nano
     shield: splitkb_aurora_corne_right
-  - board: seeeduino_xiao_ble
+  - board: xiao_ble
     shield: totem_left
-  - board: seeeduino_xiao_ble
+  - board: xiao_ble
     shield: totem_right

config/totem.conf

@@ -2,9 +2,6 @@
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
 
-# Combo config, automated by build script
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
-CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
 
 # Bluetooth tweaks
 CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y