Merge branch 'main' into ghostty-nvim_lsp-solo_zsh

1. Add ghostty config
2. Revise the nvim-lsp config to remedy deprecation warnings
3. Add back solo.zsh with enhancements

alacritty/alacritty.toml

@@ -19,8 +19,3 @@ lines = 115
 [window.position]
 x = 1550
 y = 0
-
-[keyboard]
-bindings = [
-    { key = "Return", mods = "Shift", chars = "\n" } 
-]

ghostty/config.ghostty

@@ -1,8 +1 @@
 font-family = "FiraCode Nerd Font Mono"
-
-background-opacity = 0.8
-
-command = "/usr/bin/zsh -c 'tmux attach || tmux'"
-initial-command = "/usr/bin/zsh -c 'tmux attach || tmux'"
-
-keybind = shift+enter=text:\n

zsh/merge-main.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash -e
 branch=$(git status|head -1|cut -f3 -d\ )
-git checkout $(git_main_branch)
+git checkout main
 git pull
 git checkout "$branch"
-git merge $(git_main_branch)
+git merge main