Merge branch 'main' of ssh://192.168.10.50:30009/jacob/.dotfiles

ghostty/config.ghostty

@@ -1,3 +1,8 @@
 font-family = "FiraCode Nerd Font Mono"
 
-keybind = shift+return=text:\n
+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 main
+git checkout $(git_main_branch)
 git pull
 git checkout "$branch"
-git merge main
+git merge $(git_main_branch)