add kitty terminal

config/watchman/rules.conf

@@ -11,7 +11,7 @@
 !keepit=~/Library/Group Containers/D75L7R8266.com.reinvented.KeepIt/Keep It/Files
 # ISO-8601 prefixed files are sorted into a subfolder of Life based on the year
 ^(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d).*::!keepit/Life/{year}:
-# Contents in parentheses are comma-separated tag names and removed from the filename
+# Contents in parentheses are comma-separated tag names and are removed from the filename
 (?P<prefix>.*?)\s?\((?P<tags>.*?)\)(?P<suffix>.*):{prefix}{suffix}::{tags}
 # Contents in square brackets are slash-separated folder names in Keep It
 (?P<prefix>.*?)\s?\[(?P<path>.*?)\](?P<suffix>.*):{prefix}{suffix}:!keepit/{path}:

gitconfig

@@ -49,7 +49,7 @@
     cp = cherry-pick -x # grab a change from a branch
 
   # diff
-    d = diff # diff unstaged changes
+    d = difftool --no-symlinks --dir-diff
     dc = diff --cached # diff staged changes
     last = diff HEAD^ # diff last committed change
 
@@ -131,6 +131,15 @@
 [advice]
     statusHints = false
 [diff]
+    tool = kitty
+    guitool = kitty.gui
+[difftool]
+    prompt = false
+    trustExitCode = true
+[difftool "kitty"]
+    cmd = kitty +kitten diff $LOCAL $REMOTE
+[difftool "kitty.gui"]
+    cmd = kitty kitty +kitten diff $LOCAL $REMOTE
   # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
   # instead of a/b/c/d as prefixes for patches
     mnemonicprefix = true

zsh/commands.sh

@@ -17,3 +17,4 @@ which nvim &>/dev/null && alias vim=nvim
 alias b='build'
 alias p='provision'
 alias dk=docker
+which kitty &>/dev/null && alias d="kitty +kitten diff"

zsh/path.sh

@@ -24,7 +24,7 @@ case $(uname -s) in
     Darwin)
         # since /usr/local is managed by homebrew (and it complains about "unmanaged" pkgs, I use $HOME/.local
         BASEPATH="$HOME/homebrew/sbin:$HOME/homebrew/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:"
-        BASEPATH=$(__maybe_append "$BASEPATH" "/opt/X11/bin" "/Library/TeX/texbin" "$HOME/macports/bin" "$HOME/Library/Python/3.7/bin")
+        BASEPATH=$(__maybe_append "$BASEPATH" "/opt/X11/bin" "/Library/TeX/texbin" "$HOME/macports/bin" "$HOME/Library/Python/3.7/bin" "/Applications/kitty.app/Contents/MacOS")
 
         if [ -z "$JAVA_HOME" -a -d /System/Library/Frameworks/JavaVM.framework/Home ]; then
             export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"