diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 6a20488..4930797 --- a/build.sh +++ b/build.sh @@ -3,9 +3,9 @@ set -e mkdir -p out -IMAGE=$(docker build -q .) +IMAGE=$(sudo docker build -q .) -docker run -it \ +sudo docker run -it \ --mount type=bind,src=$(pwd)/out,dst=/out \ $IMAGE \ sh -c compile.sh diff --git a/compile.sh b/compile.sh old mode 100644 new mode 100755 diff --git a/keymap/keymap.c b/keymap/keymap.c index 9cd3dd2..07e8890 100644 --- a/keymap/keymap.c +++ b/keymap/keymap.c @@ -2,6 +2,7 @@ #include "lighting.h" #include "pomodoro.h" +#define _TR _TRANS_LAYER #define _TL _TALI_LAYER #define _T2 _TALI_LAYER2 #define _T3 _TALI_LAYER3 @@ -58,6 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ KC_LCTL, AD_WIND, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), + [_TRANS_LAYER] = LAYOUT_65_ansi_blocker( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), [_TEAMS_LAYER] = LAYOUT_65_ansi_blocker( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AD_TEAM, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ @@ -95,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTION2_LAYER] = LAYOUT_65_ansi_blocker( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, TG(_TR), _______, _______, _______, _______, _______, _______, _______, _______, _______, \ MO(_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, AD_MOUS, _______, _______, _______, _______, _______ \ @@ -369,7 +377,7 @@ void rgb_matrix_indicators_user(void) { static uint32_t wiggle_timer; static bool wiggle_left; - if (g_suspend_state || disable_layer_color || + if (disable_layer_color || rgb_matrix_get_flags() == LED_FLAG_NONE || rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) { return; diff --git a/keymap/keymap.h b/keymap/keymap.h index cf25fbd..0776c36 100644 --- a/keymap/keymap.h +++ b/keymap/keymap.h @@ -2,6 +2,10 @@ #include QMK_KEYBOARD_H +#define C_TRA1 {HSV_CYAN} +#define C_TRA2 {HSV_MAGENTA} +#define C_TRA3 {HSV_WHITE} + #define C_PRIM {HSV_PURPLE} #define C_SECO {HSV_GOLD} #define C_MODI {HSV_MAGENTA} @@ -16,6 +20,7 @@ enum layout_names { _TYPING_LAYER=0, + _TRANS_LAYER, _TEAMS_LAYER, _GAME_LAYER, _UNB_W_LAY, diff --git a/keymap/lighting_layers.h b/keymap/lighting_layers.h index e62a0ae..ca2bf08 100644 --- a/keymap/lighting_layers.h +++ b/keymap/lighting_layers.h @@ -22,6 +22,20 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM }, + [_TRANS_LAYER] = { + C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, + C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, + C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, C_TRA3, + C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, + C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, C_TRA1, + //UnderGlow + C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, + C_TRA2, C_TRA2, + C_TRA2, C_TRA2, + C_TRA2, C_TRA2, + C_TRA2, C_TRA2, + C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2, C_TRA2 + }, [_TEAMS_LAYER] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,