summaryrefslogtreecommitdiff
path: root/users/curry
diff options
context:
space:
mode:
Diffstat (limited to 'users/curry')
-rw-r--r--users/curry/leader.c24
-rw-r--r--users/curry/leader_user.c31
-rw-r--r--users/curry/leader_user.h (renamed from users/curry/leader.h)0
-rw-r--r--users/curry/rules.mk2
-rw-r--r--users/curry/tap_dances.c2
-rw-r--r--users/curry/wrappers.h2
6 files changed, 34 insertions, 27 deletions
diff --git a/users/curry/leader.c b/users/curry/leader.c
deleted file mode 100644
index 3fca6a2ec3..0000000000
--- a/users/curry/leader.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "curry.h"
-#include "leader.h"
-
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
- static bool has_ran_yet;
- if (!has_ran_yet) {
- has_ran_yet = true;
- startup_user();
- }
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
- matrix_scan_rgb();
-#endif // RGBLIGHT_ENABLE
- LEADER_DICTIONARY() {
- leading = false;
- leader_end();
- SEQ_ONE_KEY(KC_F) { SEND_STRING(SS_LCTL("akf")); } // Select all and format
- SEQ_ONE_KEY(KC_P) { SEND_STRING(SS_LCTL(SS_LSFT("4"))); } // Screenshot region
- SEQ_TWO_KEYS(KC_D, KC_D) { SEND_STRING(SS_LCTL("ac")); } // Copy all
- }
- matrix_scan_keymap();
-}
diff --git a/users/curry/leader_user.c b/users/curry/leader_user.c
new file mode 100644
index 0000000000..9cee19af49
--- /dev/null
+++ b/users/curry/leader_user.c
@@ -0,0 +1,31 @@
+#include "curry.h"
+#include "leader_user.h"
+
+void leader_end_user(void) {
+ if (leader_sequence_one_key(KC_F)) {
+ // Select all and format
+ SEND_STRING(SS_LCTL("akf"));
+ }
+ if (leader_sequence_one_key(KC_P)) {
+ // Screenshot region
+ SEND_STRING(SS_LCTL(SS_LSFT("4")));
+ }
+ if (leader_sequence_two_keys(KC_D, KC_D)) {
+ // Copy all
+ SEND_STRING(SS_LCTL("ac"));
+ }
+}
+
+void matrix_scan_user(void) {
+ static bool has_ran_yet;
+ if (!has_ran_yet) {
+ has_ran_yet = true;
+ startup_user();
+ }
+
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+ matrix_scan_rgb();
+#endif // RGBLIGHT_ENABLE
+
+ matrix_scan_keymap();
+}
diff --git a/users/curry/leader.h b/users/curry/leader_user.h
index f215893b9e..f215893b9e 100644
--- a/users/curry/leader.h
+++ b/users/curry/leader_user.h
diff --git a/users/curry/rules.mk b/users/curry/rules.mk
index 724f97f5eb..aa89110276 100644
--- a/users/curry/rules.mk
+++ b/users/curry/rules.mk
@@ -29,7 +29,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
endif
ifeq ($(strip $(LEADER_ENABLE)), yes)
- SRC += leader.c
+ SRC += leader_user.c
endif
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
diff --git a/users/curry/tap_dances.c b/users/curry/tap_dances.c
index 166ea2c686..86a8f679d2 100644
--- a/users/curry/tap_dances.c
+++ b/users/curry/tap_dances.c
@@ -1,4 +1,4 @@
#include "tap_dances.h"
#include "curry.h"
-qk_tap_dance_action_t tap_dance_actions[] = {};
+tap_dance_action_t tap_dance_actions[] = {};
diff --git a/users/curry/wrappers.h b/users/curry/wrappers.h
index dbc7368739..490a9e0b0b 100644
--- a/users/curry/wrappers.h
+++ b/users/curry/wrappers.h
@@ -78,7 +78,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
#define _________________RAISE_R3__________________ KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC
#define _________________ADJUST_L1_________________ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG
-#define _________________ADJUST_L2_________________ MU_TOG , CK_TOGG, AU_ON, AU_OFF, CG_NORM
+#define _________________ADJUST_L2_________________ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, CG_NORM
#define _________________ADJUST_L3_________________ RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T
#define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5