Update keymap.c

.github/workflows/lint_and_compile.yml

@@ -38,6 +38,7 @@ jobs:
                   # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
                   qmk compile -kb keebio/iris/rev8 -km dgvigil
+                  qmk compile -kb keebio/iris/rev8 -km via
                   # echo "Building QMK for bluebell/swoop"
                   # qmk compile -kb bluebell/swoop -km dgvigil -e CONVERT_TO=promicro_rp2040
                   find -maxdepth 1 -name "*.hex"

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "kmk_firmware"]
 	path = kmk_firmware
 	url = git@github.com:KMKfw/kmk_firmware.git
+[submodule "vial-qmk"]
+	path = vial-qmk
+	url = git@github.com:vial-kb/vial-qmk.git

dgvigil/definitions/keycodes.h

@@ -22,6 +22,15 @@ enum {
 
 enum {
     CUSTOM_KEYCODE_START = SAFE_RANGE,
+    QWERTY,
+    LINUX,
+    COPY,
+    PASTE,
+    CUT,
+    UNDO,
+    REDO,
+    SALL,
+    SPOTLI,
     M_PASS1,
     M_PASS2,
     M_PASS3,

dgvigil/definitions/keymap_blocks.h

@@ -35,9 +35,9 @@
 #define __________________NAV_L2____________________ _______, _______, _______, M_PASS3, M_PASS4
 #define __________________NAV_L3____________________ _______, _______, _______, M_PASS2, M_PASS1
 
-#define __________________NAV_R1____________________ _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO    
+#define __________________NAV_R1____________________ KC_CAPS, PASTE,   COPY,    CUT,     UNDO    
-#define __________________NAV_R2____________________ KC_CAPS, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
+#define __________________NAV_R2____________________ KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______
-#define __________________NAV_R3____________________ _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END
+#define __________________NAV_R3____________________ SALL,    KC_HOME, KC_PGUP, KC_PGDN, KC_END
 
 
 // NUM
@@ -69,5 +69,14 @@
 
 // MOUSE
 #define __________________MOU_R1____________________  _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO
-#define __________________MOU_R2____________________  KC_BTN1,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+#define __________________MOU_R2____________________  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______
-#define __________________MOU_R3____________________  KC_BTN2, KC_WH_L,  KC_WH_D, KC_WH_U, KC_WH_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

dgvigil/definitions/layers.h

@@ -1,7 +1,7 @@
 #pragma once
 
 typedef enum {
-  _BASE,
+  _QWERTY,
   _NAV,
   _NUM,
   _SYM,

draculad/keymap.c

@@ -35,7 +35,7 @@ combo_t key_combos[] = {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] =  LAYOUT_wrapper(
+    [_QWERTY] =  LAYOUT_wrapper(
 //     ┌────────┬────────┬────────┬────────┬────────┐       ┌────────┬────────┬────────┬────────┬────────┐
        __________________BASE_L1____________________,       __________________BASE_R1____________________,
 //     ├────────┼────────┼────────┼────────┼────────┤       ├────────┼────────┼────────┼────────┼────────┤
@@ -253,8 +253,8 @@ static void render_status(void) {
     oled_write_P(PSTR("\n"), false);
     oled_write_P(PSTR("\n"), false);
     switch (get_highest_layer(layer_state)) {
-        case _BASE:
+        case _QWERTY:
-            oled_write_P(PSTR("BASE    "), false);
+            oled_write_P(PSTR("QWERTY  "), false);
             break;
         case _NAV:
             oled_write_P(PSTR("NAV     "), false);
@@ -291,8 +291,75 @@ bool oled_task_user(void) {
 
 #endif //OLED_ENABLE
 
+uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static bool isLinux = false;
+    mod_state = get_mods();
     switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);
+            }
+            return false;
+        case LINUX:
+            if (record->event.pressed) {
+                isLinux = !isLinux;
+            }
+            return false;
+        case COPY:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_C));
+                } else {
+                    tap_code16(LGUI(KC_C));
+                }
+                return false;
+            }
+        case PASTE:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_V));
+                } else {
+                    tap_code16(LGUI(KC_V));
+                }
+            return false;
+            }
+        case CUT:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_X));
+                } else {
+                    tap_code16(LGUI(KC_X));
+                }
+                return false;
+            }
+        case UNDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Z));
+                } else {
+                    tap_code16(LGUI(KC_Z));
+                }
+                return false;
+            }
+        case REDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LSG(KC_Z));
+                }
+                return false;
+            }
+        case SALL:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_A));
+                } else {
+                    tap_code16(LGUI(KC_A));
+                }
+                return false;
+            }
         case M_PASS1:
             if (record->event.pressed) {
                 SEND_STRING("P0plarLake!2023");
@@ -300,17 +367,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("Thel0ve0fchrist!");
+               SEND_STRING("CindieVerano!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("6754");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("10242677");
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));              
             }
             return false;      
   }
@@ -318,6 +390,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {

iris/keymap.c

@@ -1,9 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#ifdef OS_DETECTION_ENABLE
-  #include "os_detection.h"
-#endif
-
 #include "dgvigil.h"
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
@@ -36,7 +32,7 @@ combo_t key_combos[] = {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_wrapper(
+  [_QWERTY] = 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,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -44,21 +40,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, __________________BASE_L3____________________,AS_TOGG,         _______, __________________BASE_R3____________________, KC_RSFT,
+     KC_LSFT, __________________BASE_L3____________________,SPOTLI,          _______, __________________BASE_R3____________________, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
+
   [_NAV] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, _______,         _______, __________________NAV_R3____________________, _______,
+     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -66,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NUM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -80,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SYM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_FUN] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -108,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MUS] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOUSE] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            KC_PSCR, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -135,9 +132,71 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-
+uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static bool isLinux = false;
+    mod_state = get_mods();
     switch (keycode) {
+
+        case LINUX:
+            if (record->event.pressed) {
+                isLinux = !isLinux;
+            }
+            return false;
+        case COPY:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_C));
+                } else {
+                    tap_code16(LGUI(KC_C));
+                }
+                return false;
+            }
+        case PASTE:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_V));
+                } else {
+                    tap_code16(LGUI(KC_V));
+                }
+            return false;
+            }
+        case CUT:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_X));
+                } else {
+                    tap_code16(LGUI(KC_X));
+                }
+                return false;
+            }
+        case UNDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Z));
+                } else {
+                    tap_code16(LGUI(KC_Z));
+                }
+                return false;
+            }
+        case REDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LSG(KC_Z));
+                }
+                return false;
+            }
+        case SALL:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_A));
+                } else {
+                    tap_code16(LGUI(KC_A));
+                }
+                return false;
+            }
         case M_PASS1:
             if (record->event.pressed) {
                 SEND_STRING("P0plarLake!2023");
@@ -145,29 +204,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
+               SEND_STRING("CindieVerano!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("1029");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("10242677");
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));
             }
             return false;
   }
     return true;
 }
 
+// #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB
+// #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_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) },
-    [_NAV] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
+    [_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(C(KC_LEFT), C(KC_RIGHT)), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(KC_B, KC_B) },
+    [_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(C(KC_TAB), S(C(KC_TAB))), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
+    [_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) },
-    [_MOUSE] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
+    [_MOUSE]  = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(A(KC_TAB), S(A(KC_TAB))) },
-    [_FUN] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
+    [_FUN]    = { 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_VAI, RGB_VAD)  },
-    [_MUS] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
+    [_MUS]    = { 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_MOD, RGB_RMOD) },
 };
+