From deb747a586f15dc0de4a0028ac4b1923d0fc8890 Mon Sep 17 00:00:00 2001 From: equiman Date: Sat, 16 Dec 2023 14:05:48 -0500 Subject: [PATCH] rename folder to macos --- .github/images/layers/{mac => macos}/AXN.png | Bin .github/images/layers/{mac => macos}/BAS.png | Bin .github/images/layers/{mac => macos}/DEV.png | Bin .github/images/layers/{mac => macos}/STG.png | Bin README.md | 2 +- config/corne.keymap | 30 +++++++++---------- config/os/{mac => macos}/combos/base.dtsi | 0 config/os/{mac => macos}/combos/help.dtsi | 0 config/os/{mac => macos}/hold/base.dtsi | 0 config/os/{mac => macos}/hold/dev.dtsi | 0 config/os/{mac => macos}/hold/layers.dtsi | 0 config/os/{mac => macos}/keymap.dtsi | 0 config/os/{mac => macos}/keys.dtsi | 0 config/os/{mac => macos}/layers.dtsi | 0 config/os/{mac => macos}/macros/dev.dtsi | 0 config/os/{mac => macos}/macros/int.dtsi | 0 config/os/{mac => macos}/macros/layers.dtsi | 0 config/os/{mac => macos}/morph/actions.dtsi | 0 config/os/{mac => macos}/morph/base.dtsi | 0 config/os/{mac => macos}/morph/dev.dtsi | 0 config/os/{mac => macos}/morph/int.dtsi | 0 config/os/{mac => macos}/morph/layers.dtsi | 0 docs/{mac.md => macos.md} | 8 ++--- 23 files changed, 20 insertions(+), 20 deletions(-) rename .github/images/layers/{mac => macos}/AXN.png (100%) rename .github/images/layers/{mac => macos}/BAS.png (100%) rename .github/images/layers/{mac => macos}/DEV.png (100%) rename .github/images/layers/{mac => macos}/STG.png (100%) rename config/os/{mac => macos}/combos/base.dtsi (100%) rename config/os/{mac => macos}/combos/help.dtsi (100%) rename config/os/{mac => macos}/hold/base.dtsi (100%) rename config/os/{mac => macos}/hold/dev.dtsi (100%) rename config/os/{mac => macos}/hold/layers.dtsi (100%) rename config/os/{mac => macos}/keymap.dtsi (100%) rename config/os/{mac => macos}/keys.dtsi (100%) rename config/os/{mac => macos}/layers.dtsi (100%) rename config/os/{mac => macos}/macros/dev.dtsi (100%) rename config/os/{mac => macos}/macros/int.dtsi (100%) rename config/os/{mac => macos}/macros/layers.dtsi (100%) rename config/os/{mac => macos}/morph/actions.dtsi (100%) rename config/os/{mac => macos}/morph/base.dtsi (100%) rename config/os/{mac => macos}/morph/dev.dtsi (100%) rename config/os/{mac => macos}/morph/int.dtsi (100%) rename config/os/{mac => macos}/morph/layers.dtsi (100%) rename docs/{mac.md => macos.md} (97%) diff --git a/.github/images/layers/mac/AXN.png b/.github/images/layers/macos/AXN.png similarity index 100% rename from .github/images/layers/mac/AXN.png rename to .github/images/layers/macos/AXN.png diff --git a/.github/images/layers/mac/BAS.png b/.github/images/layers/macos/BAS.png similarity index 100% rename from .github/images/layers/mac/BAS.png rename to .github/images/layers/macos/BAS.png diff --git a/.github/images/layers/mac/DEV.png b/.github/images/layers/macos/DEV.png similarity index 100% rename from .github/images/layers/mac/DEV.png rename to .github/images/layers/macos/DEV.png diff --git a/.github/images/layers/mac/STG.png b/.github/images/layers/macos/STG.png similarity index 100% rename from .github/images/layers/mac/STG.png rename to .github/images/layers/macos/STG.png diff --git a/README.md b/README.md index 3590b8b9..ec7a4704 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This is a WIP layout based on Colemak DHm that includes Spanish accents, and com - Keyboard - [Windows](docs/windows.md) - - [macOS](docs/mac.md) + - [macOS](docs/macos.md) - [Android](docs/android.md) - [Usage](#usage) - [Turn on/off](#turn-onoff) diff --git a/config/corne.keymap b/config/corne.keymap index 0c6e35d2..4a0acb7b 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -12,13 +12,13 @@ #include "os/all/times.dtsi" #include "os/all/general.dtsi" #include "os/windows/layers.dtsi" -#include "os/mac/layers.dtsi" +#include "os/macos/layers.dtsi" #include "os/android/layers.dtsi" /* Keys */ #include "os/all/keys.dtsi" #include "os/windows/keys.dtsi" -#include "os/mac/keys.dtsi" +#include "os/macos/keys.dtsi" #include "os/android/keys.dtsi" /* Helpers */ @@ -36,9 +36,9 @@ #include "os/windows/macros/int.dtsi" #include "os/windows/macros/dev.dtsi" - #include "os/mac/macros/layers.dtsi" - #include "os/mac/macros/int.dtsi" - #include "os/mac/macros/dev.dtsi" + #include "os/macos/macros/layers.dtsi" + #include "os/macos/macros/int.dtsi" + #include "os/macos/macros/dev.dtsi" #include "os/android/macros/layers.dtsi" #include "os/android/macros/int.dtsi" @@ -62,13 +62,13 @@ #include "os/windows/hold/base.dtsi" #include "os/windows/hold/dev.dtsi" - #include "os/mac/morph/layers.dtsi" - #include "os/mac/morph/base.dtsi" - #include "os/mac/morph/int.dtsi" - #include "os/mac/morph/actions.dtsi" - #include "os/mac/hold/layers.dtsi" - #include "os/mac/hold/base.dtsi" - #include "os/mac/hold/dev.dtsi" + #include "os/macos/morph/layers.dtsi" + #include "os/macos/morph/base.dtsi" + #include "os/macos/morph/int.dtsi" + #include "os/macos/morph/actions.dtsi" + #include "os/macos/hold/layers.dtsi" + #include "os/macos/hold/base.dtsi" + #include "os/macos/hold/dev.dtsi" #include "os/android/morph/layers.dtsi" #include "os/android/morph/base.dtsi" @@ -87,8 +87,8 @@ #include "os/windows/combos/base.dtsi" #include "os/windows/combos/help.dtsi" - #include "os/mac/combos/base.dtsi" - #include "os/mac/combos/help.dtsi" + #include "os/macos/combos/base.dtsi" + #include "os/macos/combos/help.dtsi" #include "os/android/combos/base.dtsi" }; @@ -99,7 +99,7 @@ compatible = "zmk,keymap"; #include "os/windows/keymap.dtsi" - #include "os/mac/keymap.dtsi" + #include "os/macos/keymap.dtsi" #include "os/android/keymap.dtsi" }; }; diff --git a/config/os/mac/combos/base.dtsi b/config/os/macos/combos/base.dtsi similarity index 100% rename from config/os/mac/combos/base.dtsi rename to config/os/macos/combos/base.dtsi diff --git a/config/os/mac/combos/help.dtsi b/config/os/macos/combos/help.dtsi similarity index 100% rename from config/os/mac/combos/help.dtsi rename to config/os/macos/combos/help.dtsi diff --git a/config/os/mac/hold/base.dtsi b/config/os/macos/hold/base.dtsi similarity index 100% rename from config/os/mac/hold/base.dtsi rename to config/os/macos/hold/base.dtsi diff --git a/config/os/mac/hold/dev.dtsi b/config/os/macos/hold/dev.dtsi similarity index 100% rename from config/os/mac/hold/dev.dtsi rename to config/os/macos/hold/dev.dtsi diff --git a/config/os/mac/hold/layers.dtsi b/config/os/macos/hold/layers.dtsi similarity index 100% rename from config/os/mac/hold/layers.dtsi rename to config/os/macos/hold/layers.dtsi diff --git a/config/os/mac/keymap.dtsi b/config/os/macos/keymap.dtsi similarity index 100% rename from config/os/mac/keymap.dtsi rename to config/os/macos/keymap.dtsi diff --git a/config/os/mac/keys.dtsi b/config/os/macos/keys.dtsi similarity index 100% rename from config/os/mac/keys.dtsi rename to config/os/macos/keys.dtsi diff --git a/config/os/mac/layers.dtsi b/config/os/macos/layers.dtsi similarity index 100% rename from config/os/mac/layers.dtsi rename to config/os/macos/layers.dtsi diff --git a/config/os/mac/macros/dev.dtsi b/config/os/macos/macros/dev.dtsi similarity index 100% rename from config/os/mac/macros/dev.dtsi rename to config/os/macos/macros/dev.dtsi diff --git a/config/os/mac/macros/int.dtsi b/config/os/macos/macros/int.dtsi similarity index 100% rename from config/os/mac/macros/int.dtsi rename to config/os/macos/macros/int.dtsi diff --git a/config/os/mac/macros/layers.dtsi b/config/os/macos/macros/layers.dtsi similarity index 100% rename from config/os/mac/macros/layers.dtsi rename to config/os/macos/macros/layers.dtsi diff --git a/config/os/mac/morph/actions.dtsi b/config/os/macos/morph/actions.dtsi similarity index 100% rename from config/os/mac/morph/actions.dtsi rename to config/os/macos/morph/actions.dtsi diff --git a/config/os/mac/morph/base.dtsi b/config/os/macos/morph/base.dtsi similarity index 100% rename from config/os/mac/morph/base.dtsi rename to config/os/macos/morph/base.dtsi diff --git a/config/os/mac/morph/dev.dtsi b/config/os/macos/morph/dev.dtsi similarity index 100% rename from config/os/mac/morph/dev.dtsi rename to config/os/macos/morph/dev.dtsi diff --git a/config/os/mac/morph/int.dtsi b/config/os/macos/morph/int.dtsi similarity index 100% rename from config/os/mac/morph/int.dtsi rename to config/os/macos/morph/int.dtsi diff --git a/config/os/mac/morph/layers.dtsi b/config/os/macos/morph/layers.dtsi similarity index 100% rename from config/os/mac/morph/layers.dtsi rename to config/os/macos/morph/layers.dtsi diff --git a/docs/mac.md b/docs/macos.md similarity index 97% rename from docs/mac.md rename to docs/macos.md index 92e22f75..33221342 100644 --- a/docs/mac.md +++ b/docs/macos.md @@ -61,7 +61,7 @@ Icons used to describe some modifiers and actions Letters, accents for Spanish language and quick shortcuts for most used symbols to "avoid" changing layers. -![BAS Layer](/.github/images/layers/mac/BAS.png) +![BAS Layer](/.github/images/layers/macos/BAS.png) #### Spanish @@ -88,7 +88,7 @@ Letters, accents for Spanish language and quick shortcuts for most used symbols Symbols and dev shortcuts for JS/TS. -![DEV Layer](/.github/images/layers/mac/DEV.png) +![DEV Layer](/.github/images/layers/macos/DEV.png) #### Symbols @@ -128,7 +128,7 @@ Symbols and dev shortcuts for JS/TS. Quick navigation actions and numbers. Function keys works independently as a sub-layer to avoid shortcuts collisions. -![AXN Layer](/.github/images/layers/mac/AXN.png) +![AXN Layer](/.github/images/layers/macos/AXN.png) #### Navigation @@ -172,7 +172,7 @@ Quick navigation actions and numbers. Function keys works independently as a sub Dedicated to Bluetooth and media controls. -![STG Layer](/.github/images/layers/mac/STG.png) +![STG Layer](/.github/images/layers/macos/STG.png) #### Actions