zweihander: rename, ⌃ → ⌥, README revamp (#2311)

* zweihander-osx: Remove app keys, etc.

- add right command keys
- add F16 on ;' for Siri
- remove command-Q (too easy to hit)

* Rename zweihander-osx to zweihander-macos

zweihander-macos: / / ^ → / / ⌥; README revamp

zweihander: rename, ⌃ → ⌥, README revamp

5 files changed, 80 insertions, 51 deletions

diff --git a/layouts/community/ergodox/zweihander-osx/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c
index 8c216b09b6..6dd2b04f4b 100644
--- a/layouts/community/ergodox/zweihander-osx/keymap.c
+++ b/layouts/community/ergodox/zweihander-macos/keymap.c
@@ -16,9 +16,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |   ⌦    |   Q  |   W  |   E  |   R  |   T  | ~L1  |           | ~L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |   ⌫    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2| ' / L⌘ |
+ * |   ⌫    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2| ' / R⌘ |
  * |--------+------+------+------+------+------|  L⌘  |           |  R⌘  |------+------+------+------+------+--------|
- * |  L⇧    |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | / / ⌃|  R⇧    |
+ * |  L⇧    |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | / /R⌥|  R⇧    |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |  L⌃  |  L⌥  |  L⌘  |   ←  |   →  |                                       |   ↑  |   ↓  |   [  |   ]  |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -45,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         // right hand
              TG(SYMB),  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
              MO(SYMB),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
-                        KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             KC_RGUI,   KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+                        KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),RGUI_T(KC_QUOT),
+             KC_RGUI,   KC_N,   KC_M,   KC_COMM,KC_DOT, RALT_T(KC_SLSH),  KC_RSFT,
                                 KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          KC_SPC ,
              KC_ESC,            KC_BSPC,
              KC_PGDN,
diff --git a/layouts/community/ergodox/zweihander-macos/readme.markdown b/layouts/community/ergodox/zweihander-macos/readme.markdown
new file mode 100644
index 0000000000..8921647bd3
--- /dev/null
+++ b/layouts/community/ergodox/zweihander-macos/readme.markdown
@@ -0,0 +1,73 @@
+# The Zweihander Layout
+
+NB: the backtick (\`) is special in Markdown. If I write ⌘\` in this readme, I mean “Command-backtick”, not “Command-backslash-backtick”.
+
+This README refers to two secondary layers: the Media Layer and the Symbol Layer. The Media Layer is accessed by holding ; (the semicolon) and has cursor-movement, window-management, and volume-adjustment keys on it. The Symbol Layer is accessed by holding either of the two tall keys between T and Y, or by tapping one of the small keys between 5 and 6. It has a 10-key keypad, parentheses and similar grouping punctuation, and F1–F12.
+
+This layout is tuned for people who…
+
+
+## use macOS
+
+While this layout works fine in Windows, it’s not tuned for it. No sane person who primarily uses Windows would put this many Windows keys on a keyboard layout. That said, Print Screen, Scroll Lock, and Pause are available in their usual order on the Media Layer if you need them.
+
+
+## mouse left-handed while doing other things with the right hand
+
+I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the Media Layer (hold ;) to speed up browsing in applications like Safari and Finder:
+
+- ⌘[ — Back
+- ⌘] — Forward
+- ⌥⌘↓ — Open Selection and Close Parent Folder
+- ⌥⌘↑ — Go Up and Close Just-Left Folder
+
+I also have a few keys dedicated to window management:
+
+- ⌘W — Close Window
+- ⌘\` — Move Focus to Next Window
+- ⌘⇧\` — Move Focus to Previous Window
+
+Cut, Copy, and Paste (⌘X, ⌘C, and ⌘V) are also available on the three bottommost right-thumb buttons if you hold ;.
+
+
+## use lots of modifier keys in OS X menu-item shortcuts
+
+I wanted to preserve the feel of a number of shortcuts that involve pressing lots of modifier keys at once. This is why the bottom left of the keyboard has Shift, Control, Option, and Command in the usual spots. Further I’ve added affordances so some key combinations are easier to press with just the right hand.
+
+I also put a second Backspace (⌫) key on the right half of the keyboard to make some particularly commonly-used keyboard shortcuts faster and more convenient for right-handed use:
+
+- ⌘⌫ — Move to Trash / Delete
+- ⇧⌥⌘⌫ — Empty Trash Without Asking for Confirmation
+
+⇧⌥⌘⌫ is much more satisfying to press when you do it like on a normal keyboard: one left-hand finger on each of ⇧, ⌥, and ⌘, and the right index finger on ⌫.
+
+Pressing and holding / will give you Option. This makes a number of keyboard shortcuts easy to press with just the right hand:
+
+- ⌥↑ — Move Line Up
+- ⌥↓ — Move Line Down
+- ⌥⇧↑ — Copy Line Up / Go To Previous Channel With Unread Messages
+- ⌥⇧↓ — Copy Line Down / Go To Next Channel With Unread Messages
+
+
+## use Emacs-style shortcuts
+
+I press C-a, C-e, and C-k all the time. It’s difficult to press these key combinations with the Control key on the far left, so the leftmost thumb button on the right side is another Control key.
+
+Having trouble remembering which innermost thumb key is Alt and which is Control? The two’re like on the lower right of a normal keyboard — leftmost is Alt, rightmost is Control.
+
+
+## use spreadsheets
+
+All the common spreadsheet operations (+-*/=) are on the right side of the Symbol Layer. Make-numbers-bigger (+, \*) operations on the right; make-numbers-smaller (-, /) on the left. There’s also a colon there for entering times and maybe IPv6 addresses.
+
+
+## know the ↑↓←→ fn-key shortcuts for MacBooks
+
+Have you looked at the Page Up, Page Down, Home, and End keys on the EDSF keys and wondered why they’re arranged that way? They’re arranged the same way as the fn-key shortcuts on an Apple laptop’s arrow keys. On Apple keyboards with an\* fn key, if you press fn-↑, you’ll get Page Up; if you press fn-← you’ll get Home. Similarly, on Zweihander, ;-E is Page Up and ;-S is Home.
+
+
+## use Siri
+
+F16, accessed by holding ; and pressing the ' key next to it, is intended for Siri.
+
+\* I pronounce “fn” as “effin’”. Your mileage may vary.
diff --git a/layouts/community/ergodox/zweihander-macos/rules.mk b/layouts/community/ergodox/zweihander-macos/rules.mk
new file mode 100644
index 0000000000..8011660ced
--- /dev/null
+++ b/layouts/community/ergodox/zweihander-macos/rules.mk
@@ -0,0 +1,3 @@
+# Don’t do a tricolor flashing-light wave when the computer is shut down in Windows,
+# or when the machine is sleeping in macOS
+SLEEP_LED_ENABLE = no
diff --git a/layouts/community/ergodox/zweihander-osx/readme.markdown b/layouts/community/ergodox/zweihander-osx/readme.markdown
deleted file mode 100644
index e88f7c0551..0000000000
--- a/layouts/community/ergodox/zweihander-osx/readme.markdown
+++ /dev/null
@@ -1,45 +0,0 @@
-# The Zweihander Layout
-
-NB: the backtick (\`) is special in Markdown. If I write ⌘\` in this readme, I mean “command-backtick”, not “command-backslash-backtick”.
-
-This layout is tuned for people who…
-
-
-## use OS X
-
-While this layout should work fine in Windows, it’s not tuned for it. No sane person who primarily uses Windows would put this many Windows keys on a keyboard layout.
-
-
-## mouse left-handed while doing other things with the right hand
-
-I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the media layer to speed up browsing in Safari and Finder:
-
-- Close Window (⌘W)
-- Back (⌘[)
-- Forward (⌘])
-- Open and Close Parent Folder (⌥⌘↓)
-- Go Up and Close Just-Left Folder (⌥⌘↑)
-- Cycle through open windows in current application (⌘\` and ⌘⇧\`)
-
-Because moving letter-by-letter is way slower than moving word-by-word, I added Option (⌥) to the bottommost button on the left side. This key can be held easily while holding ; (activate media layer) and pressing J and L to move left and right by word.
-
-
-## use lots of modifier keys in OS X menu-item shortcuts
-
-I wanted to preserve the feel of a number of shortcuts that involve pressing lots of modifier keys at once; this is why the bottom left of the keyboard has shift, control, option, and command in the usual spaces. Further, some common shortcuts I press have a key on the right side of the keyboard. These shortcuts include:
-
-- Empty Trash Without Asking for Confirmation (⇧⌥⌘⌫)
-
-⇧⌥⌘⌫, when you press the backspace on the right half of the keyboard, is much more satisfying than if you curl your left hand into a claw to press all the keys on the left. Try both; you’ll agree.
-
-
-## use Emacs-style shortcuts
-
-I press C-a, C-e, and C-k all the time. It’s difficult to press these key combinations with the control key on the bottom left and I’m too quick on the draw for the control function on the / key to work reliably, so the bottommost thumb button on the right side is another control key.
-
-Having trouble remembering which thumb key is alt and which is ctrl? It’s like on the lower right of a normal keyboard — leftmost is alt, rightmost is ctrl.
-
-
-## use spreadsheets
-
-All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. There’s also a colon there for entering times and maybe IPv6 addresses. Not that I expect people to type IPv6 addresses into a spreadsheet, but, y’know.
diff --git a/layouts/community/ergodox/zweihander-osx/rules.mk b/layouts/community/ergodox/zweihander-osx/rules.mk
deleted file mode 100644
index 6e3d088a43..0000000000
--- a/layouts/community/ergodox/zweihander-osx/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don’t do a tricolor wave when the computer is shut down in Windows
-SLEEP_LED_ENABLE = no