From: Ruben Beltran del Rio <redacted>
Date: Mon, 20 Mar 2023 09:03:50 +0000 (+0100)
Subject: Use difftastic, apply java set home
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/2a55fbef3406d4c51c395994d6763db3d20c3693?hp=4c76e4aa979961e49da5e65a47a041a1509ced44

Use difftastic, apply java set home
---

diff --git a/config/karabiner/karabiner.json b/config/karabiner/karabiner.json
index e8977b3..bb0f69c 100644
--- a/config/karabiner/karabiner.json
+++ b/config/karabiner/karabiner.json
@@ -95,8 +95,7 @@
                     },
                     "ignore": false,
                     "manipulate_caps_lock_led": false,
-                    "simple_modifications": [],
-                    "treat_as_built_in_keyboard": false
+                    "simple_modifications": []
                 },
                 {
                     "disable_built_in_keyboard_if_exists": false,
@@ -112,40 +111,38 @@
                     "simple_modifications": [
                         {
                             "from": {
-                                "key_code": "non_us_backslash"
+                                "key_code": "grave_accent_and_tilde"
                             },
                             "to": [
                                 {
-                                    "key_code": "grave_accent_and_tilde"
+                                    "key_code": "non_us_backslash"
                                 }
                             ]
                         },
                         {
                             "from": {
-                                "key_code": "grave_accent_and_tilde"
+                                "key_code": "non_us_backslash"
                             },
                             "to": [
                                 {
-                                    "key_code": "non_us_backslash"
+                                    "key_code": "grave_accent_and_tilde"
                                 }
                             ]
                         }
-                    ],
-                    "treat_as_built_in_keyboard": false
+                    ]
                 },
                 {
                     "disable_built_in_keyboard_if_exists": false,
                     "fn_function_keys": [],
                     "identifiers": {
-                        "is_keyboard": false,
-                        "is_pointing_device": true,
-                        "product_id": 834,
-                        "vendor_id": 1452
+                        "is_keyboard": true,
+                        "is_pointing_device": false,
+                        "product_id": 0,
+                        "vendor_id": 13
                     },
-                    "ignore": true,
-                    "manipulate_caps_lock_led": false,
-                    "simple_modifications": [],
-                    "treat_as_built_in_keyboard": false
+                    "ignore": false,
+                    "manipulate_caps_lock_led": true,
+                    "simple_modifications": []
                 }
             ],
             "fn_function_keys": [
diff --git a/gitconfig b/gitconfig
index 712e4df..fb57ba1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,3 +19,5 @@
 	gpgsign = true
 [init]
 	defaultBranch = main
+[diff]
+    external = difft
diff --git a/runcoms/zshrc b/runcoms/zshrc
index 9555055..3326b10 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -103,3 +103,7 @@ if ! command -v brew &>  /dev/null; then
 else
   . $(brew --prefix asdf)/libexec/asdf.sh
 fi
+
+if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
+  . ~/.asdf/plugins/java/set-java-home.zsh
+fi