From 39011cbe6e67d425e115924d44049dc75372ce7e Mon Sep 17 00:00:00 2001
From: Nicholas Novak <34256932+NickyBoy89@users.noreply.github.com>
Date: Sun, 23 Jun 2024 21:47:49 -0700
Subject: [PATCH] change: Moved some of the command groups around to make more
 sense

---
 .../browser_keybinds.json                     | 174 +++++++++++++++++-
 .../correct_terminal_keybindings.json         |  26 +++
 .../normal_keybinds.json                      | 160 ----------------
 3 files changed, 190 insertions(+), 170 deletions(-)

diff --git a/karabiner/.config/karabiner/assets/complex_modifications/browser_keybinds.json b/karabiner/.config/karabiner/assets/complex_modifications/browser_keybinds.json
index 27c365b..fdc2d69 100644
--- a/karabiner/.config/karabiner/assets/complex_modifications/browser_keybinds.json
+++ b/karabiner/.config/karabiner/assets/complex_modifications/browser_keybinds.json
@@ -3,25 +3,179 @@
   "maintainers": ["nnovak"],
   "rules": [
     {
-      "description": "Remap Control+l to Command+l unless in the terminal",
+      "description": "Remap Ctrl+W to Cmd+W",
       "manipulators": [
         {
-          "conditions": [
-            {
-              "type": "frontmost_application_unless",
-              "bundle_identifiers": ["^net\\.kovidgoyal\\.kitty$"]
-            }
-          ],
           "from": {
-            "key_code": "l",
+            "key_code": "w",
             "modifiers": {
               "mandatory": ["control"]
             }
           },
           "to": [
             {
-              "key_code": "l",
-              "modifiers": ["command"]
+              "key_code": "w",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+T to Cmd+T",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "t",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "t",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+F to Cmd+F",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "f",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "f",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+R to Cmd+R",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "r",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "r",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+A to Cmd+A",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "a",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "a",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+S to Cmd+S",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "s",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "s",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+Slash to Cmd+Slash",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "slash",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "slash",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+X to Cmd+X",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "x",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "x",
+              "modifiers": ["left_command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
+    {
+      "description": "Remap Ctrl+Z to Cmd+Z",
+      "manipulators": [
+        {
+          "from": {
+            "key_code": "z",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "z",
+              "modifiers": ["left_command"]
             }
           ],
           "type": "basic"
diff --git a/karabiner/.config/karabiner/assets/complex_modifications/correct_terminal_keybindings.json b/karabiner/.config/karabiner/assets/complex_modifications/correct_terminal_keybindings.json
index 00dfa45..fe7a161 100644
--- a/karabiner/.config/karabiner/assets/complex_modifications/correct_terminal_keybindings.json
+++ b/karabiner/.config/karabiner/assets/complex_modifications/correct_terminal_keybindings.json
@@ -54,6 +54,32 @@
         }
       ]
     },
+    {
+      "description": "Remap Control+l to Command+l unless in the terminal",
+      "manipulators": [
+        {
+          "conditions": [
+            {
+              "type": "frontmost_application_unless",
+              "bundle_identifiers": ["^net\\.kovidgoyal\\.kitty$"]
+            }
+          ],
+          "from": {
+            "key_code": "l",
+            "modifiers": {
+              "mandatory": ["control"]
+            }
+          },
+          "to": [
+            {
+              "key_code": "l",
+              "modifiers": ["command"]
+            }
+          ],
+          "type": "basic"
+        }
+      ]
+    },
     {
       "description": "Remap Alt+Left/Right unless in terminal",
       "manipulators": [
diff --git a/karabiner/.config/karabiner/assets/complex_modifications/normal_keybinds.json b/karabiner/.config/karabiner/assets/complex_modifications/normal_keybinds.json
index f4ac616..71a06f0 100644
--- a/karabiner/.config/karabiner/assets/complex_modifications/normal_keybinds.json
+++ b/karabiner/.config/karabiner/assets/complex_modifications/normal_keybinds.json
@@ -2,101 +2,6 @@
   "title": "More Normal Keybindings",
   "maintainers": ["nnovak"],
   "rules": [
-    {
-      "description": "Basic browser keybindings",
-      "manipulators": [
-        {
-          "from": {
-            "key_code": "w",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "w",
-              "modifiers": ["left_command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "t",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "t",
-              "modifiers": ["left_command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "f",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "f",
-              "modifiers": ["left_command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "r",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "r",
-              "modifiers": ["left_command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "t",
-            "modifiers": {
-              "mandatory": ["control", "shift"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "t",
-              "modifiers": ["left_command", "shift"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "a",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "a",
-              "modifiers": ["left_command"]
-            }
-          ],
-          "type": "basic"
-        }
-      ]
-    },
     {
       "description": "Hold down the super key to show open windows",
       "manipulators": [
@@ -259,71 +164,6 @@
           "type": "basic"
         }
       ]
-    },
-    {
-      "description": "Simple Command to Control Mappings",
-      "manipulators": [
-        {
-          "from": {
-            "key_code": "s",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "s",
-              "modifiers": ["command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "slash",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "slash",
-              "modifiers": ["command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "x",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "x",
-              "modifiers": ["command"]
-            }
-          ],
-          "type": "basic"
-        },
-        {
-          "from": {
-            "key_code": "z",
-            "modifiers": {
-              "mandatory": ["control"]
-            }
-          },
-          "to": [
-            {
-              "key_code": "z",
-              "modifiers": ["command"]
-            }
-          ],
-          "type": "basic"
-        }
-      ]
     }
   ]
 }