From d3e5e47c01ec3e396dae23a8af088f36b16114c6 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacobbohanon@gmail.com>
Date: Sat, 6 Jun 2026 11:30:21 -0400
Subject: [PATCH] fix the shift+enter

---
 ghostty/config.ghostty | 7 +++++++
 zsh/merge-main.sh      | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ghostty/config.ghostty b/ghostty/config.ghostty
index c59095b..8f03324 100644
--- a/ghostty/config.ghostty
+++ b/ghostty/config.ghostty
@@ -1 +1,8 @@
 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
diff --git a/zsh/merge-main.sh b/zsh/merge-main.sh
index a33a59b..a06676d 100755
--- a/zsh/merge-main.sh
+++ b/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)