From 29ec016b57f555c2be890ff342e32edc88d4b586 Mon Sep 17 00:00:00 2001
From: KemoNine <mcrosson@kemonine.info>
Date: Fri, 3 Sep 2021 00:08:23 +0000
Subject: [PATCH] Misc cleanup

---
 zmk-config/config/nibble.keymap | 4 ++--
 zmk-config/config/tidbit.keymap | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/zmk-config/config/nibble.keymap b/zmk-config/config/nibble.keymap
index 878469b7..11fc17f4 100644
--- a/zmk-config/config/nibble.keymap
+++ b/zmk-config/config/nibble.keymap
@@ -143,7 +143,7 @@
 		combo_layer_functions { key-positions = <KEY_F_TOP KEY_F_BOTTOM>; bindings = <&sl LAYER_ID_BIG_FUNCTION>; };
 		#endif
 		combo_enter      { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_A KEY_E>; bindings = <&kp ENTER>; };
-		combo_control    { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_E KEY_S>; bindings = <&sk LCTRL>; };
+		combo_control    { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_E KEY_S>; bindings = <&sk RCTRL>; };
 		combo_gui        { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_Y KEY_S>; bindings = <&sk LGUI>; };
 		combo_alt        { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_I KEY_S>; bindings = <&sk LALT>; };
 		combo_backspace  { layers = <LAYERS_ARTSEY>; timeout-ms = <TIMEOUT_COMBO_2>; key-positions = <KEY_E KEY_R>; bindings = <&kp BACKSPACE>; };
@@ -263,7 +263,7 @@
                    &none             &none     &none     &none     &none     &none     &none     &none     &none             &none      &none     &none     &none     &none    &none
 &trans             &none             &layer_numbers_kp LAYER_ID_NUMBERS ARTSEY_BASE_S    &kp ARTSEY_BASE_T     &kp ARTSEY_BASE_R     &layer_parentheticals_kp LAYER_ID_PARENTHETICALS ARTSEY_BASE_A &kp MINUS      &none     &none     &none             &none      &none     &none     &none     &none    &none
 &tog LAYER_ID_BASE &none             &layer_custom_kp LAYER_ID_CUSTOM ARTSEY_BASE_O      &kp ARTSEY_BASE_I     &kp ARTSEY_BASE_Y     &layer_symbols_kp LAYER_ID_SYMBOLS ARTSEY_BASE_E               &sk LSHFT      &none     &none     &none             &none      &none     &none               &none    &none
-&trans             &none             &ctrl_alt_kp LALT LCTRL                             &kp AT                &kp DEL               &kp EQUAL                                                      &kp TAB      &none     &none     &none             &none      &none     &none     &none     &none    &none
+&trans             &none             &ctrl_alt_kp LALT RCTRL                             &kp AT                &kp DEL               &kp EQUAL                                                      &kp TAB      &none     &none     &none             &none      &none     &none     &none     &none    &none
 &trans             &none             &none     &mo LAYER_ID_BIG_SYM                                &kp SPACE                          &none             &none      &none     &none               &none    &none
             >;
 		};
diff --git a/zmk-config/config/tidbit.keymap b/zmk-config/config/tidbit.keymap
index b0b0ff31..3828e42b 100644
--- a/zmk-config/config/tidbit.keymap
+++ b/zmk-config/config/tidbit.keymap
@@ -10,7 +10,6 @@
 #include <dt-bindings/zmk/rgb.h>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/ext_power.h>
-#include <dt-bindings/zmk/mouse.h>
 
 &encoder_1_top_row {
     status = "disabled";
@@ -58,8 +57,8 @@
             label = "Mouse";
             bindings = <
                                &to 0             &to 2              &to 3
-                &mkp MB1       &mmv MOVE_UP      &mkp MB2           &mwh SCROLL_UP
-                &mmv MOVE_LEFT &mmv MOVE_DOWN    &mmv MOVE_RIGHT    &mwh SCROLL_DOWN
+                &none          &none             &none              &none
+                &none          &none             &none              &none
                 &kp ESCAPE     &kp LC(LA(TAB))   &kp LG(DOWN_ARROW) &none
                 &kp C_MUTE     &kp C_VOLUME_DOWN &kp C_VOLUME_UP    &none
             >;