From 03bf81533c10c8cb1b85f3ba74454b8b9f86e371 Mon Sep 17 00:00:00 2001
From: "Simon W. Jackson" <github@simonwjackson.io>
Date: Tue, 28 Jan 2025 17:52:23 -0600
Subject: [PATCH] refactor: simplify commands

---
 packages/tmesh/bin/tmesh | 46 +++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/tmesh/bin/tmesh b/packages/tmesh/bin/tmesh
index 481a15e..e3f0ca3 100755
--- a/packages/tmesh/bin/tmesh
+++ b/packages/tmesh/bin/tmesh
@@ -21,38 +21,44 @@ setw -g mode-keys vi
 set -g status off
 '
 
+function tryStartTmeshServerSession() {
+  mosh "$SERVER" -- sh -c "nix run nixpkgs#tmux -- -f <(echo -n \$'$TMESH_DEFAULT_CONFIG') -L ${TMESH_SOCKET}-server new-session -s default -d \"$CMD\"" >/dev/null 2>&1
+}
+
+function tryStartTmeshClientSession() {
+  tmux \
+    -f <(
+      cat <<EOF
+$TMESH_DEFAULT_CONFIG
+EOF
+    ) \
+    -L "$TMESH_SOCKET" \
+    new-session \
+    -s "$SERVER" \
+    -d \
+    mosh "$SERVER" -- sh -c "nix run nixpkgs#tmux -- -L ${TMESH_SOCKET}-server attach-session -t default" >/dev/null 2>&1
+}
+
 tryStartTmesh() {
   # Check if tmesh server session exists
   if ! tmux -L "$TMESH_SOCKET" has-session -t "$SERVER" 2>/dev/null; then
     [[ "${DEBUG:-0}" == "1" ]] && echo "DEBUG: Starting tmesh session" 1>&2
 
-    # Start tmesh server session
-    mosh "$SERVER" -- sh -c "nix run nixpkgs#tmux -- -f <(echo -n \$'$TMESH_DEFAULT_CONFIG') -L ${TMESH_SOCKET}-server new-session -s default -d \"$CMD\"" >/dev/null 2>&1
+    tryStartTmeshServerSession
+    tryStartTmeshClientSession
 
-    # Start tmux client session
-    tmux \
-      -f <(
-        cat <<EOF
-$TMESH_DEFAULT_CONFIG
-EOF
-      ) \
-      -L "$TMESH_SOCKET" \
-      new-session \
-      -s "$SERVER" \
-      -d \
-      `# Attach to tmesh server session` \
-      mosh "$SERVER" -- sh -c "nix run nixpkgs#tmux -- -L ${TMESH_SOCKET}-server attach-session -t default" >/dev/null 2>&1
   else
     [[ "${DEBUG:-0}" == "1" ]] && echo "DEBUG: Session already exists" 1>&2
   fi
 }
 
 tryConnectTmux() {
-  if [[ -z "$TMUX" ]]; then
-    tmux -L "$TMESH_SOCKET" attach-session -t "$SERVER"
-  else
-    tmux -L "$TMESH_SOCKET" switch-client -t "$SERVER"
-  fi
+  tmux -L "$TMESH_SOCKET" attach-session -d -t "$SERVER"
+  # if [[ -z "$TMUX" ]]; then
+  #   tmux -L "$TMESH_SOCKET" attach-session -t "$SERVER"
+  # else
+  #   tmux -L "$TMESH_SOCKET" switch-client -t "$SERVER"
+  # fi
 }
 
 main() {