Update lint_and_compile.yml

.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"

dgvigil/definitions/keycodes.h

@@ -22,7 +22,9 @@ enum {
 
 enum {
     CUSTOM_KEYCODE_START = SAFE_RANGE,
-    WINDOWS,
+    QWERTY,
+    COLEMAK,
+    LINUX,
     COPY,
     PASTE,
     CUT,
@@ -49,9 +51,6 @@ enum {
 #define NUM_SPC LT(_NUM, KC_SPC)
 #define FUN_DEL LT(_FUN, KC_DEL)
 
-#define QWERTY   TG(_QWERTY)
-#define COLEMAK  TG(_COLEMAK_DH)
-
 // 2 LEFT THUMB KEYS
 #define FUN_TAB LT(_FUN, KC_TAB)
 // 2 RIGHT THUMB KEYS

draculad/keymap.c

@@ -306,17 +306,27 @@ bool oled_task_user(void) {
 
 uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+        case QWERTY:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                set_single_persistent_default_layer(_QWERTY);
+            }
+            return false;
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK_DH);
+            }
+            return false;
+        case LINUX:
+            if (record->event.pressed) {
+                isLinux = !isLinux;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -325,7 +335,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -334,7 +344,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -343,7 +353,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -352,7 +362,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -361,7 +371,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));
@@ -375,17 +385,22 @@ 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;      
   }

iris/keymap.c

@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________COLEML3____________________, SPOTLI,         _______, __________________COLEMR3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
+                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, WINDOWS,         _______, __________________NAV_R3____________________, _______,
+     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -151,17 +151,18 @@ 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 isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+
+        case LINUX:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                isLinux = !isLinux;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -170,7 +171,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -179,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -188,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -197,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -206,7 +207,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));