diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml index d548606..1f472c1 100644 --- a/.github/workflows/lint_and_compile.yml +++ b/.github/workflows/lint_and_compile.yml @@ -6,7 +6,7 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v4 - - name: Clone supercharge docs repository + - name: Clone qmk_firmware uses: actions/checkout@v2 with: repository: Homelab/qmk_firmware diff --git a/dgvigil/definitions/keymap_blocks.h b/dgvigil/definitions/keymap_blocks.h index 99a7dce..4c77035 100644 --- a/dgvigil/definitions/keymap_blocks.h +++ b/dgvigil/definitions/keymap_blocks.h @@ -17,7 +17,7 @@ // EMPTY ROW #define __________________EMPTY_____________________ _______, _______, _______, _______, _______ // BOOTLOADER -#define _________________BOOT_R1____________________ COLDH, _______, _______, _______, QK_BOOTLOADER +#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER #define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,QWERT @@ -72,11 +72,3 @@ #define __________________MOU_R2____________________ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______ #define __________________MOU_R3____________________ KC_BTN2, KC_BTN1, KC_WH_D, KC_WH_U, KC_BTN2 -// COLEMAK-DH -#define __________________COLEML1____________________ Q_ESC, KC_W, KC_F, KC_P, KC_B -#define __________________COLEML2____________________ KC_A, KC_R, KC_S, KC_T, KC_G -#define __________________COLEML3____________________ KC_Z, KC_X, KC_C, KC_D, KC_V - -#define __________________COLEMR1____________________ KC_J, KC_L, KC_U, KC_Y, KC_QUOT -#define __________________COLEMR2____________________ KC_M, KC_N, KC_E, KC_I, KC_O -#define __________________COLEMR3____________________ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH diff --git a/dgvigil/definitions/layers.h b/dgvigil/definitions/layers.h index 77ce8a9..0a9c7be 100644 --- a/dgvigil/definitions/layers.h +++ b/dgvigil/definitions/layers.h @@ -2,11 +2,10 @@ typedef enum { _QWERTY, // 0 - _COLEMAKDH, - _NAV, // 2 - _NUM, //3 - _SYM, // 4 - _FUN, // 5 - _MUS, // 6 + _NAV, // 1 + _NUM, //2 + _SYM, // 3 + _FUN, // 4 + _MUS, // 5 _MOUSE // 7 } layers_t; diff --git a/iris/keymap.c b/iris/keymap.c index 92259b8..4ecaa51 100644 --- a/iris/keymap.c +++ b/iris/keymap.c @@ -66,20 +66,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), - [_COLEMAKDH] = LAYOUT_wrapper( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MUTE, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_TAB, __________________COLEML1____________________, __________________COLEMR1____________________, KC_GRV, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, __________________COLEML2____________________, __________________COLEMR2____________________, KC_RCTL, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LSFT, __________________COLEML3____________________,SPOTLI, _______, __________________COLEMR3____________________, KC_RSFT, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - ___________THUMB_L3________, ___________THUMB_R3________ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - [_NAV] = LAYOUT_wrapper( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, RGB_MODE_SWIRL, SPOTLI, _______, _______, _______, _______, RGB_TOG, @@ -171,7 +157,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_COLEMAKDH] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_NAV] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))) }, [_NUM] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [_SYM] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },