From 9a42ee743bb7162892cad2972ed47f525c2b6d2b Mon Sep 17 00:00:00 2001 From: Darren Victoriano Date: Fri, 7 Feb 2025 22:00:41 -0800 Subject: [PATCH 1/3] resolve conflivt --- images/config_keymap-drawer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/config_keymap-drawer.yaml b/images/config_keymap-drawer.yaml index 18ecda7..f1fa441 100644 --- a/images/config_keymap-drawer.yaml +++ b/images/config_keymap-drawer.yaml @@ -439,8 +439,8 @@ parse_config: RC(RS(TAB)): "↤" RC(TAB): "↦" - LG(LS(J)): "✢" - LG(LA(SPACE)): "‡" + LG(LS(J)): "Cmd + Shift + J" + LG(LA(SPACE)): "Cmd + Opt + ⎵" LOWER: "⤓" RAISE: "⤒" From b927b7539efa80ba70752dde63cacb4be64afccb Mon Sep 17 00:00:00 2001 From: DarrenVictoriano <26513979+DarrenVictoriano@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:00:41 -0800 Subject: [PATCH 2/3] resolve conflivt --- images/config_keymap-drawer.yaml | 4 ++-- images/corne.svg | 8 ++++++-- images/corne.yaml | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/images/config_keymap-drawer.yaml b/images/config_keymap-drawer.yaml index 18ecda7..f1fa441 100644 --- a/images/config_keymap-drawer.yaml +++ b/images/config_keymap-drawer.yaml @@ -439,8 +439,8 @@ parse_config: RC(RS(TAB)): "↤" RC(TAB): "↦" - LG(LS(J)): "✢" - LG(LA(SPACE)): "‡" + LG(LS(J)): "Cmd + Shift + J" + LG(LA(SPACE)): "Cmd + Opt + ⎵" LOWER: "⤓" RAISE: "⤒" diff --git a/images/corne.svg b/images/corne.svg index 0b3877f..6c3c3fb 100644 --- a/images/corne.svg +++ b/images/corne.svg @@ -520,7 +520,9 @@ rect.held, rect.combo.held { - + +Cmd+ + @@ -563,7 +565,9 @@ rect.held, rect.combo.held { - + +Cmd+ + diff --git a/images/corne.yaml b/images/corne.yaml index efcfe22..b2bc62f 100644 --- a/images/corne.yaml +++ b/images/corne.yaml @@ -21,7 +21,7 @@ layers: - '' - ↤ - ↦ - - ✢ + - Cmd + Shift + J - $$mdi:arrow-left-bold$$ - $$mdi:arrow-down-bold$$ - $$mdi:arrow-up-bold$$ @@ -33,7 +33,7 @@ layers: - '' - '' - '' - - ‡ + - Cmd + Opt + ⎵ - $$mdi:volume-low$$ - $$mdi:volume-high$$ - '' From 0b9dd7321c73b71ee42bfb69febe463ffa794f41 Mon Sep 17 00:00:00 2001 From: Darren Victoriano Date: Fri, 7 Feb 2025 22:09:55 -0800 Subject: [PATCH 3/3] resolve conflivt --- images/config_keymap-drawer.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/config_keymap-drawer.yaml b/images/config_keymap-drawer.yaml index f1fa441..e8e7224 100644 --- a/images/config_keymap-drawer.yaml +++ b/images/config_keymap-drawer.yaml @@ -437,10 +437,10 @@ parse_config: RGUI: $$mdi:apple-keyboard-command$$ LS(LC(LALT)): $$mdi:triangle$$ # Meh - RC(RS(TAB)): "↤" - RC(TAB): "↦" - LG(LS(J)): "Cmd + Shift + J" - LG(LA(SPACE)): "Cmd + Opt + ⎵" + RC(RS(TAB)): "⌃⇧⇥" + RC(TAB): "⌃⇥" + LG(LS(J)): "⌘⇧J" + LG(LA(SPACE)): "⌘⌥⎵" LOWER: "⤓" RAISE: "⤒"