Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: manna-harbour/miryoku_zmk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: matthewtodd/miryoku_zmk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: matthewtodd
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 6 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 27, 2024

  1. Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    1fda5de View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    09db9b1 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    a6bb799 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    3fdc0ab View commit details

Commits on Oct 5, 2024

  1. Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    655eec7 View commit details
  2. Undo natural scrolling.

    matthewtodd committed Oct 5, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    matthewtodd Matthew Todd
    Copy the full SHA
    3d1d03d View commit details
Showing with 54 additions and 3 deletions.
  1. +21 −0 .github/workflows/ferris-sweep.yml
  2. +2 −0 miryoku/custom_config.h
  3. +3 −3 miryoku/miryoku_babel/miryoku_layer_alternatives.h
  4. +25 −0 miryoku/miryoku_behaviors.dtsi
  5. +3 −0 miryoku/miryoku_behaviors.h
21 changes: 21 additions & 0 deletions .github/workflows/ferris-sweep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2022 Manna Harbour
# https://github.com/manna-harbour/miryoku

name: 'Ferris Sweep'
on:
workflow_dispatch:
push:
branches:
- matthewtodd
pull_request:
branches:
- matthewtodd
jobs:
build:
uses: ./.github/workflows/main.yml
secrets: inherit
with:
board: '["nice_nano_v2"]'
shield: '["cradio_left","cradio_right"]'
kconfig: '["CONFIG_ZMK_MOUSE=y"]'
branches: '["petejohanson/zmk/feat/pointers-move-scroll"]'
2 changes: 2 additions & 0 deletions miryoku/custom_config.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Copyright 2021 Manna Harbour
// https://github.com/manna-harbour/miryoku

#define MIRYOKU_CLIPBOARD_MAC
#define MIRYOKU_KLUDGE_MOUSEKEYSPR
6 changes: 3 additions & 3 deletions miryoku/miryoku_babel/miryoku_layer_alternatives.h
Original file line number Diff line number Diff line change
@@ -86,8 +86,8 @@ U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, SPACE),U_LT

#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDH \
&kp Q, &kp W, &kp F, &kp P, &kp B, &kp J, &kp L, &kp U, &kp Y, &kp SQT, \
U_MT(LGUI, A), U_MT(LALT, R), U_MT(LCTRL, S), U_MT(LSHFT, T), &kp G, &kp M, U_MT(LSHFT, N), U_MT(LCTRL, E), U_MT(LALT, I), U_MT(LGUI, O), \
U_LT(U_BUTTON, Z), U_MT(RALT, X), &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, U_MT(RALT, DOT), U_LT(U_BUTTON, SLASH),\
U_LMT(LCTRL, A), U_LMT(LALT, R), U_LMT(LGUI, S), U_LMT(LSHFT, T), &kp G, &kp M, U_RMT(LSHFT, N), U_RMT(LGUI, E), U_RMT(LALT, I), U_RMT(LCTRL, O), \
U_LT(U_BUTTON, Z), U_LMT(RALT, X), &kp C, &kp D, &kp V, &kp K, &kp H, &kp COMMA, U_RMT(RALT, DOT), U_LT(U_BUTTON, SLASH),\
U_NP, U_NP, U_LT(U_MEDIA, ESC),U_LT(U_NAV, SPACE),U_LT(U_MOUSE, TAB),U_LT(U_SYM, RET), U_LT(U_NUM, BSPC), U_LT(U_FUN, DEL), U_NP, U_NP

#define MIRYOKU_ALTERNATIVES_BASE_COLEMAKDHK \
@@ -306,7 +306,7 @@ U_NP, U_NP, U_NA, U_NA, U_NA
#define MIRYOKU_ALTERNATIVES_MOUSE \
U_BOOT, &u_to_U_TAP, &u_to_U_EXTRA, &u_to_U_BASE, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND, \
&kp LGUI, &kp LALT, &kp LCTRL, &kp LSHFT, U_NA, U_NU, U_MS_L, U_MS_D, U_MS_U, U_MS_R, \
U_NA, &kp RALT, &u_to_U_SYM, &u_to_U_MOUSE, U_NA, U_NU, U_WH_L, U_WH_D, U_WH_U, U_WH_R, \
U_NA, &kp RALT, &u_to_U_SYM, &u_to_U_MOUSE, U_NA, U_NU, U_WH_R, U_WH_U, U_WH_D, U_WH_L, \
U_NP, U_NP, U_NA, U_NA, U_NA, U_BTN2, U_BTN1, U_BTN3, U_NP, U_NP


25 changes: 25 additions & 0 deletions miryoku/miryoku_behaviors.dtsi
Original file line number Diff line number Diff line change
@@ -17,5 +17,30 @@
flavor = "tap-preferred";
bindings = <&mo>, <&kp>;
};

// urob's timeless home row mods
// https://github.com/urob/zmk-config?tab=readme-ov-file#timeless-homerow-mods
u_lmt: u_lmt {
compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>;
tapping-term-ms = <U_TAPPING_TERM>;
quick-tap-ms = <175>;
require-prior-idle-ms = <150>;
flavor = "balanced";
hold-trigger-key-positions = <5 6 7 8 9 15 16 17 18 19 25 26 27 28 29 33 34 35 36>;
hold-trigger-on-release;
bindings = <&kp>, <&kp>;
};
u_rmt: u_rmt {
compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>;
tapping-term-ms = <U_TAPPING_TERM>;
quick-tap-ms = <175>;
require-prior-idle-ms = <150>;
flavor = "balanced";
hold-trigger-key-positions = <0 1 2 3 4 10 11 12 13 14 20 21 22 23 24 33 34 35 36>;
hold-trigger-on-release;
bindings = <&kp>, <&kp>;
};
};
};
3 changes: 3 additions & 0 deletions miryoku/miryoku_behaviors.h
Original file line number Diff line number Diff line change
@@ -5,3 +5,6 @@

#define U_MT(MOD, TAP) &u_mt MOD TAP
#define U_LT(LAYER, TAP) &u_lt LAYER TAP

#define U_LMT(MOD, TAP) &u_lmt MOD TAP
#define U_RMT(MOD, TAP) &u_rmt MOD TAP