From e0157ca1f86101d5b5067a6809ebce6b9d9f46e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaz=C3=A9?= Date: Sat, 14 Mar 2026 17:06:31 +0100 Subject: [PATCH] 2-space indentation --- .editorconfig | 2 +- include/selenium/aliases/azerty.h | 1 - include/selenium/aliases/ergol.h | 1 - include/selenium/aliases/qwerty.h | 1 - include/selenium/extra_layers/azerty.dtsi | 64 ++-- include/selenium/hold_taps.dtsi | 345 +++++++++++----------- 6 files changed, 205 insertions(+), 209 deletions(-) diff --git a/.editorconfig b/.editorconfig index 0e13158..6ca87f2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ [*] charset = utf-8 end_of_line = lf -indent_size = 4 +indent_size = 2 insert_final_newline = true trim_trailing_whitespace = true diff --git a/include/selenium/aliases/azerty.h b/include/selenium/aliases/azerty.h index 243b6a3..909609d 100644 --- a/include/selenium/aliases/azerty.h +++ b/include/selenium/aliases/azerty.h @@ -61,4 +61,3 @@ #define S_COMMA &kp M #define S_DOT &kp LS(COMMA) #define S_MONEY &kp RA(E) - diff --git a/include/selenium/aliases/ergol.h b/include/selenium/aliases/ergol.h index feb6cb8..deb4d5c 100644 --- a/include/selenium/aliases/ergol.h +++ b/include/selenium/aliases/ergol.h @@ -61,4 +61,3 @@ #define S_COMMA &kp DOT #define S_DOT &kp N #define S_MONEY &kp LS(N1) - diff --git a/include/selenium/aliases/qwerty.h b/include/selenium/aliases/qwerty.h index 1666da4..6985dd0 100644 --- a/include/selenium/aliases/qwerty.h +++ b/include/selenium/aliases/qwerty.h @@ -61,4 +61,3 @@ #define S_COMMA &kp COMMA #define S_DOT &kp DOT #define S_MONEY &kp DLLR - diff --git a/include/selenium/extra_layers/azerty.dtsi b/include/selenium/extra_layers/azerty.dtsi index aabe508..27b63a1 100644 --- a/include/selenium/extra_layers/azerty.dtsi +++ b/include/selenium/extra_layers/azerty.dtsi @@ -1,42 +1,42 @@ #define DK_LAYER EXTRA_LAYERS_START_INDEX &base_layer { - display-name = "Base"; - bindings = ; + display-name = "Base"; + bindings = ; }; / { - macros { - kpc: circumflex { - compatible = "zmk,behavior-macro-one-param"; - #binding-cells = <1>; - tap-ms = <0>; - wait-ms = <0>; - bindings - = <¯o_tap &kp LBKT> - , <¯o_pause_for_release> - , <¯o_param_1to1> - , <&kp MACRO_PLACEHOLDER> - ; - }; - spc: space_after_dk { - compatible = "zmk,behavior-macro-one-param"; - #binding-cells = <1>; - tap-ms = <0>; - wait-ms = <0>; - bindings - = <¯o_param_1to1> - , <&kp MACRO_PLACEHOLDER> - , <¯o_pause_for_release> - , <¯o_tap &kp SPACE> - ; - }; + macros { + kpc: circumflex { + compatible = "zmk,behavior-macro-one-param"; + #binding-cells = <1>; + tap-ms = <0>; + wait-ms = <0>; + bindings + = <¯o_tap &kp LBKT> + , <¯o_pause_for_release> + , <¯o_param_1to1> + , <&kp MACRO_PLACEHOLDER> + ; }; + spc: space_after_dk { + compatible = "zmk,behavior-macro-one-param"; + #binding-cells = <1>; + tap-ms = <0>; + wait-ms = <0>; + bindings + = <¯o_param_1to1> + , <&kp MACRO_PLACEHOLDER> + , <¯o_pause_for_release> + , <¯o_tap &kp SPACE> + ; + }; + }; }; // Extra layers defined specifically for this keymap, appended to the base keymap. diff --git a/include/selenium/hold_taps.dtsi b/include/selenium/hold_taps.dtsi index 50beb97..d21db42 100644 --- a/include/selenium/hold_taps.dtsi +++ b/include/selenium/hold_taps.dtsi @@ -33,27 +33,27 @@ #endif #if defined HT_HOME_ROW_MODS || defined HT_TWO_THUMB_KEYS - #define HRM_S &hrm LGUI S - #define HRM_D &hrm LCTL D - #define HRM_F &hrm LALT F - #define HRM_J &hrm LALT J - #define HRM_K &hrm RCTL K - #define HRM_L &hrm RGUI L + #define HRM_S &hrm LGUI S + #define HRM_D &hrm LCTL D + #define HRM_F &hrm LALT F + #define HRM_J &hrm LALT J + #define HRM_K &hrm RCTL K + #define HRM_L &hrm RGUI L #else - #define HRM_S &kp S - #define HRM_D &kp D - #define HRM_F &kp F - #define HRM_J &kp J - #define HRM_K &kp K - #define HRM_L &kp L + #define HRM_S &kp S + #define HRM_D &kp D + #define HRM_F &kp F + #define HRM_J &kp J + #define HRM_K &kp K + #define HRM_L &kp L #endif #ifdef HRM_SHIFT - #define HRM_A &hrm LSHIFT A - #define HRM_SEMI &hrm RSHIFT SEMI + #define HRM_A &hrm LSHIFT A + #define HRM_SEMI &hrm RSHIFT SEMI #else - #define HRM_A &kp A - #define HRM_SEMI &kp SEMI + #define HRM_A &kp A + #define HRM_SEMI &kp SEMI #endif @@ -62,69 +62,69 @@ */ #ifdef VIM_NAVIGATION - #define NAV_LAYER VIM_NAV_LAYER - #define NUM_LAYER NUM_ROW_LAYER - #define HRM_LAYER NUM_ROW_LAYER - #define S34_LAYER NUM_ROW_LAYER - #define REACH_TAP ESCAPE + #define NAV_LAYER VIM_NAV_LAYER + #define NUM_LAYER NUM_ROW_LAYER + #define HRM_LAYER NUM_ROW_LAYER + #define S34_LAYER NUM_ROW_LAYER + #define REACH_TAP ESCAPE #else - #define NAV_LAYER NUM_NAV_LAYER - #define NUM_LAYER NUM_NAV_LAYER - #define HRM_LAYER FUNCTION_LAYER - #define S34_LAYER NUM_NAV_LAYER - #define REACH_TAP TAB + #define NAV_LAYER NUM_NAV_LAYER + #define NUM_LAYER NUM_NAV_LAYER + #define HRM_LAYER FUNCTION_LAYER + #define S34_LAYER NUM_NAV_LAYER + #define REACH_TAP TAB #endif #if defined HT_TWO_THUMB_KEYS && !defined VIM_NAVIGATION - #define SYM_NUM_LAYER &sc NUM_NAV_LAYER CAPSLOCK + #define SYM_NUM_LAYER &sc NUM_NAV_LAYER CAPSLOCK #else - #define SYM_NUM_LAYER &EZ_SL(NUM_LAYER) + #define SYM_NUM_LAYER &EZ_SL(NUM_LAYER) #endif #ifdef LHAND_SPACE - #define LTHUMB_TT &hrm LCTL SPACE - #define RTHUMB_TT &magic_backspace - #define LTHUMB_HRM < NAV_LAYER SPACE - #define RTHUMB_HRM &magic_backspace - #define LTHUMB_S34 < NAV_LAYER SPACE - #define RTHUMB_S34 &magic_backspace_34_keys + #define LTHUMB_TT &hrm LCTL SPACE + #define RTHUMB_TT &magic_backspace + #define LTHUMB_HRM < NAV_LAYER SPACE + #define RTHUMB_HRM &magic_backspace + #define LTHUMB_S34 < NAV_LAYER SPACE + #define RTHUMB_S34 &magic_backspace_34_keys #else - #define LTHUMB_TT &mt LCTL BACKSPACE - #define RTHUMB_TT &magic_space - #define LTHUMB_HRM &sc NAV_LAYER BACKSPACE - #define RTHUMB_HRM < NAV_LAYER SPACE - #define LTHUMB_S34 &sc NAV_LAYER BACKSPACE - #define RTHUMB_S34 < S34_LAYER SPACE + #define LTHUMB_TT &mt LCTL BACKSPACE + #define RTHUMB_TT &magic_space + #define LTHUMB_HRM &sc NAV_LAYER BACKSPACE + #define RTHUMB_HRM < NAV_LAYER SPACE + #define LTHUMB_S34 &sc NAV_LAYER BACKSPACE + #define RTHUMB_S34 < S34_LAYER SPACE #endif #ifdef HT_NONE - #define LTHUMB_TUCK &kp LALT - #define LTHUMB_HOME &kp LCTL - #define LTHUMB_REACH &kp LGUI - #define RTHUMB_REACH &mo NAV_LAYER - #define RTHUMB_HOME &kp SPACE - #define RTHUMB_TUCK &mo SYMBOLS_LAYER + #define LTHUMB_TUCK &kp LALT + #define LTHUMB_HOME &kp LCTL + #define LTHUMB_REACH &kp LGUI + #define RTHUMB_REACH &mo NAV_LAYER + #define RTHUMB_HOME &kp SPACE + #define RTHUMB_TUCK &mo SYMBOLS_LAYER #elifdef HT_THUMB_TAPS - #define LTHUMB_TUCK &EZ_SK(LSHIFT) - #define LTHUMB_HOME LTHUMB_TT - #define LTHUMB_REACH &mt LGUI REACH_TAP - #define RTHUMB_REACH &mt LALT ENTER - #define RTHUMB_HOME RTHUMB_TT - #define RTHUMB_TUCK &sym_shift_altgr + #define LTHUMB_TUCK &EZ_SK(LSHIFT) + #define LTHUMB_HOME LTHUMB_TT + #define LTHUMB_REACH &mt LGUI REACH_TAP + #define RTHUMB_REACH &mt LALT ENTER + #define RTHUMB_HOME RTHUMB_TT + #define RTHUMB_TUCK &sym_shift_altgr #elifdef HT_HOME_ROW_MODS - #define LTHUMB_TUCK &EZ_SK(LSHIFT) - #define LTHUMB_HOME LTHUMB_HRM - #define LTHUMB_REACH &sc HRM_LAYER REACH_TAP - #define RTHUMB_REACH &sc HRM_LAYER ENTER - #define RTHUMB_HOME RTHUMB_HRM - #define RTHUMB_TUCK &sym_shift_altgr + #define LTHUMB_TUCK &EZ_SK(LSHIFT) + #define LTHUMB_HOME LTHUMB_HRM + #define LTHUMB_REACH &sc HRM_LAYER REACH_TAP + #define RTHUMB_REACH &sc HRM_LAYER ENTER + #define RTHUMB_HOME RTHUMB_HRM + #define RTHUMB_TUCK &sym_shift_altgr #elifdef HT_TWO_THUMB_KEYS - #define LTHUMB_TUCK &mt LSHIFT REACH_TAP - #define LTHUMB_HOME LTHUMB_S34 - #define LTHUMB_REACH LTHUMB_TUCK - #define RTHUMB_REACH &sc SYMBOLS_LAYER ENTER - #define RTHUMB_HOME RTHUMB_S34 - #define RTHUMB_TUCK RTHUMB_REACH + #define LTHUMB_TUCK &mt LSHIFT REACH_TAP + #define LTHUMB_HOME LTHUMB_S34 + #define LTHUMB_REACH LTHUMB_TUCK + #define RTHUMB_REACH &sc SYMBOLS_LAYER ENTER + #define RTHUMB_HOME RTHUMB_S34 + #define RTHUMB_TUCK RTHUMB_REACH #endif @@ -152,139 +152,138 @@ // add our common tap-hold parametesr to the default options &mt { - tapping-term-ms = ; - quick-tap-ms = ; + tapping-term-ms = ; + quick-tap-ms = ; }; -<{ - tapping-term-ms = ; - quick-tap-ms = ; +< { + tapping-term-ms = ; + quick-tap-ms = ; }; / { - behaviors { - hrm: homerow_mods { - compatible = "zmk,behavior-hold-tap"; - #binding-cells = <2>; - tapping-term-ms = ; - quick-tap-ms = ; - flavor = "tap-preferred"; - bindings = <&kp>, <&kp>; - }; - sc: space_cadet { // same as lt, but with hold-preferred - compatible = "zmk,behavior-hold-tap"; - #binding-cells = <2>; - tapping-term-ms = ; - quick-tap-ms = ; - flavor = "hold-preferred"; - bindings = <&mo>, <&kp>; - }; + behaviors { + hrm: homerow_mods { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = ; + quick-tap-ms = ; + flavor = "tap-preferred"; + bindings = <&kp>, <&kp>; + }; + sc: space_cadet { // same as lt, but with hold-preferred + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = ; + quick-tap-ms = ; + flavor = "hold-preferred"; + bindings = <&mo>, <&kp>; + }; - // like ZMK's sticky layer (sl) but with a more robust timing - osl: one_shot_layer { - compatible = "zmk,behavior-macro-one-param"; - #binding-cells = <1>; - tap-ms = <0>; - wait-ms = <0>; - bindings = <¯o_param_1to1>, <¯o_tap &sl MACRO_PLACEHOLDER>; - }; - bsl: better_sticky_layer { - compatible = "zmk,behavior-hold-tap"; - #binding-cells = <2>; - tapping-term-ms = ; - flavor = "tap-preferred"; - bindings = <&mo>, <&osl>; - }; + // like ZMK's sticky layer (sl) but with a more robust timing + osl: one_shot_layer { + compatible = "zmk,behavior-macro-one-param"; + #binding-cells = <1>; + tap-ms = <0>; + wait-ms = <0>; + bindings = <¯o_param_1to1>, <¯o_tap &sl MACRO_PLACEHOLDER>; + }; + bsl: better_sticky_layer { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = ; + flavor = "tap-preferred"; + bindings = <&mo>, <&osl>; + }; - // like ZMK's sticky key (sk) but with a more robust timing - osm: one_shot_modifier { - compatible = "zmk,behavior-macro-one-param"; - #binding-cells = <1>; - tap-ms = <0>; - wait-ms = <0>; - bindings = <¯o_param_1to1>, <¯o_tap &sk MACRO_PLACEHOLDER>; - }; - bsk: better_sticky_key { - compatible = "zmk,behavior-hold-tap"; - #binding-cells = <2>; - tapping-term-ms = ; - flavor = "tap-preferred"; - bindings = <&kp>, <&osm>; - }; + // like ZMK's sticky key (sk) but with a more robust timing + osm: one_shot_modifier { + compatible = "zmk,behavior-macro-one-param"; + #binding-cells = <1>; + tap-ms = <0>; + wait-ms = <0>; + bindings = <¯o_param_1to1>, <¯o_tap &sk MACRO_PLACEHOLDER>; + }; + bsk: better_sticky_key { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = ; + flavor = "tap-preferred"; + bindings = <&kp>, <&osm>; + }; - // mod-morphs to restore Shift+Space and Ctrl+Backspace for certain keymaps - magic_backspace: magic_backspace { - compatible = "zmk,behavior-mod-morph"; - #binding-cells = <0>; - bindings = <&sc NAV_LAYER BACKSPACE>, << NAV_LAYER SPACE>; - mods = ; - keep-mods = ; - }; - magic_space: magic_space { - compatible = "zmk,behavior-mod-morph"; - #binding-cells = <0>; - bindings = << NAV_LAYER SPACE>, <&sc NAV_LAYER BACKSPACE>; - mods = ; - keep-mods = ; - }; - magic_backspace_34_keys: magic_backspace_34_keys { - compatible = "zmk,behavior-mod-morph"; - #binding-cells = <0>; - bindings = <&sc HRM_LAYER BACKSPACE>, << HRM_LAYER SPACE>; - mods = ; - keep-mods = ; - }; + // mod-morphs to restore Shift+Space and Ctrl+Backspace for certain keymaps + magic_backspace: magic_backspace { + compatible = "zmk,behavior-mod-morph"; + #binding-cells = <0>; + bindings = <&sc NAV_LAYER BACKSPACE>, << NAV_LAYER SPACE>; + mods = ; + keep-mods = ; + }; + magic_space: magic_space { + compatible = "zmk,behavior-mod-morph"; + #binding-cells = <0>; + bindings = << NAV_LAYER SPACE>, <&sc NAV_LAYER BACKSPACE>; + mods = ; + keep-mods = ; + }; + magic_backspace_34_keys: magic_backspace_34_keys { + compatible = "zmk,behavior-mod-morph"; + #binding-cells = <0>; + bindings = <&sc HRM_LAYER BACKSPACE>, << HRM_LAYER SPACE>; + mods = ; + keep-mods = ; }; - // XXX this whole AltGr section should probably be inside the `behaviors` branch // AltGr support // Sym becomes Shift+AltGr when combined with exclusively Shift sym_shift_altgr: sym_shift_altgr { - compatible = "zmk,behavior-mod-morph"; - #binding-cells = <0>; - bindings = <&sym_shift_altgr_inner>, <&EZ_SL(SYMBOLS_LAYER)>; - mods = <(MOD_LCTL|MOD_RCTL|MOD_LGUI|MOD_RGUI|MOD_LALT)>; - keep-mods = <(MOD_LCTL|MOD_RCTL|MOD_LGUI|MOD_RGUI|MOD_LALT)>; + compatible = "zmk,behavior-mod-morph"; + #binding-cells = <0>; + bindings = <&sym_shift_altgr_inner>, <&EZ_SL(SYMBOLS_LAYER)>; + mods = <(MOD_LCTL|MOD_RCTL|MOD_LGUI|MOD_RGUI|MOD_LALT)>; + keep-mods = <(MOD_LCTL|MOD_RCTL|MOD_LGUI|MOD_RGUI|MOD_LALT)>; }; sym_shift_altgr_inner: sym_shift_altgr_inner { - compatible = "zmk,behavior-mod-morph"; - #binding-cells = <0>; - bindings = <&EZ_SL(SYMBOLS_LAYER)>, <&EZ_SK(RALT)>; - mods = <(MOD_LSFT|MOD_RSFT)>; - keep-mods = <(MOD_LSFT|MOD_RSFT)>; + compatible = "zmk,behavior-mod-morph"; + #binding-cells = <0>; + bindings = <&EZ_SL(SYMBOLS_LAYER)>, <&EZ_SK(RALT)>; + mods = <(MOD_LSFT|MOD_RSFT)>; + keep-mods = <(MOD_LSFT|MOD_RSFT)>; }; // go to base layer and press mod lkp: goto_layer_then_keypress { - compatible = "zmk,behavior-macro-one-param"; - wait-ms = <0>; - tap-ms = <0>; - #binding-cells = <1>; - bindings = - <¯o_tap &to BASE_LAYER>, - <¯o_param_1to1>, - <¯o_press &kp MACRO_PLACEHOLDER>, - <¯o_pause_for_release>, - <¯o_param_1to1>, - <¯o_release &kp MACRO_PLACEHOLDER>; + compatible = "zmk,behavior-macro-one-param"; + wait-ms = <0>; + tap-ms = <0>; + #binding-cells = <1>; + bindings = + <¯o_tap &to BASE_LAYER>, + <¯o_param_1to1>, + <¯o_press &kp MACRO_PLACEHOLDER>, + <¯o_pause_for_release>, + <¯o_param_1to1>, + <¯o_release &kp MACRO_PLACEHOLDER>; }; losm: goto_layer_then_osm { - compatible = "zmk,behavior-macro-one-param"; - wait-ms = <0>; - tap-ms = <0>; - #binding-cells = <1>; - bindings = - <¯o_tap &to BASE_LAYER>, - <¯o_param_1to1>, - <¯o_tap &sk MACRO_PLACEHOLDER>; + compatible = "zmk,behavior-macro-one-param"; + wait-ms = <0>; + tap-ms = <0>; + #binding-cells = <1>; + bindings = + <¯o_tap &to BASE_LAYER>, + <¯o_param_1to1>, + <¯o_tap &sk MACRO_PLACEHOLDER>; }; lbsk: bsk_on_other_layer { - compatible = "zmk,behavior-hold-tap"; - #binding-cells = <2>; - tapping-term-ms = ; - flavor = "tap-preferred"; - bindings = <&lkp>, <&losm>; + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = ; + flavor = "tap-preferred"; + bindings = <&lkp>, <&losm>; }; + }; };