From 237637c653db3ce22ecad5c52e800db38d24a9de Mon Sep 17 00:00:00 2001
From: hedy <hedy@tilde.cafe>
Date: Wed, 15 Nov 2023 19:54:29 +0800
Subject: [PATCH] kitty,scripts: Update scripts and track font.conf example for
 MacOS

---
 .config/kitty/kitty.conf    |  8 ++++----
 .config/kitty/mac-font.conf | 16 ++++++++++++++++
 dotscripts/install/misc     |  8 ++++++++
 dotscripts/install/yadm     |  4 ++++
 dotscripts/setup/nvim       | 11 +++++++++--
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 .config/kitty/mac-font.conf

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index c10410b..a2fbb2b 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -7,8 +7,8 @@ include font.conf
 
 # TAB BAR
 # Minimalist:
-# No bg colors, no styling, no fancy unicode. Just the tab index, the title,
-# and the active tab indication.
+# No bg colors, no styling, no fancy unicode. Just the title and the active
+# tab indication.
 tab_bar_style                   separator
 tab_separator                   ""
 tab_bar_edge                    top
@@ -23,8 +23,8 @@ active_tab_title_template       "{fmt.fg._f8f8f2}{fmt.bg.default}{bell_symbol}{a
 active_tab_font_style           bold
 inactive_tab_font_style         normal
 
-# I rarely need this to navigate tabs from within kitty so I'd rather
-# make use of these mappings in the specific TUIs instead.
+# I rarely need this to navigate tabs from within kitty so I'd rather make use
+# of these mappings in the specific TUIs instead.
 map ctrl+tab no_op
 map ctrl+shift+tab no_op
 map ctrl+shift+r no_op
diff --git a/.config/kitty/mac-font.conf b/.config/kitty/mac-font.conf
new file mode 100644
index 0000000..b380b5a
--- /dev/null
+++ b/.config/kitty/mac-font.conf
@@ -0,0 +1,16 @@
+font_size 16.5
+font_family Fira Code Retina
+
+# Use Symbols Only from Nerd Font releases page
+# https://github.com/ryanoasis/nerd-fonts/releases
+# Kitty recommends against patched fonts
+# (I agree since I prefer the original Fira Code Retina.)
+# Kitty picks up the symbols automatically and nvim-web-devicons should work.
+# If not, good luck
+
+# 
+# 
+symbol_map U+ed00 Dotslash-Extras
+symbol_map U+ed01 Dotslash-Extras-Test
+# Nerd Fonts v2.3.3
+symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono
diff --git a/dotscripts/install/misc b/dotscripts/install/misc
index 683bea9..048ede7 100755
--- a/dotscripts/install/misc
+++ b/dotscripts/install/misc
@@ -71,4 +71,12 @@ if ! command -v tig &> /dev/null; then
     cd $prevpwd
 fi
 # TODO: Also upgrade tig
+
+cat <<END
+
+Kitty (optional)
+- Set up fonts.conf, see mac-fonts.conf for an example
+
+END
+
 echo "done!"
diff --git a/dotscripts/install/yadm b/dotscripts/install/yadm
index d19903b..134d22d 100755
--- a/dotscripts/install/yadm
+++ b/dotscripts/install/yadm
@@ -5,9 +5,13 @@ if command -v yadm &> /dev/null; then
         echo "Attempted to upgrade yadm, but it was not installed (as a git clone) at ~/local/src/yadm/."
         exit
     fi
+    echo "> yadm --version"
+    yadm --version
+    echo
     cd ~/local/src/yadm
     git pull
     cd - > /dev/null
+    echo
     echo "Upgraded yadm!"
     echo "> yadm --version"
     yadm --version
diff --git a/dotscripts/setup/nvim b/dotscripts/setup/nvim
index f2d1e3b..b9e3a3c 100755
--- a/dotscripts/setup/nvim
+++ b/dotscripts/setup/nvim
@@ -5,15 +5,22 @@ if ! command -v nvim &> /dev/null; then
     exit
 fi
 
-echo "I no longer use vim-plug. Lazy.nvim is bootstrapped at startup!"
 cat <<END
+I no longer use vim-plug. Lazy.nvim is bootstrapped at startup!
+
 Reminders:
 
+Treesitter:
+- If there are errors for build, might wanna check C/C++ toolchain version
+
 LSP
 - Might need nvm
 - Install clients listed in plugins/lsp.lua
 
-DAP
+Lint (optional)
+- See plugins/lint.lua
+
+DAP (optional)
 - Set up virtualenv named debugpy that installs debugpy, see plugins/dap.lua
 END