commit 9b1e8dcca5ced4b7e1f71edb35a50fc3319a35e9
parent db793b7907a5fcccddf93de9877d10e55660dd59
Author: Jack Sangdahl <jack@pngu.org>
Date: Fri, 13 Feb 2026 10:06:29 -0700
Move default mods to base layer
Diffstat:
3 files changed, 27 insertions(+), 51 deletions(-)
diff --git a/config/blecorne.keymap b/config/blecorne.keymap
@@ -19,11 +19,10 @@
#define SET_LNX UC_SET_LINUX
#define BASE 0
-#define LINUX 1
-#define MACOS 2
-#define NUM 3
-#define SYM 4
-#define UTIL 5
+#define MACOS 1
+#define NUM 2
+#define SYM 3
+#define UTIL 4
ZMK_APPLY_MATRIX_TRANSFORM(five_column_transform)
@@ -77,21 +76,14 @@ ZMK_COMBO(fj_cpwd, &caps_word, LM1 RM1, ALL)
ZMK_LAYER(base_layer,
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
- &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
+ &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F &kp G &kp H &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
___ < NUM ESC &kp SPACE &bs_del_num &mo SYM ___
)
-ZMK_LAYER(linux_layer,
+ZMK_LAYER(mac_mod_layer,
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- ___ ___ ___ ___ ___ ___
-)
-
-ZMK_LAYER(macos_layer,
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LCTRL S &hrm LGUI D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RGUI K &hrm RCTRL L &hrm RALT SEMI
+ ___ &hrm LCTRL S &hrm LGUI D ___ ___ ___ ___ &hrm RGUI K &hrm RCTRL L ___
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
___ ___ ___ ___ ___ ___
)
@@ -111,8 +103,8 @@ ZMK_LAYER(symbols_layer,
)
ZMK_LAYER(utility_layer,
- &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ ___ &tog LINUX &tog MACOS &bt BT_CLR
- &bootloader &bt BT_CLR ___ ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &bootloader
+ &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &tog MACOS &bt BT_CLR
+ &bootloader &bt BT_CLR ___ ___ ___ ___ ___ ___ ___ &bootloader
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
___ ___ ___ ___ ___ ___
)
diff --git a/config/flake.keymap b/config/flake.keymap
@@ -19,11 +19,10 @@
#define SET_LNX UC_SET_LINUX
#define BASE 0
-#define LINUX 1
-#define MACOS 2
-#define NUM 3
-#define SYM 4
-#define UTIL 5
+#define MACOS 1
+#define NUM 2
+#define SYM 3
+#define UTIL 4
ZMK_HOLD_TAP(hrm,
flavor = "tap-preferred";
@@ -75,21 +74,14 @@ ZMK_COMBO(fj_cpwd, &caps_word, LM1 RM1, ALL)
ZMK_LAYER(base_layer,
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
- &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
+ &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F &kp G &kp H &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
< NUM ESC &kp SPACE ___ ___ &bs_del_num &mo SYM
)
-ZMK_LAYER(linux_layer,
+ZMK_LAYER(mac_mod_layer,
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- ___ ___ ___ ___ ___ ___
-)
-
-ZMK_LAYER(macos_layer,
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LCTRL S &hrm LGUI D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RGUI K &hrm RCTRL L &hrm RALT SEMI
+ ___ &hrm LCTRL S &hrm LGUI D ___ ___ ___ ___ &hrm RGUI K &hrm RCTRL L ___
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
___ ___ ___ ___ ___ ___
)
@@ -109,8 +101,8 @@ ZMK_LAYER(symbols_layer,
)
ZMK_LAYER(utility_layer,
- &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ ___ &tog LINUX &tog MACOS &bt BT_CLR
- &bootloader &bt BT_CLR ___ ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &bootloader
+ &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &tog MACOS &bt BT_CLR
+ &bootloader &bt BT_CLR ___ ___ ___ ___ ___ ___ ___ &bootloader
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
___ ___ ___ ___ ___ ___
)
diff --git a/config/revxlp.keymap b/config/revxlp.keymap
@@ -19,11 +19,10 @@
#define SET_LNX UC_SET_LINUX
#define BASE 0
-#define LINUX 1
-#define MACOS 2
-#define NUM 3
-#define SYM 4
-#define UTIL 5
+#define MACOS 1
+#define NUM 2
+#define SYM 3
+#define UTIL 4
ZMK_HOLD_TAP(hrm,
flavor = "tap-preferred";
@@ -75,21 +74,14 @@ ZMK_COMBO(fj_cpwd, &caps_word, LM1 RM1, ALL)
ZMK_LAYER(base_layer,
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
- &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
+ &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F &kp G &kp H &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
___ < NUM ESC &kp SPACE &bs_del_num &mo SYM ___
)
-ZMK_LAYER(linux_layer,
+ZMK_LAYER(mac_mod_layer,
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LGUI S &hrm LCTRL D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RCTRL K &hrm RGUI L &hrm RALT SEMI
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- ___ ___ ___ ___ ___ ___
-)
-
-ZMK_LAYER(macos_layer,
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- &hrm LALT A &hrm LCTRL S &hrm LGUI D &hrm LSHFT F ___ ___ &hrm RSHFT J &hrm RGUI K &hrm RCTRL L &hrm RALT SEMI
+ ___ &hrm LCTRL S &hrm LGUI D ___ ___ ___ ___ &hrm RGUI K &hrm RCTRL L ___
___ ___ ___ ___ ___ ___ ___ ___ ___ ___
___ ___ ___ ___ ___ ___
)
@@ -109,8 +101,8 @@ ZMK_LAYER(symbols_layer,
)
ZMK_LAYER(utility_layer,
- &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ ___ &tog LINUX &tog MACOS &bt BT_CLR
- &bootloader &bt BT_CLR ___ ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &bootloader
+ &bt BT_CLR &bt BT_NXT ___ ___ ___ ___ &uc SET_LNX &uc SET_MAC &tog MACOS &bt BT_CLR
+ &bootloader &bt BT_CLR ___ ___ ___ ___ ___ ___ ___ &bootloader
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10
___ ___ ___ ___ ___ ___
)
