From ba2219970e5a55c97821d31a101e88aa632beab7 Mon Sep 17 00:00:00 2001
From: Patrick Kissling <patrick.kissling@de.bosch.com>
Date: Fri, 27 Oct 2023 10:01:28 +0200
Subject: [PATCH] Fix zsh not initialzing properly

---
 alacritty/alacritty.yml | 3 +++
 brew/install.sh         | 2 +-
 tmux/.tmux.conf         | 3 +++
 zsh/.zshrc              | 8 +++++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 71a3e9f..e8fc43d 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -31,3 +31,6 @@ key_bindings:
   - { key: Left,  mods: Alt, chars: "\x1BB" }
   - { key: Left,  mods: Command, chars: "\x1bOH",   mode: AppCursor   } # Home
   - { key: Right, mods: Command, chars: "\x1bOF",   mode: AppCursor   } # End
+
+shell:
+  program: /bin/zsh
diff --git a/brew/install.sh b/brew/install.sh
index 76a2d79..c37db14 100755
--- a/brew/install.sh
+++ b/brew/install.sh
@@ -26,7 +26,7 @@ brew bundle dump --file /tmp/Brewfile.dump --force
 # identify delta (missing packages) and append to Brewfile
 grep --invert-match --line-regexp --file /tmp/Brewfile.concat /tmp/Brewfile.dump >> "${HOME}"/dotfiles/brew/Brewfile."${USAGE}" || true
 
-# sort Brewfiles
+# sort Brewfiles (keep taps on top)
 find "${HOME}"/dotfiles/brew -type f -name "Brewfile*" ! -name "*.lock.json" -print0 | while IFS= read -r -d '' file; do
     {
         grep "^tap" "$file";
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index ee8a5ff..340a548 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -26,5 +26,8 @@ set -g @dracula-show-powerline false
 # set color
 set -g default-terminal "screen-256color"
 
+# set default shell
+set -g default-command /bin/zsh
+
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4b37971..5669871 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -12,18 +12,20 @@ plugins=(
   zoxide
 )
 
+# init zsh
+export ZSH=~/.oh-my-zsh
+source $ZSH/oh-my-zsh.sh
+
 # create new tmux default session
 if [ -z "$TMUX" ]; then
     tmux attach -t default || tmux new -s default\; split-window -h \; split-window -v \; select-pane -t 0 \;
 fi
 
-# zsh
+# configure zsh
 export DISABLE_AUTO_UPDATE=true
 export DISABLE_MAGIC_FUNCTIONS=true
 export HYPHEN_INSENSITIVE=true
-export ZSH=~/.oh-my-zsh
 export ZSH_COMPDUMP=$ZSH/cache/.zcompdump-$HOST
-source $ZSH/oh-my-zsh.sh
 
 # zplug
 export ZPLUG_HOME="${HOMEBREW_PREFIX}"/opt/zplug