[pull] master from pqrs-org:master

.vscode/settings.json

@@ -6,7 +6,7 @@
         "**/dist/js/": true,
         "public/css/": true,
         "public/js/": true,
-        "src/vuejs/app/dist/": true,
-        "src/vuejs/app/public/": true
+        "src/vuejs/dist/": true,
+        "src/vuejs/public/": true
     }
 }

public/extra_descriptions/Vi_and_other_Workman.html

@@ -0,0 +1,2 @@
+
+Edit some key for Workman keyboard layout.

public/extra_descriptions/capslock_vim_movements.html

@@ -0,0 +1,68 @@
+<link rel="stylesheet" href="../../vendor/css/bootstrap.min.css" />
+
+<h4>Caps Lock Vim Movements</h4>
+
+<p>Simulate Vim movements with caps lock as the main modifier.</p>
+
+<h5>Motivation</h5>
+
+<p>After trying a few different rules, they were too complicated and the feature
+set ended up not combining well with native MacOS modifiers.</p>
+
+<p>The objectives of this rule set are:</p>
+
+<ul>
+  <li>Home-row caps lock engagement.</li>
+  <li>No modifier overrides so OS defaults continue to work.</li>
+  <li>Do not map keys that OS (MacOS) already support; i.e. Home can be achieved with Command + Caps + K.</li>
+</ul>
+
+<h5>Key Map</h5>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th scope="col">Key</th>
+      <th scope="col">Maps To</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Caps lock</td>
+      <td>Escape</td>
+    </tr>
+    <tr>
+      <td>Caps lock + Return</td>
+      <td>Caps lock</td>
+    </tr>
+    <tr>
+      <td>Caps lock + H</td>
+      <td>Left arrow</td>
+    </tr>
+    <tr>
+      <td>Caps lock + J</td>
+      <td>Down arrow</td>
+    </tr>
+    <tr>
+      <td>Caps lock + K</td>
+      <td>Up arrow</td>
+    </tr>
+    <tr>
+      <td>Caps lock + L</td>
+      <td>Right arrow</td>
+    </tr>
+    <tr>
+      <td>Caps lock + D</td>
+      <td>Page Down</td>
+    </tr>
+    <tr>
+      <td>Caps lock + U</td>
+      <td>Page Up</td>
+    </tr>
+  </tbody>
+</table>
+
+<h5>Credits</h5>
+
+<p>This rule was largely based on work done by "CAPS LOCK: Converts 'jkl;' to
+arrow keys, and 'spacebar' to a shift+opt modifier for easy text selection".</p>

public/extra_descriptions/german_programming.json.html

@@ -22,7 +22,7 @@
     <td>[</td>
   </tr>
   <tr>
-    <td>Left Command+#</td>
+    <td>Left Command+ä</td>
     <td>]</td>
   </tr>
   <tr>

public/extra_descriptions/keychron-k6-shortcuts.json.html

@@ -0,0 +1,18 @@
+<link rel="stylesheet" href="../../vendor/css/bootstrap.min.css" />
+
+<h2>Keychron K6 Shortcuts</h2>
+
+<p>This rule adds shortcuts to Keychron K6 to follow established muscle memory for window switching from a 100% layout</p>
+
+<p>It also adds some extra mac specific shortcuts on less frequently used keys: Home, Page up, Page down</p>
+
+<ul>
+  <li><kbd>Esc</kbd> &rarr; Escape</li>
+  <li><kbd>Shift</kbd> + <kbd>Esc</kbd> &rarr; <kbd>`</kbd> (grave)</li>
+  <li><kbd>Control</kbd> + <kbd>Esc</kbd> &rarr; <kbd>~</kbd> (tilda)</li>
+  <li><kbd>Command</kbd> + <kbd>Esc</kbd> &rarr; (Cycle through the current application's windows)</li>
+
+  <li><kbd>Home</kbd> &rarr; <em>Show Desktop</em></li>
+  <li><kbd>Page Up</kbd> &rarr; <em>Spotlight</em></li>
+  <li><kbd>Page Down</kbd> &rarr; <em>Mission Control</em></li>
+</ul>

public/extra_descriptions/logitech-g502-hero-shortcuts.json.html

@@ -0,0 +1,18 @@
+<link rel="stylesheet" href="../../vendor/css/bootstrap.min.css" />
+
+<h2>Logitech G502 Hero Mouse Shortcuts</h2>
+
+<p>This rule adds shortcuts to Logitech G502 Hero Mouse to replace Logitech GHub's common controls</p>
+
+<ul>
+  <li><kbd>Button3</kbd> (Middle Mouse Button) &rarr; Mission Control</li>
+  <li><kbd>G4</kbd> &rarr; <kbd>&larr;</kbd> (Left Arrow)</li>
+  <li><kbd>G5</kbd> &rarr; <kbd>&rarr;</kbd> (Right Arrow)</li>
+</ul>
+
+<kbd>G4</kbd> and <kbd>G5</kbd> also support any modifiers so following options are possible:
+
+<ul>
+  <li><kbd>G4</kbd> + <kbd>Control</kbd> &rarr; Previous Workspace</li>
+  <li><kbd>G5</kbd> + <kbd>Control</kbd> &rarr; Next Workspace</li>
+</ul>

public/extra_descriptions/neo2.json.html

@@ -0,0 +1,52 @@
+<link rel="stylesheet" href="../../vendor/css/bootstrap.min.css" />
+
+<h2>Neo2 layout</h3>
+<p>Rules for the <a href="http://neo-layout.org/" target="_blank">Neo2 keyboard layout</a>.</p>
+<p>Intended to be used with the <a href="https://github.com/jgosmann/neo2-layout-osx" target="_blank">corresponding keyboard layout file</a>.</p>
+
+<h3>Base rules</h3>
+<table class="table">
+  <tr>
+    <td>Neo2 layer 4</td>
+    <td>Base rule for activating layer 4.</td>
+  </tr>
+  <tr>
+    <td>Neo2 layer 6</td>
+    <td>Base rule for activating layer 6.</td>
+  <tr>
+    <td>Neo2 mod 3 and 4 keys (Apple keyboard). Toggle mod4 by pressing both mod4 keys simultaneously.</td>
+    <td><p>Toggle <code>mod4</code> by pressing both mod4 keys simultaneously.</p><p>Take this rule if you are using your Mac with a common Apple keyboard.</p></td>
+  </tr>
+  <tr>
+    <td>Neo2 mod 3 and 4 keys (Windows keyboard). Toggle mod4 by pressing both mod4 keys simultaneously.</td>
+    <td><p>Toggle <code>mod4</code> by pressing both mod4 keys simultaneously.</p><p>Take this rule if you are using your Mac with a Windows keyboard or with the Apple Magic Keyboard with Numeric Keypad.</p></td>
+  </tr>
+</table>
+
+<h3>Extension rules</h3>
+<table class="table">
+  <tr>
+    <td>Neo2 mod 4: Map ↖ to Home and ↘︎ to End in terminal apps.</td>
+    <td>
+        <p>This extra-rule lets you jump to the beginning and the end of a line in your terminal using <code>↖</code> and <code>↘︎</code> on layer 4. More precisely, it maps <code>mod4</code>+<code>a</code> to <code>Home</code> and <code>mod4</code>+<code>g</code> to <code>End</code> in the following terminal apps: macOS Terminal, iTerm2, Hyper, alacritty, kitty.</p>
+        <p>Make sure to move this rule <em>above</em> the rule 'Neo2 layer 4' in the Karabiner-Elements preferences.</p>
+        <p>In case you use the macOS Terminal: You need to perform an additional configuration step in the macOS Terminal preferences: Go to 'Terminal' -> 'Preferences' -> 'Profiles' -> 'Keyboard' and add the following two entries: Key: ↖ Action: \033OH and Key: ↘︎ Action: \033OF.</p>
+    </td>
+  </tr>
+  <tr>
+    <td>Toggle caps_lock by pressing left_shift + right_shift at the same time</td>
+    <td>Toggle <code>caps_lock</code> by pressing <code>left_shift</code> + <code>right_shift</code> at the same time.</td>
+  </tr>
+  <tr>
+    <td>Tab acts as Ctrl if pressed with another key</td>
+    <td><code>Tab</code> acts as <code>Ctrl</code> if pressed with another key. If pressed alone, it acts as usual.</td>
+  </tr>
+  <tr>
+    <td>Prevent problematic keys (?, /, #, =, and ')') from being treated as option key shortcut</td>
+    <td>This rule serves as a workaround for issues that layer 3 could cause in some applications. See <a href="https://github.com/jgosmann/neo2-layout-osx#know-issues" target="_blank">known issues</a> for more information.</td>
+  </tr>
+  <tr>
+    <td>Prevent all layer 3 keys from being treated as option key shortcut</td>
+    <td>This rule serves as a workaround for issues that layer 3 could cause in some applications. See <a href="https://github.com/jgosmann/neo2-layout-osx#know-issues" target="_blank">known issues</a> for more information.</td>
+  </tr>
+</dl>