Skip to content

Commit a0d1f07

Browse files
creativecodercreativecoder
committed
Updates layout for Linux + Gnome desktop
1 parent 53a01f1 commit a0d1f07

File tree

3 files changed

+43
-76
lines changed

3 files changed

+43
-76
lines changed

‎kyria/qmk/combos.def‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
COMB(BACK, LCTL(KC_LBRC), LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I))
1818
COMB(FORWARD, LCTL(KC_RBRC), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O))
19-
COMB(PREV_TAB, S(LCTL(KC_LBRC)), KC_L, KC_U, KC_Y)
20-
COMB(NEXT_TAB, S(LCTL(KC_RBRC)), KC_U, KC_Y, KC_QUOT)
19+
COMB(PREV_TAB, LCTL(KC_PGUP), KC_L, KC_U, KC_Y)
20+
COMB(NEXT_TAB, LCTL(KC_PGDN), KC_U, KC_Y, KC_QUOT)
2121
COMB(CLOSE_TAB, LCTL(KC_W), KC_J, KC_L, KC_U)
22-
COMB(NEXT_WINDOW, LCTL(KC_TILD), KC_M, LSFT_T(KC_N), LCTL_T(KC_E))
23-
COMB(SHOW_DESKTOP, KC_F13, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O))
24-
COMB(MISSION_CONTROL, LGUI(KC_UP), KC_L, KC_U, KC_Y, KC_QUOT)
25-
COMB(APP_WINDOWS, LGUI(KC_DOWN), RSFT_T(KC_H), RCTL_T(KC_COMM), ALGR_T(KC_DOT), RGUI_T(KC_SLSH))
26-
COMB(MOVE_WINDOW_LEFT, HYPR(KC_LEFT), RSFT_T(KC_H), RCTL_T(KC_COMM), ALGR_T(KC_DOT))
27-
COMB(MOVE_WINDOW_RIGHT, HYPR(KC_RGHT), RCTL_T(KC_COMM), ALGR_T(KC_DOT), RGUI_T(KC_SLSH))
28-
COMB(NOTIFICATION_CENTER, LGUI(KC_F13), KC_QUOT, RGUI_T(KC_SLSH))
22+
COMB(NEXT_WINDOW, LALT(KC_F6), KC_M, LSFT_T(KC_N), LCTL_T(KC_E))
23+
COMB(OVERVIEW, KC_LGUI, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O))
24+
COMB(QUICK_SETTINGS, LGUI(KC_S), KC_L, KC_U, KC_Y, KC_QUOT)
25+
COMB(APPLICATIONS, LGUI(KC_A), RSFT_T(KC_H), RCTL_T(KC_COMM), ALGR_T(KC_DOT), RGUI_T(KC_SLSH))
26+
COMB(MOVE_WINDOW_LEFT, LSG(KC_LEFT), RSFT_T(KC_H), RCTL_T(KC_COMM), ALGR_T(KC_DOT))
27+
COMB(MOVE_WINDOW_RIGHT, LSG(KC_RGHT), RCTL_T(KC_COMM), ALGR_T(KC_DOT), RGUI_T(KC_SLSH))
28+
COMB(NOTIFICATION_CENTER, LGUI(KC_V), KC_QUOT, RGUI_T(KC_SLSH))

‎kyria/qmk/encoders.h‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,32 @@
1717
bool encoder_update_user(uint8_t index, bool clockwise)
1818
{
1919
mod_state = get_mods();
20+
2021
if (index == 0)
2122
{
23+
// Left encoder
2224
switch (get_highest_layer(layer_state))
2325
{
2426
case NUM:
27+
// Zoom in/out
28+
if (clockwise)
29+
{
30+
tap_code16(LCTL(KC_EQL));
31+
}
32+
else
33+
{
34+
tap_code16(LCTL(KC_MINS));
35+
}
36+
break;
37+
case SYM:
2538
// Select next/previous window
2639
if (clockwise)
2740
{
28-
tap_code16(LCTL(KC_GRV));
41+
tap_code16(LALT(KC_GRV));
2942
}
3043
else
3144
{
32-
tap_code16(S(LCTL(KC_GRV)));
45+
tap_code16(S(LALT(KC_GRV)));
3346
}
3447
break;
3548
case FUNC:
@@ -67,28 +80,29 @@ bool encoder_update_user(uint8_t index, bool clockwise)
6780
}
6881
else if (index == 1)
6982
{
83+
// Right encoder
7084
switch (get_highest_layer(layer_state))
7185
{
7286
case NAV:
73-
// Zoom in/out
87+
// Select next/previous tab
7488
if (clockwise)
7589
{
76-
tap_code16(LCTL(KC_EQL));
90+
tap_code16(LCTL(KC_PGDN));
7791
}
7892
else
7993
{
80-
tap_code16(LCTL(KC_MINS));
94+
tap_code16(LCTL(KC_PGUP));
8195
}
8296
break;
8397
case SHCTS:
84-
// Select next/previous tab
98+
// Next/prev workspace
8599
if (clockwise)
86100
{
87-
tap_code16(S(LCTL(KC_RBRC)));
101+
tap_code16(LGUI(KC_PGDN));
88102
}
89103
else
90104
{
91-
tap_code16(S(LCTL(KC_LBRC)));
105+
tap_code16(LGUI(KC_PGUP));
92106
}
93107
break;
94108
case MEDIA:
@@ -125,7 +139,7 @@ bool encoder_update_user(uint8_t index, bool clockwise)
125139
break;
126140
default:
127141
// Scrolling with Page up/Page down
128-
if (get_mods() && MOD_MASK_CTRL)
142+
if (get_mods() && MOD_MASK_GUI)
129143
{
130144
del_mods(mod_state);
131145
if (clockwise)

‎kyria/qmk/keymap.c‎

Lines changed: 11 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,16 @@ uint8_t mod_state;
6464
#define U_CPY LCTL(KC_C)
6565
#define U_CUT LCTL(KC_X)
6666
#define U_UND LCTL(KC_Z)
67-
#define EMICONS C(LSG(KC_E))
68-
#define SCRNSHT S(LCTL(KC_4))
69-
#define SCRNCLP LGUI(SCRNSHT)
70-
#define SCRNREC S(LCTL(KC_5))
71-
#define CLIPBRD LCA(KC_BSLS)
72-
#define SNIPS LCAG(KC_SPC)
73-
#define INSTSND KC_LGUI
74-
#define SYMBLS C(LGUI(KC_SPACE))
67+
#define SCRNREC S(LCA(KC_R))
68+
#define CLIPBRD LAG(KC_V)
69+
#define SYMBLS LCAG(KC_C)
7570

7671
enum custom_keycodes
7772
{
7873
CAPSWORD = SAFE_RANGE,
7974
CPY_URL,
8075
CPY_GO,
81-
CPY_SRH,
8276
DBLARR,
83-
INSDMAC,
8477
NOTES,
8578
QT_RPLY,
8679
SNGARR,
@@ -94,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9487
[BASE] = LAYOUT_kyria_3x5(
9588
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT,
9689
LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O),
97-
RGUI_T(KC_Z), ALGR_T(KC_X), RCTL_T(KC_C), RSFT_T(KC_D), KC_V, LT(FUNC, KC_DEL), LT(SYM, KC_ENT), LT(SHCTS, KC_TAB), LT(MEDIA, KC_ESC), KC_K, RSFT_T(KC_H), RCTL_T(KC_COMM),ALGR_T(KC_DOT), RGUI_T(KC_SLSH),
98-
NOTES, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(SHCTS, KC_TAB), LT(NUM, KC_BSPC), LT(NAV, KC_SPC), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUNC, KC_LSFT), KC_ENT
90+
RGUI_T(KC_Z), ALGR_T(KC_X), RCTL_T(KC_C), RSFT_T(KC_D), KC_V, LT(FUNC, KC_DEL), LT(SYM, KC_ENT), LT(SHCTS, KC_TAB), LT(MEDIA, KC_ESC), KC_K, RSFT_T(KC_H), RCTL_T(KC_COMM),ALGR_T(KC_DOT), RGUI_T(KC_SLSH),
91+
KC_LGUI, LT(MEDIA, KC_ESC), LT(NAV, KC_SPC), LT(SHCTS, KC_TAB), LT(NUM, KC_BSPC), LT(NAV, KC_SPC), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUNC, KC_LSFT), KC_ENT
9992
),
10093
[NAV] = LAYOUT_kyria_3x5(
10194
QK_RBT, U_NA, U_NA, U_NA, U_NA, U_RDO, U_PST, U_CPY, U_CUT, U_UND,
@@ -104,15 +97,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10497
U_NU, U_NA, U_NA, U_NA, U_NA, KC_SPC, KC_ENT, KC_DEL, KC_BSPC, U_NU
10598
),
10699
[SHCTS] = LAYOUT_kyria_3x5(
107-
QK_RBT, U_NA, U_NA, U_NA, U_NA, SYMBLS, U_NU, INSDMAC, QT_RPLY, CLIPBRD,
108-
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_SPC, CPY_URL, CPY_GO, CPY_SRH, VIM_WQ,
109-
U_NA, KC_ALGR, U_NA, U_NA, U_NA, U_NA, U_NA, KC_TAB, KC_ESC, EMICONS, SCRNSHT, SCRNCLP, SCRNREC, SNIPS,
100+
QK_RBT, U_NA, U_NA, U_NA, U_NA, SYMBLS, U_NU, U_NU, QT_RPLY, CLIPBRD,
101+
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA, KC_SPC, CPY_URL, CPY_GO, U_NU, VIM_WQ,
102+
U_NA, KC_ALGR, U_NA, U_NA, U_NA, U_NA, U_NA, KC_TAB, KC_ESC, U_NU, KC_PSCR, SCRNREC, U_NU, U_NA,
110103
U_NU, U_NA, U_NA, U_NA, U_NA, KC_SPC, KC_ENT, KC_DEL, KC_BSPC, U_NU
111104
),
112105
[MEDIA] = LAYOUT_kyria_3x5(
113106
QK_RBT, U_NA, U_NA, U_NA, U_NA, UG_TOGG, UG_NEXT, UG_HUEU, UG_SATU, UG_VALU,
114107
KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, TG(MUSIC), TG(GAME), KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT,
115-
U_NA, KC_ALGR, U_NA, U_NA, U_NA, U_NA, U_NA, U_NU, U_NU, U_NU, U_NU, U_NU, U_NU, U_NU,
108+
U_NA, KC_ALGR, U_NA, U_NA, U_NA, U_NA, U_NA, U_NU, U_NU, TG(MUSIC),U_NU, U_NU, U_NU, U_NU,
116109
U_NU, U_NA, U_NA, U_NA, U_NA, U_NU, KC_MSTP, KC_MPLY, KC_MUTE, KC_MUTE
117110
),
118111
[NUM] = LAYOUT_kyria_3x5(
@@ -154,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
154147
[MUSIC] = LAYOUT_kyria_3x5(
155148
KC_Q, KC_SCLN, KC_S, KC_8, KC_T, KC_EQL, KC_E, KC_F, KC_G, KC_Y,
156149
LGUI_T(KC_V), LALT_T(KC_5), LCTL_T(KC_6), LSFT_T(KC_7), KC_F, KC_0, RSFT_T(KC_A), RCTL_T(KC_B), RALT_T(KC_C), RGUI_T(KC_D),
157-
KC_DOT, ALGR_T(KC_COMM), KC_SLSH, KC_4, KC_I, LT(FUNC, KC_QUOT), LT(SYM, KC_BSLS), LT(SHCTS, KC_TAB), LT(MEDIA, KC_ESC), KC_MINS, KC_R, KC_O, KC_L, KC_U,
150+
KC_DOT, ALGR_T(KC_COMM), KC_SLSH, KC_4, KC_I, LT(FUNC, KC_QUOT), LT(SYM, KC_BSLS), LT(SHCTS, KC_TAB), LT(MEDIA, KC_ESC), KC_MINS, KC_R, KC_O, KC_L, KC_U,
158151
TG(MUSIC), KC_ESC, LT(NAV, KC_SPC), LT(SHCTS, KC_LBRC), LT(NUM, KC_RBRC), LT(NAV, KC_SPC), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUNC, KC_LSFT), KC_ENT
159152
),
160153
};
@@ -305,54 +298,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
305298
set_mods(mod_state);
306299
}
307300
return false;
308-
case CPY_SRH:
309-
if (record->event.pressed)
310-
{
311-
if (get_mods() & MOD_MASK_SHIFT)
312-
{
313-
// Use Launchbar to go to highlighted url
314-
del_mods(mod_state);
315-
tap_code16(U_CPY);
316-
tap_code(INSTSND);
317-
SEND_STRING(SS_DELAY(50));
318-
tap_code(INSTSND);
319-
SEND_STRING(SS_DELAY(200));
320-
tap_code(KC_ENT);
321-
set_mods(mod_state);
322-
}
323-
else
324-
{
325-
// Use Launchbar to search web for highlighted text
326-
del_mods(mod_state);
327-
tap_code16(U_CPY);
328-
tap_code(INSTSND);
329-
SEND_STRING(SS_DELAY(50));
330-
tap_code(INSTSND);
331-
SEND_STRING(SS_DELAY(200) SS_TAP(X_TAB) "ddg");
332-
tap_code(KC_ENT);
333-
set_mods(mod_state);
334-
}
335-
}
336-
return false;
337-
case DBLARR:
301+
case DBLARR:
338302
if (record->event.pressed)
339303
{
340304
del_mods(mod_state);
341305
SEND_STRING("=>");
342306
set_mods(mod_state);
343307
}
344308
return false;
345-
case INSDMAC:
346-
// Tap the instant send key twice to send selection to Launchbar
347-
if (record->event.pressed)
348-
{
349-
del_mods(mod_state);
350-
tap_code(INSTSND);
351-
SEND_STRING(SS_DELAY(50));
352-
tap_code(INSTSND);
353-
set_mods(mod_state);
354-
}
355-
return false;
356309
case QT_RPLY:
357310
// Quote highlighted text and start a reply in Slack
358311
if (record->event.pressed)

0 commit comments

Comments
 (0)