From a9c0a45008127ebe5d060e9ddac7714643716265 Mon Sep 17 00:00:00 2001 From: Matt Skalecki Date: Tue, 12 Mar 2024 20:23:57 -0400 Subject: [PATCH] simplify --- .../moonlander/keymaps/ikcelaks/__init__.h | 6 ---- .../keymaps/ikcelaks/general/custom_keys.h | 13 -------- .../moonlander/keymaps/ikcelaks/keymap.c | 22 +++++++++---- .../keymaps/ikcelaks/sequence_transform | 2 +- .../ikcelaks/sequence_transform_dict.txt | 31 ++++++++++++++----- 5 files changed, 41 insertions(+), 33 deletions(-) delete mode 100644 keyboards/moonlander/keymaps/ikcelaks/__init__.h delete mode 100644 keyboards/moonlander/keymaps/ikcelaks/general/custom_keys.h diff --git a/keyboards/moonlander/keymaps/ikcelaks/__init__.h b/keyboards/moonlander/keymaps/ikcelaks/__init__.h deleted file mode 100644 index 916da2c6..00000000 --- a/keyboards/moonlander/keymaps/ikcelaks/__init__.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include QMK_KEYBOARD_H - -#include "general/custom_keys.h" -#include "sequence_transform/sequence_transform.h" diff --git a/keyboards/moonlander/keymaps/ikcelaks/general/custom_keys.h b/keyboards/moonlander/keymaps/ikcelaks/general/custom_keys.h deleted file mode 100644 index c1705c5e..00000000 --- a/keyboards/moonlander/keymaps/ikcelaks/general/custom_keys.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "../__init__.h" - -enum custom_keycodes { - US_MAG1 = SAFE_RANGE, - US_MAG2, - US_MAG3, - US_MAG4, - US_D_UND, - US_QUOT_S, -}; - -// #define SEQUENCE_TRANSFORM_SPECIAL_KEY_0 US_MAG1 diff --git a/keyboards/moonlander/keymaps/ikcelaks/keymap.c b/keyboards/moonlander/keymaps/ikcelaks/keymap.c index 32526760..f5ea9772 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/keymap.c +++ b/keyboards/moonlander/keymaps/ikcelaks/keymap.c @@ -18,7 +18,8 @@ -#include "__init__.h" +#include QMK_KEYBOARD_H +#include "sequence_transform/sequence_transform.h" #define KC_MAC_UNDO LGUI(KC_Z) #define KC_MAC_CUT LGUI(KC_X) @@ -41,9 +42,18 @@ #define C_GUI_ESC LGUI_T(KC_ESC) #define C_RSFT_ENT RSFT_T(KC_ENT) #define C_LALT_ENT LALT_T(KC_ENT) -#define C_RCTL_MINS RCTL_T(KC_MINS) +#define C_RCTL_QUOT RCTL_T(KC_QUOT) #define C_LCTL_BSPC LCTL(KC_BSPC) +enum custom_keycodes { + US_MAG1 = SAFE_RANGE, + US_MAG2, + US_MAG3, + US_MAG4, + US_D_UND, + US_QUOT_S, +}; + enum layers { BASE, // default layer SYMB, // symbols @@ -56,8 +66,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_moonlander( KC_DOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, KC_ASTR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_V, KC_M, KC_L, KC_C, KC_P, KC_DQUO, KC_PIPE, KC_B, US_MAG1, KC_U, KC_O, KC_COMM, KC_BSLS, - LCTL(KC_BSPC), KC_S, KC_T, KC_R, KC_D, KC_Y, KC_Q, KC_DLR, KC_F, KC_N, KC_E, KC_A, KC_I, C_RCTL_MINS, - KC_LSFT, KC_X, KC_K, KC_J, KC_G, KC_W, KC_Z, KC_H, KC_QUOT, KC_QUES, KC_DOT, C_RSFT_ENT, + LCTL(KC_BSPC), KC_S, KC_T, KC_R, KC_D, KC_Y, KC_Q, KC_DLR, KC_F, KC_N, KC_E, KC_A, KC_I, C_RCTL_QUOT, + KC_LSFT, KC_X, KC_K, KC_J, KC_G, KC_W, KC_Z, KC_H, KC_MINS, KC_QUES, KC_DOT, C_RSFT_ENT, KC_GRV, KC_LCTL, KC_LGUI, KC_ESC, TT(NAVI), C_LALT_ENT, C_GUI_ESC, C_S_T(KC_SLSH), KC_LALT, KC_LBRC, TT(MDIA), TT(SYMB), KC_SPC, KC_BSPC, KC_DEL, OSL(SYMB), OSM(MOD_LSFT), US_MAG2 ), @@ -92,8 +102,8 @@ const uint16_t PROGMEM combo_LB_IM[] = { KC_J, KC_G, COMBO_END}; const uint16_t PROGMEM combo_LB_MR[] = { KC_K, KC_J, COMBO_END}; const uint16_t PROGMEM combo_LB_RP[] = { KC_X, KC_K, COMBO_END}; const uint16_t PROGMEM combo_LB_IR[] = { KC_K, KC_G, COMBO_END}; -const uint16_t PROGMEM combo_RB_IM[] = { KC_H, KC_QUOT, COMBO_END}; -const uint16_t PROGMEM combo_RB_MR[] = { KC_QUOT, KC_QUES, COMBO_END}; +const uint16_t PROGMEM combo_RB_IM[] = { KC_H, KC_MINS, COMBO_END}; +const uint16_t PROGMEM combo_RB_MR[] = { KC_MINS, KC_QUES, COMBO_END}; const uint16_t PROGMEM combo_RB_RP[] = { KC_QUES, KC_DOT, COMBO_END}; const uint16_t PROGMEM combo_RB_IR[] = { KC_H, KC_QUES, COMBO_END}; diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform index 0756a4c8..578e92e4 160000 --- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform +++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform @@ -1 +1 @@ -Subproject commit 0756a4c8373404c15f58dabd40d0217e97d707b3 +Subproject commit 578e92e422a8ceedb95220f23c9d72dd43779afd diff --git a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt index 3d9f5e24..bd538048 100644 --- a/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt +++ b/keyboards/moonlander/keymaps/ikcelaks/sequence_transform_dict.txt @@ -12,12 +12,16 @@ judgeπŸ‘† β‡’ judgment theπŸ‘ β‡’ theory +simπŸ‘† β‡’ simultaneously +simπŸ‘†πŸ‘† β‡’ simultaneous + ⎡iπŸ‘ β‡’ I ⎡iπŸ‘m β‡’ I'm ⎡iπŸ‘d β‡’ I'd ⎡iπŸ‘l β‡’ I'll ⎡iπŸ‘v β‡’ I've ⎡iπŸ‘t β‡’ isn't +⎡iπŸ‘ts β‡’ it's ⎡iπŸ‘s β‡’ increase ⎡iπŸ‘sg β‡’ increasing ⎡iπŸ‘e β‡’ include @@ -28,9 +32,10 @@ theπŸ‘ β‡’ theory ⎡cπŸ‘ β‡’ come +⎡cπŸ‘v β‡’ co ⎡cπŸ‘o β‡’ course ⎡cπŸ‘a β‡’ change -⎡cπŸ‘ai β‡’ changing +⎡cπŸ‘ai β‡’ changing ⎡cπŸ‘s β‡’ cause ⎡cπŸ‘n β‡’ consider ⎡cπŸ‘m β‡’ complete @@ -42,6 +47,7 @@ theπŸ‘ β‡’ theory ⎡cπŸ‘u β‡’ could ⎡wπŸ‘u β‡’ would ⎡sπŸ‘u β‡’ should +⎡sπŸ‘ur β‡’ shoulder ⎡cπŸ‘ut β‡’ couldn't ⎡wπŸ‘ut β‡’ wouldn't ⎡sπŸ‘ut β‡’ shouldn't @@ -59,12 +65,14 @@ theπŸ‘ β‡’ theory ⎡rπŸ‘m β‡’ remember ⎡rπŸ‘c β‡’ record ⎡rπŸ‘h β‡’ reach -⎡rπŸ‘s β‡’ restaurant +⎡rπŸ‘st β‡’ restaurant ⎡lπŸ‘ β‡’ like +⎡lπŸ‘g β‡’ liking ⎡lπŸ‘i β‡’ light ⎡lπŸ‘a β‡’ large ⎡lπŸ‘o β‡’ look +⎡lπŸ‘og β‡’ looking ⎡lπŸ‘f β‡’ life ⎡lπŸ‘t β‡’ last ⎡lπŸ‘n β‡’ line @@ -92,6 +100,7 @@ theπŸ‘ β‡’ theory βŽ΅πŸ‘†d β‡’ they'd βŽ΅πŸ‘†s⎡ β‡’ this⎡ βŽ΅πŸ‘†t β‡’ that +βŽ΅πŸ‘†ts β‡’ that's βŽ΅πŸ‘†a⎡ β‡’ than⎡ βŽ΅πŸ‘†ak β‡’ thank βŽ΅πŸ‘†o⎡ β‡’ those⎡ @@ -169,6 +178,7 @@ rsπŸ‘ β‡’ rst ⎡nπŸ‘w β‡’ nowhere ⎡nπŸ‘g β‡’ nothing ⎡nπŸ‘m β‡’ number +⎡nπŸ‘r β‡’ neighbor ⎡eπŸ‘ β‡’ each ⎡eπŸ‘g β‡’ enough @@ -201,6 +211,8 @@ rsπŸ‘ β‡’ rst ⎡wπŸ‘†i β‡’ will ⎡wπŸ‘†l β‡’ well ⎡wπŸ‘†r β‡’ write +⎡wπŸ‘†rn β‡’ written +⎡wπŸ‘†ri β‡’ writing ⎡wπŸ‘†o β‡’ word ⎡wπŸ‘†t β‡’ with ⎡wπŸ‘†to β‡’ without @@ -233,16 +245,14 @@ rsπŸ‘ β‡’ rst ⎡sπŸ‘t β‡’ sometimes ⎡sπŸ‘g β‡’ something ⎡sπŸ‘h β‡’ somehow +⎡sπŸ‘w β‡’ somewhere ⎡sπŸ‘y β‡’ system ⎡sπŸ‘d β‡’ sound -⎡sπŸ‘c β‡’ success +⎡sπŸ‘c β‡’ science +⎡sπŸ‘s β‡’ success ⎡sπŸ‘l β‡’ school ⎡sπŸ‘m β‡’ small ⎡sπŸ‘p β‡’ special -⎡sπŸ‘w β‡’ show -⎡sπŸ‘wr β‡’ shower -⎡sπŸ‘wd β‡’ showed -⎡sπŸ‘wi β‡’ showing ⎡sπŸ‘a β‡’ state ⎡sπŸ‘e β‡’ seem ⎡sπŸ‘i β‡’ still @@ -309,6 +319,13 @@ sπŸ‘†l β‡’ school ⎡gπŸ‘u β‡’ guage ⎡gπŸ‘a β‡’ guarantee +⎡yπŸ‘e β‡’ you're +⎡yπŸ‘l β‡’ you'll +⎡yπŸ‘v β‡’ you've +⎡yπŸ‘d β‡’ you'd +⎡yπŸ‘y β‡’ yesterday +⎡yπŸ‘o β‡’ yellow + ⎡lπŸ‘† β‡’ little vπŸ‘† β‡’ ver