feat: add Dvorak layout

minusfive · Oct 11, 2024 · 6a5dad6 · 6a5dad6
1 parent 2b20595
commit 6a5dad6
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 64 deletions.
diff --git a/README.md b/README.md
@@ -39,11 +39,6 @@ Knucklehead[^1] is a mnemonic, macOS-optimized, 42 key ergonomic columnar layout
 > [!NOTE]\
 > These are **optimized for the [Colemak-DH](https://colemakmods.github.io/mod-dh/)** layout. While many will work well regardless of layout, others will be "lost in translation".
 >
-> [Other layouts available](#using-layouts-other-than-colemak-dh):
->
-> - [QWERTY](./knucklehead/L1_qwerty.dtsi)
-> - [Colemak](./knucklehead/L1_colemak.dtsi)
->
 > See: [Using layouts other than Colemak-DH](#using-layouts-other-than-colemak-dh)
 
 <!-- &nbsp;s force column width and prevent unwanted breaks -->
@@ -178,20 +173,29 @@ These special cases are marked with the same 🆇 symbol.
 
 ## Using layouts other than Colemak-DH
 
+> [!NOTE]\
+> Other layouts available:
+>
+> - [Colemak](./knucklehead/L1_colemak.dtsi) (classic)
+> - [Dvorak](./knucklehead/L1_dvorak.dtsi)
+> - [QWERTY](./knucklehead/L1_qwerty.dtsi)
+>
+> Feel free to submit [PRs](/pulls) with additional layouts, or [open an issue](/issues) if you need help with a specific layout. Of course, you're also always welcome to fork this repo and create your own custom layouts.
+
 In order to use layouts other than the default [Colemak-DH](https://colemakmods.github.io/mod-dh/) layout, you'll need to comment-out the `#include "L1_colemak-dh.dtsi"` statement in [./knucklehead/base.dtsi](./knucklehead/base.dtsi), and uncomment the corresponding layout file you wish to use. E.g.:
 
 ```diff
 # ./knucklehead/base.dtsi
 
 -#include "L1_colemak-dh.dtsi"
 +// #include "L1_colemak-dh.dtsi"
-
+// #include "L1_colemak.dtsi"
+// #include "L1_dvorak.dtsi"
 -// #include "L1_qwerty.dtsi"
 +#include "L1_qwerty.dtsi"
 ```
 
-> [!NOTE]\
-> Feel free to submit [PRs](/pulls) with additional layouts, or [open an issue](/issues) if you need help with a specific layout. Of course, you're also always welcome to fork this repo and create your own custom layouts.
+<https://github.com/minusfive/zmk-config/blob/2b20595017111d5ab5fe2b6731a971d3410b28c5/knucklehead/base.dtsi#L34-L38>
 
 ---
 

diff --git a/img/corneish_zen.svg → img/dvorak.svg b/img/corneish_zen.svg → img/dvorak.svg
diff --git a/img/corneish_zen.yaml → img/dvorak.yaml b/img/corneish_zen.yaml → img/dvorak.yaml
@@ -2,40 +2,40 @@ layout: {qmk_keyboard: corne_rotated, qmk_layout: LAYOUT_split_3x6_3}
 layers:
   L1:
   - $$mdi:keyboard-esc$$
-  - Q
-  - W
-  - F
+  - {t: '''', s: '"'}
+  - {t: ',', s: <}
+  - {t: ., s: '>'}
   - P
-  - B
-  - J
-  - L
-  - U
   - Y
-  - {t: '''', s: '"'}
+  - F
+  - G
+  - C
+  - R
+  - L
   - $$mdi:close-box$$
   - {t: '$$mdi:backspace$$', s: '$$mdi:backspace-reverse-outline$$', type: backspace}
   - A
-  - {t: R, h: '$$mdi:apple-keyboard-control$$'}
-  - {t: S, h: '$$mdi:apple-keyboard-option$$'}
-  - {t: T, h: '$$mdi:apple-keyboard-command$$'}
-  - {t: G, h: '$$mdi:triangle$$'}
-  - {t: M, h: '$$mdi:triangle$$'}
-  - {t: N, h: '$$mdi:apple-keyboard-command$$'}
+  - {t: O, h: '$$mdi:apple-keyboard-control$$'}
   - {t: E, h: '$$mdi:apple-keyboard-option$$'}
-  - {t: I, h: '$$mdi:apple-keyboard-control$$'}
-  - O
+  - {t: U, h: '$$mdi:apple-keyboard-command$$'}
+  - {t: I, h: '$$mdi:triangle$$'}
+  - {t: D, h: '$$mdi:triangle$$'}
+  - {t: H, h: '$$mdi:apple-keyboard-command$$'}
+  - {t: T, h: '$$mdi:apple-keyboard-option$$'}
+  - {t: N, h: '$$mdi:apple-keyboard-control$$'}
+  - S
   - {t: '$$mdi:keyboard-return$$', type: enter}
   - {t: Fn, h: '$$mdi:close-box$$'}
-  - Z
+  - {t: ;, s: ':'}
+  - Q
+  - J
+  - K
   - X
-  - C
-  - D
+  - B
+  - M
+  - W
   - V
-  - K
-  - H
-  - {t: ',', s: <}
-  - {t: ., s: '>'}
-  - {t: ;, s: ':'}
+  - Z
   - {t: Fn, h: '$$mdi:close-box$$'}
   - $$mdi:keyboard-tab$$
   - {t: '$$mdi:keyboard-space$$', h: '$$mdi:apple-keyboard-shift$$'}

diff --git a/knucklehead/L1_dvorak.dtsi b/knucklehead/L1_dvorak.dtsi
@@ -0,0 +1,28 @@
+/**
+ * Alpha Layer - Colemak
+ */
+
+/ {
+  keymap {
+    compatible = "zmk,keymap";
+
+    dvorak_layer {
+      display-name = "L1";
+      bindings = <
+// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮   ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
+// │0              │1              │2              │3              │4              │5              │   │6              │7              │8              │9              │10             │11             │
+    &kp ESC         &kp SQT         &kp COMMA       &kp DOT         &kp P           &kp Y               &kp F           &kp G           &kp C           &kp R           &kp L           &kp K_CANCEL
+// ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
+// │12             │13             │14             │15             │16             │17             │   │18             │19             │20             │21             │22             │23             │
+    &bkspc_del      &kp A           &hrml LCTRL O   &hrml LALT E    &hrml LCMD U    &hrml MEH I         &hrmr MEH D     &hrmr LCMD H    &hrmr LALT T    &hrmr LCTRL N   &kp S           &kp ENTER
+// ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
+// │24             │25             │26             │27             │28             │29             │   │30             │31             │32             │33             │34             │35             │
+    &csl Fn         &kp SEMICOLON   &kp Q           &kp J           &kp K           &kp X               &kp B           &kp M           &kp W           &kp V           &kp Z           &csl Fn
+// ╰───────────────┴───────────────┴───────────────┼───────────────┼───────────────┼───────────────┤   ├───────────────├───────────────┼───────────────┼───────────────┴───────────────┴───────────────╯
+//                                                 │36             │37             │38             │   │39             │40             │41             │
+                                                    &kp TAB         &mt LSHFT SPACE &smart_num L2 0     &smart_num L2 0 &smart_shift    &kp GRAVE
+//                                                 ╰───────────────┴───────────────┴───────────────╯   ╰───────────────┴───────────────┴───────────────╯
+      >;
+    };
+  };
+};
diff --git a/knucklehead/base.dtsi b/knucklehead/base.dtsi
@@ -34,6 +34,7 @@
 // Alpha layer: uncomment desired, comment the others
 #include "L1_colemak-dh.dtsi"
 // #include "L1_colemak.dtsi"
+// #include "L1_dvorak.dtsi"
 // #include "L1_qwerty.dtsi"
 
 // Other layers