Merge branch 'main' into feat/darkreader

pqrs-org · Jul 9, 2024 · 11cba16 · 11cba16
2 parents bb74207 + 594ce2d
commit 11cba16
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 6 deletions.
diff --git a/public/json/Tye-Tartarus-v2.json b/public/json/Tye-Tartarus-v2.json
@@ -1,7 +1,7 @@
 {
   "title": "Tye Tartarus v2.json",
   "maintainers": [
-    "tyeraymond-design"
+    "quantum-designer"
   ],
   "rules": [
     {
@@ -108,7 +108,7 @@
       ]
     },
     {
-      "description": "Razer 04 to shift command plus",
+            "description": "Razer 04 to command hyphen",
       "manipulators": [
         {
           "conditions": [
@@ -132,9 +132,8 @@
           },
           "to": [
             {
-              "key_code": "equal_sign",
+              "key_code": "hyphen",
               "modifiers": [
-                "left_shift",
                 "left_command"
               ]
             }

diff --git a/public/json/nightfall_toggle.json b/public/json/nightfall_toggle.json
@@ -0,0 +1,26 @@
+{
+  "title": "Nightfall Dark Mode Toggle",
+  "rules": [
+    {
+      "description": "Change F7 to Ctrl+Cmd+Opt+T (toggle dark mode from Nightfall)",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "f7"
+          },
+          "to": [
+            {
+              "key_code": "t",
+              "modifiers": [
+                "left_control",
+                "left_command",
+                "left_option"
+              ]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    }
+  ]
+}
diff --git a/public/json/personal_tekezo.json b/public/json/personal_tekezo.json
@@ -5,7 +5,7 @@
   ],
   "rules": [
     {
-      "description": "Personal rules (@tekezo) (rev 51)",
+      "description": "Personal rules (@tekezo) (rev 52)",
       "available_since": "14.12.6",
       "manipulators": [
         {
@@ -405,6 +405,32 @@
             }
           ]
         },
+        {
+          "type": "basic",
+          "from": {
+            "simultaneous": [
+              {
+                "pointing_button": "button1"
+              },
+              {
+                "pointing_button": "button2"
+              }
+            ],
+            "simultaneous_options": {
+              "key_up_when": "all"
+            },
+            "modifiers": {
+              "optional": [
+                "any"
+              ]
+            }
+          },
+          "to": [
+            {
+              "pointing_button": "button3"
+            }
+          ]
+        },
         {
           "type": "basic",
           "from": {

diff --git a/src/json/personal_tekezo.json.js b/src/json/personal_tekezo.json.js
@@ -10,7 +10,7 @@ function main() {
         maintainers: ['tekezo'],
         rules: [
           {
-            description: 'Personal rules (@tekezo) (rev 51)',
+            description: 'Personal rules (@tekezo) (rev 52)',
             available_since: '14.12.6',
             manipulators: [].concat(
               coreConfiguration(),
@@ -390,6 +390,32 @@ function emacs() {
 
 function mouse() {
   const result = [
+    // simultaneous button1 + button2 => button3
+    {
+      type: 'basic',
+      from: {
+        simultaneous: [
+          {
+            pointing_button: 'button1',
+          },
+          {
+            pointing_button: 'button2',
+          },
+        ],
+        simultaneous_options: {
+          key_up_when: 'all',
+        },
+        modifiers: {
+          optional: ['any'],
+        },
+      },
+      to: [
+        {
+          pointing_button: 'button3',
+        },
+      ],
+    },
+
     // mouse_motion_to_scroll (button5)
     {
       type: 'basic',