Switch to vanilla ZMK & bump version

Back to vanilla ZMK! Yay!

To get rid of the remaining few custom dependencies I am making a few
additional small changes:

- Drop generic usage page keycodes for now (they didn't work on
  bluetooth for me)
- Stop using display tweaks for Corneish Zen (at this point my display
  is almost dead anyhow & I can just disable the widgets alltogether)
- Refactor repo to move Zephyr to the top-level
- Overload zephyr directly from the parent west manifest to get
  child-node fix
- Use custom justfile recipe to get `west test` running

.gitignore

@@ -4,6 +4,7 @@
 .west
 modules
 firmware
+zephyr
 zmk
 # Ignore keymap-drawer output for now
 draw/base.svg

config/base.keymap

@@ -235,7 +235,7 @@ ZMK_LAYER(nav,
 
 ZMK_LAYER(fn,
 //╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮
-    X_LT     &kp F12       &kp F7        &kp F8        &kp F9        ___             X_MT     ___           &kp C_PREV    &kp C_VOL_UP  &kp C_NEXT   &kp SYSTEM_SLEEP X_RT
+    X_LT     &kp F12       &kp F7        &kp F8        &kp F9        ___             X_MT     ___           &kp C_PREV    &kp C_VOL_UP  &kp C_NEXT    ___             X_RT
 //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
     X_LM     &hml LGUI F11 &hml LALT F4  &hml LSHFT F5 &hml LCTRL F6 ___             X_MM     ___           DSK_PREV      VOL_DOWN      DSK_NEXT      ___             X_RM
 //├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤

config/corneish_zen.conf

@@ -3,20 +3,16 @@ CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
 
 # Enable mouse
-CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_POINTING=y
-CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y
+CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y
-
-# Enable generic desktop usages
-CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y
 
 # Combo config, automated by build script
 CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
 
-# Zen display tweaks, requires patches by caksoylar
+# Don't show layer status
-CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
+#CONFIG_CUSTOM_WIDGET_BATTERY_STATUS=n
-CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
+CONFIG_CUSTOM_WIDGET_LAYER_STATUS=n
-CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
 
 # Bluetooth tweaks
 CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y

config/glove80.conf

@@ -3,11 +3,8 @@ CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
 
 # Enable mouse
-CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_POINTING=y
-CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y
+CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y
-
-# Generic desktop usages
-CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y
 
 # Combo config, automated by build script
 CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6

config/mouse.dtsi

@@ -1,7 +1,7 @@
 #define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500  // 600
 #define ZMK_MOUSE_DEFAULT_SCRL_VAL 20    // 10
 
-#include <dt-bindings/zmk/mouse.h>
+#include <dt-bindings/zmk/pointing.h>
 
 // Config from @caksoylar, defaults in comments
 &mmv {
@@ -24,4 +24,3 @@
 #define U_WH_D &msc SCRL_DOWN
 #define U_WH_L &msc SCRL_LEFT
 #define U_WH_R &msc SCRL_RIGHT
-

config/planck_rev6.conf

@@ -1,11 +1,8 @@
 CONFIG_ZMK_KEYBOARD_NAME="Planck Rev6"
 
 # Enable mouse
-CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_POINTING=y
-CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y
+CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y
-
-# Enable generic desktop usages
-CONFIG_ZMK_HID_GENERIC_DESKTOP_USAGES_BASIC=y
 
 # Combo config, automated by build script
 CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6

config/west.yml

@@ -1,13 +1,12 @@
 # This file specifies the build dependencies for Github Action workflows and
-# for local build environments. The workspace has three toplevel directories
+# for local build environments. The workspace has four toplevel directories
-# containing the user config, user modules and ZMK. Zephyr and its dependencies
+# containing the user config, modules, zephy and ZMK.
-# are namespaced under /zmk to keep the toplevel clean.
 #
 # ZMK-Workspace
 # ├── config
-# ├── modules (user modules)
+# ├── modules
+# ├── zephyr
 # └── zmk
-#     └── modules (Zephyr modules)
 #
 # To create a local build environment, clone this repository and then run the
 # following commands from its toplevel directory:
@@ -23,28 +22,56 @@ manifest:
     revision: v0.1
 
   remotes:
-    - name: upstream
-      url-base: https://github.com/zmkfirmware
     - name: urob
       url-base: https://github.com/urob
+    - name: zmkfirmware
+      url-base: https://github.com/zmkfirmware
 
   projects:
-    - name: zmk-auto-layer
+    # This is vanilla ZMK - just using my remote to pin the current state of main,
-      path: modules/auto-layer
+    # as upstream hasn't yet released a version with mouse.
-    - name: zmk-helpers
-      path: modules/helpers
-    - name: zmk-leader-key
-      path: modules/leader-key
-    - name: zmk-tri-state
-      path: modules/tri-state
-
-    # ZMK with Zephyr namespaced under /zmk. This requires that ZMK imports
-    # Zephyr with a path other than `zephyr` (as in `going-modular`).
     - name: zmk
-      path: .
+      revision: v0.1+mouse
+      import: app/west.yml
+
+    # ZMK modules
+    - name: zmk-adaptive-key
+      path: modules/zmk/adaptive-key
+    - name: zmk-auto-layer
+      path: modules/zmk/auto-layer
+    - name: zmk-helpers
+      path: modules/zmk/helpers
+    - name: zmk-leader-key
+      revision: v0.1+locality
+      path: modules/zmk/leader-key
+    - name: zmk-tri-state
+      path: modules/zmk/tri-state
+
+    # Temporarily overload Zephyr until
+    # https://github.com/zmkfirmware/zephyr/pull/40 is merged.
+    - name: zephyr
+      revision: v3.5.0+zmk-fixes
+      clone-depth: 1
       import:
-        file: app/west.yml
+        name-blocklist:
-        path-prefix: zmk
+          - ci-tools
+          - hal_altera
+          - hal_cypress
+          - hal_infineon
+          - hal_microchip
+          - hal_nxp
+          - hal_openisa
+          - hal_silabs
+          - hal_xtensa
+          - hal_st
+          - hal_ti
+          - loramac-node
+          - mcuboot
+          - mcumgr
+          - net-tools
+          - openthread
+          - edtt
+          - trusted-firmware-m
 
   self:
     path: config