Merge remote-tracking branch 'origin/master' into develop

8 files changed, 1059 insertions, 0 deletions

diff --git a/users/ericgebhart/mod_layers/alt_mods.h b/users/ericgebhart/mod_layers/alt_mods.h
new file mode 100644
index 0000000000..db13ee041d
--- /dev/null
+++ b/users/ericgebhart/mod_layers/alt_mods.h
@@ -0,0 +1,129 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//
+// non Home row mods, mod layer.
+
+// MOD_ROW variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// L_5  Left                 R_5 Right.
+// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
+// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW0L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW0L_6_alt(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW0R_5_alt(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW0R_6_alt(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW1L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW1L_6_alt(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_alt(K01, K02, K03, K04, K05)                            \
+  K01, K02, K03, K04, K05                                               \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW1R_5_alt(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW1R_6_alt(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+// HOME ROW - ROW2
+// LEFT.
+#define ROW2L_5_alt(K01, K02, K03, K04, K05)            \
+  K01, K02, LT(_NAV, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW2L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW2L_6_alt(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_alt(K01, K02, K03, K04, K05)                            \
+  K01, MT(MOD_LSFT, K02),  LT(_NAV, K03), K04, K05                      \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_alt(K01, K02, K03, K04, K05, K06)       \
+  ROW2R_5_alt(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW2R_6_alt(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_alt(K01, K02, K03, K04, K05)            \
+  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW3L_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW3L_6_alt(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_alt(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_alt(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW3R_5_alt(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_alt(K01, K02, K03, K04, K05)          \
+  ROW3R_6_alt(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs.h b/users/ericgebhart/mod_layers/hrm_gacs.h
new file mode 100644
index 0000000000..4bcf092732
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gacs.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_gacs(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h b/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
new file mode 100644
index 0000000000..0238e9a567
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gacs_miryoku.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0L_6_miryoku_hrm_gacs(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW0R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1L_6_miryoku_hrm_gacs(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW1R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LSFT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2L_6_miryoku_hrm_gacs(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RSFT, K02),  MT(MOD_RCTL, K03), MT(MOD_LALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW2R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, MT(MOD_RALT, K02), K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3L_6_miryoku_hrm_gacs(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_miryoku_hrm_gacs(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, MT(MOD_RALT, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_miryoku_hrm_gacs(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05)     \
+  ROW3R_6_miryoku_hrm_gacs(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_gasc.h b/users/ericgebhart/mod_layers/hrm_gasc.h
new file mode 100644
index 0000000000..6eacb13ad6
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_gasc.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_gasc(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_gasc(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_gasc(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LGUI, K01), MT(MOD_LALT, K02), MT(MOD_LSFT, K03), MT(MOD_LCTL, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_gasc(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RCTL, K02),  MT(MOD_RSFT, K03), MT(MOD_RALT, K04), MT(MOD_RGUI, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_gasc(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_gasc(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_gasc(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_gasc(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_gasc(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_gasc(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrm_sacg.h b/users/ericgebhart/mod_layers/hrm_sacg.h
new file mode 100644
index 0000000000..f4408f78fb
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrm_sacg.h
@@ -0,0 +1,130 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Home row mods variant of mod layers.
+
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW0L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW0L_6_hrm_sacg(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW0R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW0R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, LT(_NAV, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW1L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW1L_6_hrm_sacg(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  K01, K02, K03, K04, LT(_LAYERS, K05)                                  \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW1R_5_hrm_sacg(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW1R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+
+// HOME ROW - ROW2
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+
+// LEFT.
+#define ROW2L_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW2L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW2L_6_hrm_sacg(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05)                       \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05) \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  \
+  ROW2R_5_hrm_sacg(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW2R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3L_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW3L_6_hrm_sacg(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrm_sacg(K01, K02, K03, K04, K05)       \
+  K01, LT(_NAV, K02), K03, LT(LANG_N(_SYMB), K04), K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, K06)  K01,    \
+    ROW3R_5_hrm_sacg(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrm_sacg(K01, K02, K03, K04, K05)     \
+  ROW3R_6_hrm_sacg(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/hrs_nav.h b/users/ericgebhart/mod_layers/hrs_nav.h
new file mode 100644
index 0000000000..3075a37768
--- /dev/null
+++ b/users/ericgebhart/mod_layers/hrs_nav.h
@@ -0,0 +1,126 @@
+#pragma once
+/*
+  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//
+// shift on home row pinkies, nav on home row middle finger.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+// L_5  Left                 R_5 Right.
+// K01, K02, K03, K04, K05 - K01, K02, K03, K04, K05
+// pky, rng, mdl, idx, idx - idx, idx, mdl, rng, pnky
+
+// ROW0  - Number row.
+// LEFT.
+#define ROW0L_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW0L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW0L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW0L_6_hrs_nav(LEFT_0, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW0R_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW0R_5_hrs_nav(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW0R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW0R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_0)
+
+
+// ROW1
+// LEFT.
+#define ROW1L_5_hrs_nav(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW1L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW1L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW1L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW1L_6_hrs_nav(LEFT_1, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW1R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
+  K01, K02, K03, K04, K05                                               \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW1R_5_hrs_nav(K01, K02, K03, K04, K05), K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW1R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW1R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_1)
+
+
+// HOME ROW - ROW2
+// LEFT.
+#define ROW2L_5_hrs_nav(K01, K02, K03, K04, K05)            \
+  MT(MOD_LSFT, K01), K02, LT(_NAV, K03), K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW2L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01, \
+    ROW2L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW2L_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW2L_6_hrs_nav(LEFT_2, K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW2R_5_hrs_nav(K01, K02, K03, K04, K05)                            \
+  K01, K02,  LT(_NAV, K03), K04, MT(MOD_LSFT, K05)                      \
+    // take and put an extra column in front. Mod K01 how you want it.
+#define ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, K06)       \
+  ROW2R_5_hrs_nav(K01, K02, K03, K04, K05),  K06
+
+// 5 into 6, derivitive of the first two.
+#define ROW2R_5_6_hrs_nav(K01, K02, K03, K04, K05)          \
+  ROW2R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_2)
+
+
+// ROW 3
+// LEFT.
+#define ROW3L_5_hrs_nav(K01, K02, K03, K04, K05)        \
+  K01, K02, LT(_NAV, K03), K04, MT(MOD_LSFT, K05)
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3L_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
+    ROW3L_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3L_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
+  ROW3L_6_hrs_nav(LEFT_3,  K01, K02, K03, K04, K05)
+
+// RIGHT.
+#define ROW3R_5_hrs_nav(K01, K02, K03, K04, K05)        \
+  K01, K02, K03, K04, K05
+// take and put an extra column in front. Mod K01 how you want it.
+#define ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, K06)  K01,     \
+    ROW3R_5_hrs_nav(K02, K03, K04, K05, K06)
+
+// 5 into 6, derivitive of the first two.
+#define ROW3R_5_6_hrs_nav(K01, K02, K03, K04, K05)      \
+  ROW3R_6_hrs_nav(K01, K02, K03, K04, K05, RIGHT_3)
diff --git a/users/ericgebhart/mod_layers/mod_layer.h b/users/ericgebhart/mod_layers/mod_layer.h
new file mode 100644
index 0000000000..2345d30c5b
--- /dev/null
+++ b/users/ericgebhart/mod_layers/mod_layer.h
@@ -0,0 +1,155 @@
+#pragma once
+
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// define our rows for the mod layer
+// takes 5 keycodes, adds mods, and left and right edge keys.
+// So we get keycodes in groups of 6.
+//
+// #define LANG_IS BEPO // to get Bepo substititions for keys and LTs.
+// #define NO_EDGE_COL  // for 5 column keyboards with no sixth column.
+//
+// wrap layers that have alternates for other locales with LANG_N
+// this will change the name, from _SYMB to _SYMB_BP as needed.
+//
+// Home Row mods and other things like that go here.
+
+#include "keycodes.h"
+#include "alt_mods.h"
+#include "hrm_sacg.h"
+#include "hrm_gacs.h"
+#include "hrm_gacs_miryoku.h"
+#include "hrm_gasc.h"
+#include "hrs_nav.h"
+#include "trns_mods.h"
+
+// redefined by the map as needed.
+//#base_cols_in_out 5_6 // 5, 5_6, 6
+// MOD_ROW
+// variants.
+// input 5 get six, left and right language specific outer edge keys.
+
+// no edge keys.
+// input 5 get 5 with mods applied.
+
+// input 6 get 6 with mods applied.
+
+// base cols in out.  5, 5_6, 6.
+// input column count, output column count, if different.
+
+#define CONCATENATER(a, ...) a ## __VA_ARGS__
+#define CATR(a, ...) CONCATENATER(a, __VA_ARGS__)
+#define CONCATENATER2(a, ...) a ## __VA_ARGS__
+#define CATR2(a, ...) CONCATENATER2(a, __VA_ARGS__)
+#define CONCATENATER3(a, ...) a ## __VA_ARGS__
+#define CATR3(a, ...) CONCATENATER3(a, __VA_ARGS__)
+
+// mod layer name construction. add new layer extensions here.
+// TRNS, ALT, HRM_GACS, HRM_SCAG, HRM_GASC, MIRYOKU_HRM_GASC
+#define MOD_EXT CATR3(MODS_ARE, _MOD)
+#define TRNS_MOD _trns
+#define HRM_SCAG_MOD _hrm_scag
+#define HRM_GACS_MOD _hrm_gacs
+#define HRM_GASC_MOD _hrm_gasc
+#define MIRYOKU_HRM_GACS_MOD _miryoku_hrm_gacs
+#define ALT_MOD _alt
+#define HRS_NAV_MOD _hrs_nav
+
+// MOD_COL_NAME(ROW0L) -- > ROW0L_5, ROW0L_6, ROW0L_5_6
+#define MOD_COL_NAME(NAME) CATR2(CATR(NAME, _), BASE_COLS_IN_OUT)
+// MOD_ROW(ROW0L) -- > ROW0L_5_alt, ROW0L_6_alt, ROW0L_5_6_alt
+#define MOD_ROW(NAME) CATR3(MOD_COL_NAME(NAME), MOD_EXT)
+
+// change the columns in/out according to the map and the keyboard.
+//#define BASE_COLS_IN_OUT 5_6 // 5, 5_6, 6
+
+
+// These make it easier to create base layer layouts.
+// They take 3x10, or 3x12 and make a 3x12 with mods.
+// this isnt always useful, sometimes rows need to be
+// specified explicitly in the layout. ie. layouts with
+// extra keys in the middle.
+