Remove homerow mods :o

1 files changed, 39 insertions, 25 deletions

diff --git a/config/planck_rev6.keymap b/config/planck_rev6.keymap
index 7f6c662..5a92c5f 100644
--- a/config/planck_rev6.keymap
+++ b/config/planck_rev6.keymap
@@ -5,12 +5,17 @@
 #define DVORAK 1
 #define LOW    2
 #define UPR    3
-#define FN     4
+#define NAV    4
+#define FN     5
 
-#define HM1(k) hm LGUI  k
-#define HM2(k) hm LALT  k
-#define HM3(k) hm LCTL  k
-#define HM4(k) hm LSHFT k
+// #define HM1(k) hm LGUI  k
+// #define HM2(k) hm LALT  k
+// #define HM3(k) hm LCTL  k
+// #define HM4(k) hm LSHFT k
+#define HM1(k) kp k
+#define HM2(k) kp k
+#define HM3(k) kp k
+#define HM4(k) kp k
 
 // Resources:
 // https://github.com/manna-harbour/qmk_firmware/tree/miryoku/users/manna-harbour_miryoku
@@ -36,47 +41,56 @@
 // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
 // (with setxkbmap us -variant dvorak -option compose:ralt).
 			bindings = <
-&trans &kp Q   &kp W   &kp E      &kp R       &kp T     &kp Y     &kp U       &kp I     &kp O   &kp P      &trans
-&trans &HM1(A) &HM2(S) &HM3(D)    &HM4(F)     &kp G     &kp H     &HM4(J)     &HM3(K)   &HM2(L) &HM1(SEMI) &trans
-&trans &kp Z   &kp X   &kp C      &kp V       &kp B     &kp N     &kp M       &kp COMMA &kp DOT &kp SLASH  &kp LBKT
-&trans &trans  &trans  &lt FN TAB &lt LOW ESC &kp SPACE &kp SPACE &lt UPR RET &kp RALT  &trans  &trans     &trans
+&trans &kp Q   &kp W   &kp E        &kp R   &kp T     &kp Y     &kp U   &kp I     &kp O   &kp P      &trans
+&trans &HM1(A) &HM2(S) &HM3(D)      &HM4(F) &kp G     &kp H     &HM4(J) &HM3(K)   &HM2(L) &HM1(SEMI) &trans
+&trans &kp Z   &kp X   &kp C        &kp V   &kp B     &kp N     &kp M   &kp COMMA &kp DOT &kp SLASH  &kp LBKT
+&trans &trans  &trans  &kp LSHFT    &sl LOW &kp SPACE &kp SPACE &sl UPR &mo NAV   &trans  &trans     &trans
 			>;
 		};
 
 		dvorak {
         // Incomplete!
 			bindings = <
-  &kp TAB   &kp SQT  &kp COMMA &kp DOT  &kp P     &kp Y   &kp F     &kp G     &kp C     &kp R   &kp L     &kp BSPC
-  &kp ESC   &kp A    &kp O     &kp E    &kp U     &kp I   &kp D     &kp H     &kp T     &kp N   &kp S     &kp RET
-  &kp LSHFT &kp SEMI &kp Q     &kp J    &kp K     &kp X   &kp B     &kp M     &kp W     &kp V   &kp Z     &kp SLASH
-  &trans    &trans   &kp LGUI  &kp LALT &mo LOW   &kp ESC &kp SPACE &mo UPR   &trans    &trans  &trans    &trans
+&kp TAB   &kp SQT  &kp COMMA &kp DOT  &kp P     &kp Y   &kp F     &kp G     &kp C     &kp R   &kp L     &kp BSPC
+&kp ESC   &kp A    &kp O     &kp E    &kp U     &kp I   &kp D     &kp H     &kp T     &kp N   &kp S     &kp RET
+&kp LSHFT &kp SEMI &kp Q     &kp J    &kp K     &kp X   &kp B     &kp M     &kp W     &kp V   &kp Z     &kp SLASH
+&trans    &trans   &kp LGUI  &kp LALT &mo LOW   &kp ESC &kp SPACE &mo UPR   &trans    &trans  &trans    &trans
 			>;
 		};
 
 		lower {
 			bindings = <
-  &kp TILDE &kp EXCL &kp AT   &kp HASH  &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &trans
-  &trans    &kp DQT  &kp RBRC &kp UNDER &kp PLUS &trans    &trans    &trans   &trans   &trans   &trans   &trans
-  &trans    &trans   &trans   &trans    &trans   &trans    &trans    &trans   &trans   &trans   &trans   &kp BSLH
-  &trans    &trans   &trans   &trans    &trans   &kp BSPC  &kp BSPC  &trans   &trans   &trans   &trans   &trans
+&trans &kp EXCL &kp AT   &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR  &kp RPAR  &trans
+&trans &sk LGUI &sk LALT &sk LCTL &kp ESC  &kp BSLH  &kp LBKT  &kp DQT  &kp RBRC &kp UNDER &kp PLUS  &kp TILDE
+&trans &trans   &trans   &trans   &kp TAB  &kp PIPE  &kp LBRC  &kp SQT  &kp RBKT &kp MINUS &kp EQUAL &kp GRAVE
+&trans &trans   &trans   &trans   &trans   &kp BSPC  &kp BSPC  &trans   &trans   &trans    &trans    &trans
 			>;
 		};
 
 		upper {
 			bindings = <
-  &kp GRAVE &kp N1  &kp N2   &kp N3    &kp N4    &kp N5 &kp N6 &kp N7   &kp N8    &kp N9    &kp N0  &trans
-  &trans    &kp SQT &kp RBKT &kp MINUS &kp EQUAL &trans &trans &kp LEFT &kp DOWN  &kp UP    &kp RIGHT &trans
-  &trans    &trans  &trans   &trans    &trans    &trans &trans &kp HOME &kp PG_DN &kp PG_UP &kp END &kp PIPE
-  &trans    &trans  &trans   &trans    &trans    &kp DEL &kp DEL &trans   &trans    &trans    &trans  &trans
+&trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5  &kp N6    &kp N7  &kp N8   &kp N9   &kp N0   &trans
+&trans &trans &trans &trans &trans &trans  &trans    &sk LSHFT &sk LCTL &sk LALT &sk LGUI &trans
+&trans &trans &trans &trans &trans &trans  &kp RALT  &kp RET &trans   &trans   &trans   &trans
+&trans &trans &trans &trans &trans &kp DEL &kp DEL   &trans  &trans   &trans   &trans   &trans
+ 			>;
+ 		};
+
+		navigation {
+			bindings = <
+&trans &trans &trans &trans &trans &trans &trans &trans   &trans    &trans    &trans    &trans
+&trans &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN  &kp UP    &kp RIGHT &trans
+&trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp PG_UP &kp END   &trans
+&trans &trans &trans &trans &trans &trans &trans &trans   &trans    &trans    &trans    &trans
  			>;
  		};
 
 		function {
 			bindings = <
-  &trans    &kp F1  &kp F2  &kp F3 &kp F4 &kp F5 &kp F6 &kp F7  &kp F8   &kp F9    &kp F10    &trans
-  &trans    &kp F11 &kp F12 &trans &trans &trans &trans &trans  &trans   &trans    &trans    &trans
-  &trans    &bootloader  &trans  &trans &trans &trans &trans &trans  &trans   &trans    &trans    &trans
-  &trans    &trans  &trans  &trans &trans &trans &trans &trans  &trans   &trans    &trans    &trans
+&trans &kp F1      &kp F2  &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
+&trans &kp F11     &kp F12 &trans &trans &trans &trans &trans &trans &trans &trans  &trans
+&trans &bootloader &trans  &trans &trans &trans &trans &trans &trans &trans &trans  &trans
+&trans &trans      &trans  &trans &trans &trans &trans &trans &trans &trans &trans  &trans
 			>;
 		};
 	};