feat(users/flokli/kb): enable mouse support r/8932

This switches to a ZMK branch with support for mouse movement, and sets
MIRYOKU_KLUDGE_MOUSEKEYSPR so miryoku makes use of the functionality.

Change-Id: I3d4f48f10d50c202f909bec15189106a1bbcc1b3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12796
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI

5 files changed, 37 insertions, 7 deletions

diff --git a/users/flokli/keyboards/0001-custom_config-define-MIRYOKU_KLUDGE_MOUSEKEYSPR.patch b/users/flokli/keyboards/0001-custom_config-define-MIRYOKU_KLUDGE_MOUSEKEYSPR.patch
new file mode 100644
index 000000000000..8d9089eae9d9
--- /dev/null
+++ b/users/flokli/keyboards/0001-custom_config-define-MIRYOKU_KLUDGE_MOUSEKEYSPR.patch
@@ -0,0 +1,21 @@
+From 9414e9bfe9aad3a87d34cb8e1cdbef081d38a37c Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Fri, 15 Nov 2024 16:29:17 +0200
+Subject: [PATCH] custom_config: #define MIRYOKU_KLUDGE_MOUSEKEYSPR
+
+---
+ miryoku/custom_config.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/miryoku/custom_config.h b/miryoku/custom_config.h
+index 1097bcb..48a1b5f 100644
+--- a/miryoku/custom_config.h
++++ b/miryoku/custom_config.h
+@@ -1,3 +1,4 @@
+ // Copyright 2021 Manna Harbour
+ // https://github.com/manna-harbour/miryoku
+ 
++#define MIRYOKU_KLUDGE_MOUSEKEYSPR
+-- 
+2.46.1
+
diff --git a/users/flokli/keyboards/chocofi/default.nix b/users/flokli/keyboards/chocofi/default.nix
index b8343f9592cc..a023173eaae1 100644
--- a/users/flokli/keyboards/chocofi/default.nix
+++ b/users/flokli/keyboards/chocofi/default.nix
@@ -4,8 +4,12 @@ rec {
     name = "nice_nano_v2";
     board = "nice_nano_v2";
     shield = "corne_%PART% nice_view_adapter nice_view";
-    zephyrDepsHash = "sha256-D5CAlrO/E6DPbtUJyh/ec8ACpo1XM1jx2gLS2TpklBQ=";
+    zephyrDepsHash = "sha256-Qe9G5YLEi9iG5QdmJCxcmQTpzUCBYkfa84zk7SVRSgQ=";
     src = depot.users.flokli.keyboards.miryoku_config;
+    extraCmakeFlags = [
+      "-DCONFIG_ZMK_MOUSE=y"
+      "-DCONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y"
+    ];
   };
 
   config-flat = depot.users.flokli.keyboards.mkFlatConfig "corne";
diff --git a/users/flokli/keyboards/corneish_zen/default.nix b/users/flokli/keyboards/corneish_zen/default.nix
index 5583cc929ee4..703359bd488c 100644
--- a/users/flokli/keyboards/corneish_zen/default.nix
+++ b/users/flokli/keyboards/corneish_zen/default.nix
@@ -3,8 +3,12 @@ rec {
   firmware = depot.users.flokli.keyboards.buildSplitKeyboard {
     name = "corneish_zen_v1";
     board = "corneish_zen_v1_%PART%";
-    zephyrDepsHash = "sha256-D5CAlrO/E6DPbtUJyh/ec8ACpo1XM1jx2gLS2TpklBQ=";
+    zephyrDepsHash = "sha256-Qe9G5YLEi9iG5QdmJCxcmQTpzUCBYkfa84zk7SVRSgQ=";
     src = depot.users.flokli.keyboards.miryoku_config;
+    extraCmakeFlags = [
+      "-DCONFIG_ZMK_MOUSE=y"
+      "-DCONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y"
+    ];
   };
 
   config-flat = depot.users.flokli.keyboards.mkFlatConfig "corneish_zen";
diff --git a/users/flokli/keyboards/default.nix b/users/flokli/keyboards/default.nix
index d843d541df53..4e207863a9f7 100644
--- a/users/flokli/keyboards/default.nix
+++ b/users/flokli/keyboards/default.nix
@@ -5,8 +5,8 @@ let
   zmk-nix = pkgs.fetchFromGitHub {
     owner = "lilyinstarlight";
     repo = "zmk-nix";
-    rev = "d72e94ab94b2bceb60a29a2a8c2e1d304a4e922e";
-    hash = "sha256-3WXPPBJ2u8rMxejPhUahSiqOBr1BOfTgDa7oQDPtw54=";
+    rev = "1d7d7aeef7c62d3a80a688b26c6484123c26cde6";
+    hash = "sha256-7W+slivoV0zSfDxXlhMVL3yPodrhCiYQiFbtbco1r5U=";
   };
 
   zmk_builders = pkgs.callPackage (import (zmk-nix + "/nix/builders.nix")) { };
@@ -14,8 +14,8 @@ let
   miryoku_zmk = pkgs.fetchFromGitHub {
     owner = "manna-harbour";
     repo = "miryoku_zmk";
-    rev = "e6683e9f8b6c199b339208b1b501e88a7308ed48";
-    hash = "sha256-GjTbAoyhr557Tn4JaWsA3Po5KxMsQXrpKc9H+PU3T8A=";
+    rev = "a1f1eae0666b7b33ad789b10822297169754a349";
+    hash = "sha256-4jYz5fudTW45hbwhRRGBdiAbu596X9zSiCio/tS85d0=";
   };
 
   miryoku_zmk_patched = pkgs.runCommand "miryoku_zmk_patched" { } ''
@@ -25,6 +25,7 @@ let
     chmod -R +w $out
     patch -p1 < ${./0001-miryoku_layer_alternatives.h-expose-alt-gr-on-G-and-.patch}
     patch -p1 < ${./0001-miryoku_behaviors-add-quick-tap-ms-require-prior-idl.patch}
+    patch -p1 < ${./0001-custom_config-define-MIRYOKU_KLUDGE_MOUSEKEYSPR.patch}
   '';
 
   miryoku_config = pkgs.runCommand "config" { } ''
diff --git a/users/flokli/keyboards/west.yml b/users/flokli/keyboards/west.yml
index b48d4a66e986..5596455f018b 100644
--- a/users/flokli/keyboards/west.yml
+++ b/users/flokli/keyboards/west.yml
@@ -28,7 +28,7 @@ manifest:
           - trusted-firmware-m
     - name: zmk
       remote: zmkfirmware
-      revision: 7f1ee320ab638245bbdae9b1cda5d5c50e2cb16e  # main
+      revision: refs/pull/2477/head  # mouse move and scroll support PR
       import: app/west.yml
   self:
     path: config