1 files changed, 36 insertions, 43 deletions

diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 507504f04..0ba181760 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -16,26 +16,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#include "quantum.h"
+#include QMK_KEYBOARD_H
+
 #include "version.h"
 #include "eeprom.h"
 #include "wrappers.h"
 #include "process_records.h"
 #ifdef TAP_DANCE_ENABLE
-#   include "tap_dances.h"
-#endif // TAP_DANCE_ENABLE
+#    include "tap_dances.h"
+#endif  // TAP_DANCE_ENABLE
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#   include "rgb_stuff.h"
-#endif
-#if defined(AUDIO_ENABLE) && __GNUC__ > 7
-#   if __has_include("drashna_song_list.h")
-#       include "drashna_song_list.h"
-#   endif
+#    include "rgb_stuff.h"
 #endif
 
 /* Define layer names */
 enum userspace_layers {
-    _QWERTY = 0,
+    _QWERTY  = 0,
     _NUMLOCK = 0,
     _COLEMAK,
     _DVORAK,
@@ -54,51 +50,48 @@ enum userspace_layers {
     _ADJUST,
 };
 
-/*
-define modifiers here, since MOD_* doesn't seem to work for these
- */
-
-
-bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed);
-bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
-bool send_game_macro(const char *str, keyrecord_t *record, bool override);
-void matrix_init_keymap(void);
-void shutdown_keymap(void);
-void suspend_power_down_keymap(void);
-void suspend_wakeup_init_keymap(void);
-void matrix_scan_keymap(void);
-layer_state_t layer_state_set_keymap (layer_state_t state);
-layer_state_t default_layer_state_set_keymap (layer_state_t state);
-void led_set_keymap(uint8_t usb_led);
-void eeconfig_init_keymap(void);
+bool          mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
+bool          mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
+void          matrix_init_keymap(void);
+void          shutdown_keymap(void);
+void          suspend_power_down_keymap(void);
+void          suspend_wakeup_init_keymap(void);
+void          matrix_scan_keymap(void);
+layer_state_t layer_state_set_keymap(layer_state_t state);
+layer_state_t default_layer_state_set_keymap(layer_state_t state);
+void          led_set_keymap(uint8_t usb_led);
+void          eeconfig_init_keymap(void);
+bool          hasAllBitsInMask(uint8_t value, uint8_t mask);
 
+// clang-format off
 typedef union {
     uint32_t raw;
     struct {
-        bool     rgb_layer_change :1;
-        bool     is_overwatch     :1;
-        bool     nuke_switch      :1;
-        uint8_t  unicode_mod      :4;
-        bool     swapped_numbers  :1;
+        bool    rgb_layer_change     :1;
+        bool    is_overwatch         :1;
+        bool    nuke_switch          :1;
+        uint8_t unicode_mod          :4;
+        bool    swapped_numbers      :1;
+        bool    rgb_matrix_idle_anim :1;
     };
 } userspace_config_t;
+// clang-format on
 
 extern userspace_config_t userspace_config;
 
-
 /*
 Custom Keycodes for Diablo 3 layer
 But since TD() doesn't work when tap dance is disabled
 We use custom codes here, so we can substitute the right stuff
 */
 #ifdef TAP_DANCE_ENABLE
-#   define KC_D3_1 TD(TD_D3_1)
-#   define KC_D3_2 TD(TD_D3_2)
-#   define KC_D3_3 TD(TD_D3_3)
-#   define KC_D3_4 TD(TD_D3_4)
-#else // TAP_DANCE_ENABLE
-#   define KC_D3_1 KC_1
-#   define KC_D3_2 KC_2
-#   define KC_D3_3 KC_3
-#   define KC_D3_4 KC_4
-#endif // TAP_DANCE_ENABLE
+#    define KC_D3_1 TD(TD_D3_1)
+#    define KC_D3_2 TD(TD_D3_2)
+#    define KC_D3_3 TD(TD_D3_3)
+#    define KC_D3_4 TD(TD_D3_4)
+#else  // TAP_DANCE_ENABLE
+#    define KC_D3_1 KC_1
+#    define KC_D3_2 KC_2
+#    define KC_D3_3 KC_3
+#    define KC_D3_4 KC_4
+#endif  // TAP_DANCE_ENABLE