Fixed tmux loading on startup issue, also loads $HOME automatically

3 files changed, 14 insertions, 8 deletions

diff --git a/.zshrc b/.zshrc
index af7fb03..eb23f87 100644
--- a/.zshrc
+++ b/.zshrc
@@ -99,10 +99,10 @@ if [ ! -f "$MARKER_FILE" ]; then
   touch "$MARKER_FILE"
 fi
 
-# Open tmux if it's not open
-# if [ -z "$TMUX" ]; then
-#     tmux a || tmux
-# fi
+# Open tmux in default user session if it's not open
+if [ -z "$TMUX" ]; then
+    tms $HOME
+fi
 
 END_TIME=$(date +%s.%4N)
 echo "Zsh startup time: $(echo "${END_TIME} - ${START_TIME}" | bc) seconds"
diff --git a/scripts/tms b/scripts/tms
index 97407cb..1bab0d4 100755
--- a/scripts/tms
+++ b/scripts/tms
@@ -14,9 +14,8 @@ selected_name=$(basename "$selected" | tr . _)
 tmux_running=$(pgrep tmux)
 
 if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then
-    tmux new-session -s $selected_name -c $selected
+    tmux new-session -ds $selected_name -c $selected
     tmux-session-setup $selected_name $selected
-    exit 0
 fi
 
 if ! tmux has-session -t=$selected_name 2> /dev/null; then
@@ -24,4 +23,8 @@ if ! tmux has-session -t=$selected_name 2> /dev/null; then
     tmux-session-setup $selected_name $selected
 fi
 
-tmux switch-client -t $selected_name
+if [[ -z $TMUX ]]; then
+  tmux attach-session -t $selected_name
+else
+  tmux switch-client -t $selected_name
+fi
diff --git a/scripts/tmux-session-setup b/scripts/tmux-session-setup
index 835e2c5..be51ad6 100755
--- a/scripts/tmux-session-setup
+++ b/scripts/tmux-session-setup
@@ -3,7 +3,10 @@
 sess=$1
 dir=$2
 
-if [ "$sess" = "eko" ]; then
+if [ "$dir" = "$HOME" ]; then
+  tmux rename-window -t $sess:1 main
+  tmux send-keys -t $sess:main.1 "fastfetch" C-m
+elif [ "$sess" = "eko" ]; then
   tmux rename-window -t $sess:1 editor
   tmux send-keys -t $sess:editor.1 "vim" C-m