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/.zshrc

@@ -41,8 +41,6 @@ alias cdjb='cd $HOME/src/github.com/jbohanon'
 alias cdgh='cd $HOME/src/github.com'
 alias cdo='cd $HOME/Documents/obsidian/work'
 alias nvo='cdo && nvim .'
-alias cddd='cd $HOME/src/github.com/AustinRobinson/DrivingDoc'
-alias nvdd='cddd && nvim .'
 
 if [[ $(uname) == Linux ]]; then
   alias pbcopy='xsel --clipboard --input'
@@ -76,4 +74,4 @@ alias sz='source $HOME/.zshrc'
 
 eval "$(starship init zsh)"
 
-# [[ -f "$HOME/.local/share/../bin/env" ]] && . "$HOME/.local/share/../bin/env"
+. "$HOME/.local/share/../bin/env"

zsh/config.d/solo.zsh

@@ -1,5 +1,3 @@
-if [[ -f "$HOME/.work-machine" ]]; then
-
 SOLO_DIR="$HOME/src/github.com/solo-io"
 SOLO_GITHUB="https://github.com/solo-io"
 
@@ -113,21 +111,3 @@ alias nvagwe='cdagwe && nvim_readme'
 alias cdkgw='cd $KGW_DIR/kgateway'
 alias nvkgw='cdkgw && nvim_readme'
 
-alias claude-vertex="CLAUDE_CONFIG_DIR=$HOME/.claude-vertex claude"
-alias claude-license="CLAUDE_CONFIG_DIR=$HOME/.claude-license claude"
-
-export CLAUDE_CONFIG_DIR="$HOME/.claude-license"
-
-function default-claude() {
-    if [[ -z "$1" ]] || ([[ "$1" != "vertex" ]] && [[ "$1" != "license" ]]); then
-        echo "invalid arg; must be 'vertex' or 'license'"
-        return
-    fi
-
-    if [[ "$1" == "vertex" ]]; then
-        export CLAUDE_CONFIG_DIR="$HOME/.claude-vertex"
-    elif [[ "$1" == "license" ]]; then
-        export CLAUDE_CONFIG_DIR="$HOME/.claude-license"
-    fi
-}
-fi

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