Merge pull request #4 from granitrocky/combo-remix

Move all the combo remix includes to the bottom to overwrite existing…
arduxio · May 4, 2022 · 05f7671 · 05f7671
2 parents e34ee37 + afc2bb7
commit 05f7671
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 33 deletions.
diff --git a/users/ardux/layout/combos/ansi.def b/users/ardux/layout/combos/ansi.def
@@ -1,12 +1,6 @@
 // Copyright (c) 2021 Mike "KemoNine" Crosson
 // SPDX-License-Identifier: Apache-2.0
 
-// /////////
-// User remixes / tweaks -- these take precidence above all else
-#if __has_include("../remixes/combos/ansi.def")
-#include "../remixes/combos/ansi.def"
-#endif
-
 #ifndef DISABLE_DEFAULT_ANSI_COMBOS
 
 #ifndef DISABLE_DEFAULT_ALPHA_COMBOS
@@ -38,4 +32,11 @@ COMB(combo_nine,                     KC_9,                          KNUM_B1, KNU
 COMB(combo_zero,                     KC_0,                                   KNUM_B2, KNUM_B3)
 #endif // DISABLE_DEFAULT_NUMBER_COMBOS
 
-#endif // DISABLE_DEFAULT_ANSI_COMBOS
+#endif // DISABLE_DEFAULT_ANSI_COMBOS
+
+
+// /////////
+// User remixes / tweaks -- these take precidence above all else
+#if __has_include("../remixes/combos/ansi.def")
+#include "../remixes/combos/ansi.def"
+#endif
diff --git a/users/ardux/layout/combos/control.def b/users/ardux/layout/combos/control.def
@@ -1,11 +1,6 @@
 // Copyright (c) 2021 Mike "KemoNine" Crosson
 // SPDX-License-Identifier: Apache-2.0
 
-// /////////
-// User remixes / tweaks -- these take precidence above all else
-#if __has_include("../remixes/combos/control.def")
-#include "../remixes/combos/control.def"
-#endif
 
 #ifndef DISABLE_DEFAULT_CONTROL_COMBOS
 
@@ -47,3 +42,10 @@ COMB(combo_space_base_40p,           KC_SPACE,                      RIGHT_SYMBOL
 #endif // ARDUX_SIZE_40P
 
 #endif // DISABLE_DEFAULT_CONTROL_COMBOS
+
+
+// /////////
+// User remixes / tweaks -- these take precidence above all else
+#if __has_include("../remixes/combos/control.def")
+#include "../remixes/combos/control.def"
+#endif
diff --git a/users/ardux/layout/combos/layers.def b/users/ardux/layout/combos/layers.def
@@ -1,12 +1,6 @@
 // Copyright (c) 2021 Mike "KemoNine" Crosson
 // SPDX-License-Identifier: Apache-2.0
 
-// /////////
-// User remixes / tweaks -- these take precidence above all else
-#if __has_include("../remixes/combos/layers.def")
-#include "../remixes/combos/layers.def"
-#endif
-
 #ifndef DISABLE_DEFAULT_LAYER_COMBOS
 
 //   NAME                            RESULT                         TRIGGER
@@ -20,4 +14,10 @@ COMB(combo_layer_basefun,            TG(LAYER_ID_BIG_FUN),          OSM_SHIFT, K
 COMB(combo_layer_funbase,            TG(LAYER_ID_BIG_FUN),          FUN_1, FUN_2)
 #endif
 
-#endif // DISABLE_DEFAULT_LAYER_COMBOS
+#endif // DISABLE_DEFAULT_LAYER_COMBOS
+
+// /////////
+// User remixes / tweaks -- these take precidence above all else
+#if __has_include("../remixes/combos/layers.def")
+#include "../remixes/combos/layers.def"
+#endif
diff --git a/users/ardux/layout/combos/mods.def b/users/ardux/layout/combos/mods.def
@@ -1,12 +1,6 @@
 // Copyright (c) 2021 Mike "KemoNine" Crosson
 // SPDX-License-Identifier: Apache-2.0
 
-// /////////
-// User remixes / tweaks -- these take precidence above all else
-#if __has_include("../remixes/combos/mods.def")
-#include "../remixes/combos/mods.def"
-#endif
-
 #ifndef DISABLE_DEFAULT_MOD_COMBOS
 
 //   NAME                            RESULT                         TRIGGER
@@ -50,4 +44,10 @@ COMB(combo_caps_lock_base_40p,       KC_CAPS,                       RIGHT_CUSTOM
 #endif
 #endif // ARDUX_SIZE_40P
 
-#endif // DISABLE_DEFAULT_MOD_COMBOS
+#endif // DISABLE_DEFAULT_MOD_COMBOS
+
+// /////////
+// User remixes / tweaks -- these take precidence above all else
+#if __has_include("../remixes/combos/mods.def")
+#include "../remixes/combos/mods.def"
+#endif
diff --git a/users/ardux/layout/combos/symbols.def b/users/ardux/layout/combos/symbols.def
@@ -1,12 +1,6 @@
 // Copyright (c) 2021 Mike "KemoNine" Crosson
 // SPDX-License-Identifier: Apache-2.0
 
-// /////////
-// User remixes / tweaks -- these take precidence above all else
-#if __has_include("../remixes/combos/symbols.def")
-#include "../remixes/combos/symbols.def"
-#endif
-
 #ifndef DISABLE_DEFAULT_SYMBOL_COMBOS
 
 //   NAME                            RESULT                         TRIGGER
@@ -27,4 +21,10 @@ COMB(combo_single_quote_40p,         KC_QUOT,                       RIGHT_PARENT
 #endif
 #endif // ARDUX_SIZE_40P
 
-#endif // DISABLE_DEFAULT_SYMBOL_COMBOS
+#endif // DISABLE_DEFAULT_SYMBOL_COMBOS
+
+// /////////
+// User remixes / tweaks -- these take precidence above all else
+#if __has_include("../remixes/combos/symbols.def")
+#include "../remixes/combos/symbols.def"
+#endif