machineconfig 6.83__tar.gz → 6.84__tar.gz

{machineconfig-6.83/src/machineconfig.egg-info → machineconfig-6.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.83
+Version: 6.84
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.83 → machineconfig-6.84}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.83"
+version = "6.84"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -70,6 +70,7 @@ croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg:main"
+terminal = "machineconfig.scripts.python.terminal:main"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/linux/mcfgs

@@ -25,7 +25,7 @@ mcfg "$@"
 
 if [[ -f "$OP_PROGRAM_PATH" ]]; then
   printf "%b\n" "${GREEN}✅ Found op program:${RESET} ${OP_PROGRAM_PATH}"
-  bat "$OP_PROGRAM_PATH"
+  bat --style=plain --paging=never "$OP_PROGRAM_PATH"
   printf "%b\n" "${GREEN}▶ Running...${RESET}"
   . "$OP_PROGRAM_PATH"
   status=$?

machineconfig-6.84/src/machineconfig/scripts/linux/term

@@ -0,0 +1,39 @@
+
+#!/usr/bin/env bash
+set -euo pipefail
+
+RANDOM_NAME=$(date +%s%N | sha256sum | head -c 16)
+OP_DIR="$HOME/tmp_results/tmp_scripts/machineconfig"
+OP_PROGRAM_PATH="$OP_DIR/${RANDOM_NAME}.sh"
+export OP_PROGRAM_PATH
+
+# ANSI color/style codes
+BOLD="\033[1m"
+RESET="\033[0m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+BLUE="\033[34m"
+RED="\033[31m"
+
+timestamp=$(date -u +"%Y-%m-%d %H:%M:%SZ")
+
+printf "%b\n" "${BOLD}${BLUE}🛠️  terminal — running term${RESET}"
+printf "%b\n" "${BLUE}Timestamp:${RESET} ${timestamp}"
+printf "%b\n" "${BLUE}Op program path:${RESET} ${OP_PROGRAM_PATH}"
+
+terminal "$@"
+
+if [[ -f "$OP_PROGRAM_PATH" ]]; then
+  printf "%b\n" "${GREEN}✅ Found op program:${RESET} ${OP_PROGRAM_PATH}"
+  bat --style=plain --paging=never "$OP_PROGRAM_PATH"
+  printf "%b\n" "${GREEN}▶ Running...${RESET}"
+  . "$OP_PROGRAM_PATH"
+  status=$?
+  if [[ $status -eq 0 ]]; then
+    printf "%b\n" "${GREEN}✅ Completed successfully (exit ${status})${RESET}"
+  else
+    printf "%b\n" "${YELLOW}⚠️  Program exited with status ${status}${RESET}"
+  fi
+else
+  printf "%b\n" "${YELLOW}⚠️  No op program found at: ${OP_PROGRAM_PATH}${RESET}"
+fi

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.83",
+#     "machineconfig>=6.84",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.83")
+        uv_with.append("machineconfig>=6.84")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -41,9 +41,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.83" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.84" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.83" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.84" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,7 +68,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.83,textual" """
+    else: executable = """--with "machineconfig>=6.84,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.83"]
+        uv_with = ["machineconfig>=6.84"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.83" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.84" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

machineconfig-6.84/src/machineconfig/scripts/python/terminal.py

@@ -0,0 +1,81 @@
+import subprocess
+import typer
+from typing import Annotated
+
+
+def strip_ansi_codes(text: str) -> str:
+    """Remove ANSI color codes from text."""
+    import re
+    return re.sub(r'\x1b\[[0-9;]*[a-zA-Z]', '', text)
+
+
+def choose_zellij_session():
+    cmd = "zellij list-sessions"
+    sessions: list[str] = subprocess.check_output(cmd, shell=True).decode().strip().split("\n")
+    sessions.sort(key=lambda s: "EXITED" in s)
+    if "current" in sessions:
+        print("Already in a Zellij session, avoiding nesting and exiting.")
+        raise typer.Exit()
+    if len(sessions) == 0:
+        print("No Zellij sessions found, creating a new one.")
+        result = """zellij --layout st2"""
+    elif len(sessions) == 1:
+        session = sessions[0].split(" [Created")[0]
+        print(f"Only one Zellij session found: {session}, attaching to it.")
+        result = f"zellij attach {session}"
+    else:
+        from machineconfig.utils.options import choose_from_options
+        session = choose_from_options(msg="Choose a Zellij session to attach to:", multi=False, options=sessions, fzf=True)
+        session = session.split(" [Created")[0]
+        result = f"zellij attach {session}"
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(result, strict=True)
+
+
+def new_zellij_session(kill_all: Annotated[bool, typer.Option("--kill-all", "-k", help="Kill all existing Zellij sessions before creating a new one.", show_default=True)] = False):
+    cmd = """
+zellij --layout st2
+"""
+    if kill_all:
+        cmd = f"""zellij kill-sessions
+{cmd}"""
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(cmd, strict=True)
+
+
+def get_session_tabs() -> list[tuple[str, str]]:
+    cmd = "zellij list-sessions"
+    sessions: list[str] = subprocess.check_output(cmd, shell=True).decode().strip().split("\n")
+    sessions = [strip_ansi_codes(s) for s in sessions]
+    active_sessions = [s for s in sessions if "EXITED" not in s]
+    result: list[tuple[str, str]] = []
+    for session_line in active_sessions:
+        session_name = session_line.split(" [Created")[0].strip()
+        # Query tab names for the session
+        tab_cmd = f"zellij  --session {session_name} action query-tab-names"
+        try:
+            tabs: list[str] = subprocess.check_output(tab_cmd, shell=True).decode().strip().split("\n")
+            for tab in tabs:
+                if tab.strip():
+                    result.append((session_name, tab.strip()))
+        except subprocess.CalledProcessError:
+            # Skip if query fails
+            continue
+    print(result)
+    return result
+
+
+def main():
+    app = typer.Typer(help="🖥️ Terminal utilities", no_args_is_help=True, add_help_option=False)
+    app.command(name="choose-zellij-session", no_args_is_help=False, help="[c] Choose a Zellij session to attach to")(choose_zellij_session)
+    app.command(name="c", hidden=True, no_args_is_help=False, help="[c] Choose a Zellij session to attach to")(choose_zellij_session)
+    app.command(name="new-zellij-session", no_args_is_help=False, help="[n] new zellij session.")(new_zellij_session)
+    app.command(name="n", hidden=True, no_args_is_help=False, help="[n] new zellij session.")(new_zellij_session)
+
+    app.command(name="get-session-tabs", no_args_is_help=False, help="Get all Zellij session tabs.")(get_session_tabs)
+    app.command(name="gst", hidden=True, no_args_is_help=False, help="Get all Zellij session tabs.")(get_session_tabs)
+    app()
+
+
+if __name__ == "__main__":
+    main()

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.83" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.84" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/settings/shells/bash/init.sh

@@ -53,6 +53,8 @@ alias ff=ftpx
 alias f=fire
 alias r=croshell
 alias u=utils
+alias t=term
+
 
 # alias gcs='gh copilot suggest -t shell'
 # alias gcg='gh copilot suggest -t git'

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -39,6 +39,7 @@ function ff { ftpx @args }
 function f { fire @args }
 function rr { croshell @args }
 function u { utils @args }
+function t { terminal @args }
 
 # try {
 #     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.83" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.84" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"
@@ -11,4 +11,5 @@ alias ff="mcfg ftpx"
 alias f="mcfg fire"
 alias rr="mcfg croshell"
 alias u="mcfg utils"
+alias t="mcfg terminal"
 echo "mcfg command is now defined in this shell session."

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.83" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.84" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
@@ -12,4 +12,5 @@ function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
 function rr { mcfg croshell @args }
 function u { mcfg utils @args }
+function t { mcfg terminal @args }
 Write-Host "mcfg command aliases are now defined in this PowerShell session."

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/utils/code.py

@@ -103,9 +103,11 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     return proc
 
 
-def exit_then_run_shell_script(script: str):
+def exit_then_run_shell_script(script: str, strict: bool = False):
     import os
     op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
+    if strict and op_program_path is None:
+        raise ValueError("OP_PROGRAM_PATH environment variable is not set in strict mode.")
     if op_program_path is not None:
         op_program_path = Path(op_program_path)
         op_program_path.parent.mkdir(parents=True, exist_ok=True)

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/utils/options.py

@@ -4,7 +4,14 @@ from rich.text import Text
 from rich.panel import Panel
 from rich.console import Console
 import subprocess
-from typing import Optional, Union, Iterable, overload, Literal
+from typing import Optional, Union, Iterable, overload, Literal, cast
+
+
+# def strip_ansi_codes(text: str) -> str:
+#     """Remove ANSI color codes from text."""
+#     import re
+#     return re.sub(r'\x1b\[[0-9;]*[a-zA-Z]', '', text)
+
 
 @overload
 def choose_from_options[T](msg: str, options: Iterable[T], multi: Literal[False], custom_input: bool = False, header: str = "", tail: str = "", prompt: str = "", default: Optional[T] = None, fzf: bool = False) -> T: ...
@@ -22,17 +29,20 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_i
         from pyfzf.pyfzf import FzfPrompt
         fzf_prompt = FzfPrompt()
         nl = "\n"
-        choice_string_multi: list[str] = fzf_prompt.prompt(choices=options_strings, fzf_options=("--multi" if multi else "") + f' --prompt "{prompt.replace(nl, " ")}" ')  # --border-label={msg.replace(nl, ' ')}")
+        choice_string_multi: list[str] = fzf_prompt.prompt(choices=options_strings, fzf_options=("--multi" if multi else "") + f' --prompt "{prompt.replace(nl, " ")}" --ansi')  # --border-label={msg.replace(nl, ' ')}")
         # --border=rounded doens't work on older versions of fzf installed at Ubuntu 20.04
         if not multi:
             try:
                 choice_one_string = choice_string_multi[0]
+                if isinstance(list(options)[0], str): return cast(T, choice_one_string)
                 choice_idx = options_strings.index(choice_one_string)
                 return list(options)[choice_idx]
             except IndexError as ie:
                 print(f"❌ Error: {options=}, {choice_string_multi=}")
                 print(f"🔍 Available choices: {choice_string_multi}")
                 raise ie
+        if isinstance(list(options)[0], str):
+            return cast(list[T], choice_string_multi)
         choice_idx_s = [options_strings.index(x) for x in choice_string_multi]
         return [list(options)[x] for x in choice_idx_s]
     else:

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.83"
+MACHINECONFIG_VERSION = "machineconfig>=6.84"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.83 → machineconfig-6.84/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.83
+Version: 6.84
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig.egg-info/SOURCES.txt

@@ -117,11 +117,10 @@ src/machineconfig/scripts/linux/fzfg
 src/machineconfig/scripts/linux/fzfrga
 src/machineconfig/scripts/linux/mcfgs
 src/machineconfig/scripts/linux/skrg
+src/machineconfig/scripts/linux/term
 src/machineconfig/scripts/linux/warp-cli.sh
-src/machineconfig/scripts/linux/z_ls
 src/machineconfig/scripts/linux/other/share_cloud.sh
 src/machineconfig/scripts/linux/other/share_nfs
-src/machineconfig/scripts/linux/other/share_smb
 src/machineconfig/scripts/linux/other/start_docker
 src/machineconfig/scripts/linux/other/switch_ip
 src/machineconfig/scripts/python/__init__.py
@@ -135,6 +134,7 @@ src/machineconfig/scripts/python/ftpx.py
 src/machineconfig/scripts/python/interactive.py
 src/machineconfig/scripts/python/mcfg.py
 src/machineconfig/scripts/python/sessions.py
+src/machineconfig/scripts/python/terminal.py
 src/machineconfig/scripts/python/utils.py
 src/machineconfig/scripts/python/ai/__init__.py
 src/machineconfig/scripts/python/ai/generate_files.py
@@ -262,6 +262,7 @@ src/machineconfig/scripts/windows/fzfb.ps1
 src/machineconfig/scripts/windows/fzfg.ps1
 src/machineconfig/scripts/windows/fzfrga.bat
 src/machineconfig/scripts/windows/mcfgs.ps1
+src/machineconfig/scripts/windows/term.ps1
 src/machineconfig/scripts/windows/mounts/mount_nfs.ps1
 src/machineconfig/scripts/windows/mounts/mount_nw.ps1
 src/machineconfig/scripts/windows/mounts/mount_smb.ps1

{machineconfig-6.83 → machineconfig-6.84}/src/machineconfig.egg-info/entry_points.txt

@@ -7,4 +7,5 @@ fire = machineconfig.scripts.python.fire_jobs:main
 ftpx = machineconfig.scripts.python.ftpx:main
 mcfg = machineconfig.scripts.python.mcfg:main
 sessions = machineconfig.scripts.python.sessions:main
+terminal = machineconfig.scripts.python.terminal:main
 utils = machineconfig.scripts.python.utils:main

machineconfig-6.83/src/machineconfig/scripts/linux/other/share_smb

@@ -1 +0,0 @@
-#!/usr/bin/env bash

machineconfig-6.83/src/machineconfig/scripts/linux/z_ls

@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-
-# if variable zellij is not set, then set it to /$HOME/.local/bin/zellij
-if [ -z "$zellij" ]; then
-  # zellij="$HOME/.local/bin/zellij"
-  PATH="$HOME/.local/bin:$PATH"
-fi
-
-# adopted from https://zellij.dev/documentation/integration.html
-ZJ_SESSIONS=$(zellij list-sessions)
-# echo "$ZJ_SESSIONS"
-
-
-attach=false
-
-while (( "$#" )); do
-  case "$1" in
-    --attach)
-      attach=true
-      shift
-      ;;
-    *)
-      shift
-      ;;
-  esac
-done
-
-if $attach; then
-  echo "attached"
-fi
-
-
-NO_SESSIONS=$(echo "${ZJ_SESSIONS}" | wc -l)
-# if ZJ_SESSIONS is empty, then set NO_SESSIONS to 0
-if [ -z "${ZJ_SESSIONS}" ]; then
-    NO_SESSIONS=0
-fi
-
-# check whether the string "(current)" is in ZJ_SESSIONS
-if [[ "${ZJ_SESSIONS}" == *"(current)"* ]]; then
-    # if so, then we are in a zellijsession
-    echo "already inside a session, existing."
-    COMMANDS=$(ls $HOME/.config/machineconfig/settings/zellij/commands)
-    # fzf the results
-    res="$(echo -e "${COMMANDS}" | fzf --ansi)"
-    # run the bash fiZJ_SESSIONSle chosen
-    bash $HOME/.config/machineconfig/settings/zellij/commands/$res
-
-else # ==> we are not in a zellijsession
-  if [ "${NO_SESSIONS}" -ge 1 ]; then  # sessions do exist
-
-      # remove sessions that have 'EXITED' in them
-      ZJ_SESSIONS=$(echo -e "${ZJ_SESSIONS}" | grep -v "EXITED")
-
-      echo "zj_sessions:$ZJ_SESSIONS:end of zj_sessions"
-
-      # if the result has only 1 line in it and $attach is raised, then attach to it and exit the if statement and the script
-      NO_SESSIONS=$(echo "${ZJ_SESSIONS}" | wc -l)
-
-      echo "NO_SESSIONS: $NO_SESSIONS"
-
-      # if ZJ_SESSIONS is empty, then set NO_SESSIONS to 0
-      if [ -z "${ZJ_SESSIONS}" ]; then
-          NO_SESSIONS=0
-          zellij --layout st2
-          exit 0
-      fi
-      echo "NO_SESSIONS: $NO_SESSIONS"
-
-      if [ "${NO_SESSIONS}" -eq 1 ] && $attach; then
-        chosen_session=$(echo -e "${ZJ_SESSIONS}" | cut -d' ' -f1)
-        # remove the ansi colors from chosen_session
-        chosen_session=$(echo $chosen_session | sed 's/\x1b\[[0-9;]*m//g')
-        # echo "attaching to $chosen_session exclusively."
-        zellij attach "$chosen_session"
-        exit 0
-      fi
-
-      # add my options to the list of sessions
-      # if number of sessions is zero, then exclude ZJ_SESSIONS from the fzf options
-      if [ "${NO_SESSIONS}" -eq 0 ]; then
-          ZJ_SESSIONS="new_session\nkill_all_and_create_fresh_one\nexit_zellij"
-        else
-          ZJ_SESSIONS="$ZJ_SESSIONS\nnew_session\nkill_all_and_create_fresh_one\nexit_zellij"
-      fi
-
-      res="$(echo -e "${ZJ_SESSIONS}" | fzf --ansi)"
-      # split `res` at the first space, and take the first element
-      res=$(echo $res | cut -d' ' -f1)
-      if [ "${res}" = "exit_zellij" ]; then
-          echo "existing zellij."
-      elif [ "${res}" = "new_session" ]; then
-        zellij --layout st2  # can't specify name here. I can call it "main" only if it is the first, otherwise name conflict! also, can't use attach -c syntax because layout can't be specified.
-      elif [ "${res}" = "kill_all_and_create_fresh_one" ]; then
-        zellij ka -y
-        zellij --layout st2
-      else
-        zellij attach $res # options --mirror-session false
-      fi
-  else  # no sessions, create one called main
-     zellij --layout st2
-  fi
-
-fi