Use difftastic, apply java set home

diff --git a/config/karabiner/karabiner.json b/config/karabiner/karabiner.json
index e8977b3c67e1f1511d479962f957dc139c629f8d..bb0f69c9226b6d824eec956c91f227e41557f81d 100644 (file)
--- a/config/karabiner/karabiner.json
+++ b/config/karabiner/karabiner.json
@@ -95,8 +95,7 @@
                     },
                     "ignore": false,
                     "manipulate_caps_lock_led": false,
                     },
                     "ignore": false,
                     "manipulate_caps_lock_led": false,

-                    "simple_modifications": [],
-                    "treat_as_built_in_keyboard": false
+                    "simple_modifications": []

                 },
                 {
                     "disable_built_in_keyboard_if_exists": false,
                 },
                 {
                     "disable_built_in_keyboard_if_exists": false,


@@ -112,40 +111,38 @@
                     "simple_modifications": [
                         {
                             "from": {
                     "simple_modifications": [
                         {
                             "from": {

-                                "key_code": "non_us_backslash"
+                                "key_code": "grave_accent_and_tilde"

                             },
                             "to": [
                                 {
                             },
                             "to": [
                                 {

-                                    "key_code": "grave_accent_and_tilde"
+                                    "key_code": "non_us_backslash"

                                 }
                             ]
                         },
                         {
                             "from": {
                                 }
                             ]
                         },
                         {
                             "from": {

-                                "key_code": "grave_accent_and_tilde"
+                                "key_code": "non_us_backslash"

                             },
                             "to": [
                                 {
                             },
                             "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": {
                 },
                 {
                     "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": [
                 }
             ],
             "fn_function_keys": [

diff --git a/gitconfig b/gitconfig
index 712e4dff7df94afbc50c82851dca402d5dd4f8d2..fb57ba11c5370eedccef07d7f6bdc398dd15f8f6 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -19,3 +19,5 @@
        gpgsign = true
 [init]
        defaultBranch = main
        gpgsign = true
 [init]
        defaultBranch = main

+[diff]
+    external = difft

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 9555055dc9c9b56dcaa2f9063c18e698644aa14c..3326b10767168b32a38b2e8e24b974ec021944be 100644 (file)
--- 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
 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