machineconfig 6.83__py3-none-any.whl → 6.84__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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.dist-info → machineconfig-6.84.dist-info}/METADATA

@@ -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.dist-info → machineconfig-6.84.dist-info}/RECORD

@@ -106,13 +106,12 @@ machineconfig/scripts/linux/fzfag,sha256=x0rX7vM_YjKLZ822D2Xh0HdaTj5kR_gG3g_5_w6
 machineconfig/scripts/linux/fzffg,sha256=jjeeyFkWmBbwH2taRqC3EOzZep2KR-ZYoI4UI-5kHqg,1090
 machineconfig/scripts/linux/fzfg,sha256=ClGnJZUsIk4y0qs3W5iXGo-nd0FaqAHMsnh8uoXQFy8,1190
 machineconfig/scripts/linux/fzfrga,sha256=xSdws6ae28ZXkkqz_uupZ0MYw_vxE2qpLT2DLS3WITM,460
-machineconfig/scripts/linux/mcfgs,sha256=O47lVLPPK2uRCAdt_Ll87PsukTY_cAGa35ZFdjZEM5w,1150
+machineconfig/scripts/linux/mcfgs,sha256=tjlIG2qEpmx1EuMBYflYcp6GfgiFgSj4OMOD-d94xio,1179
 machineconfig/scripts/linux/skrg,sha256=JgQJGwxaChr148bDnpTB0rrqZMe2o2zGSDA9x_oUhWM,133
+machineconfig/scripts/linux/term,sha256=CNPY8p6SitOmtOPKXPervPPabjJNYBerA12SHN_v7w4,1139
 machineconfig/scripts/linux/warp-cli.sh,sha256=shFFZ9viet_DSEEHT8kxlGRHoJpO6o85pKYnc3rIkaA,3868
-machineconfig/scripts/linux/z_ls,sha256=h5YJYfnJrmtLe4c2iKk5aZdaK_Zeaj3CpQX8SSr7fr0,3310
 machineconfig/scripts/linux/other/share_cloud.sh,sha256=lIZrXiaOT11kzu4NFNTXvANhc2bMdSPDYD1-7XUO_C0,2027
 machineconfig/scripts/linux/other/share_nfs,sha256=LDQZQ9TV7z2y7RtNHiO4Wb513MztyGjaAV-GzTGwUdc,1374
-machineconfig/scripts/linux/other/share_smb,sha256=HZX8BKgMlS9JzkGIYnxTsPvoxEBBuVLVkqzR3pmGFGY,20
 machineconfig/scripts/linux/other/start_docker,sha256=_yDN_PPqgzSUnPT7dmniMTpL4IfeeaGy1a2OL3IJlDU,525
 machineconfig/scripts/linux/other/switch_ip,sha256=NQfeKMBSbFY3eP6M-BadD-TQo5qMP96DTp77KHk2tU8,613
 machineconfig/scripts/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -126,6 +125,7 @@ machineconfig/scripts/python/ftpx.py,sha256=A13hL_tDYfcsaK9PkshK-0lrUS6KPhPCtwqW
 machineconfig/scripts/python/interactive.py,sha256=zt3g6nGKR_Y5A57UnR4Y5-JpLzrpnCOSaqU1bnaikK0,11666
 machineconfig/scripts/python/mcfg.py,sha256=TB5lZDZDImGqX4_mMSEv4ZoFigIPA0RXn-9H2cmPS6g,2457
 machineconfig/scripts/python/sessions.py,sha256=JfN8M7r7f8DkfiGJ4jz2NfXvABm90nOZJmLGxPgw_2M,9518
+machineconfig/scripts/python/terminal.py,sha256=07TRB0yK-XB86s1EWUQdDv8m3uk6WzndMbqafd2EU0c,3562
 machineconfig/scripts/python/utils.py,sha256=Pdk75UjapwE3gou-CMHtqqPhNhpPZP2t1Pm1LPbam-Y,3280
 machineconfig/scripts/python/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/ai/generate_files.py,sha256=VfjKdwgF8O6E4oiRtfWNliibLmmwGe7f9ld6wpOsXTw,14498
@@ -159,7 +159,7 @@ machineconfig/scripts/python/ai/solutions/opencode/opencode.json,sha256=nahHKRw1
 machineconfig/scripts/python/ai/solutions/opencode/opencode.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 machineconfig/scripts/python/env_manager/__init__.py,sha256=E4LAHbU1wo2dLjE36ntv8U7QNTe8TasujUAYK9SLvWk,6
 machineconfig/scripts/python/env_manager/path_manager_backend.py,sha256=ZVGlGJALhg7zNABDdwXxL7MFbL2BXPebObipXSLGbic,1552
-machineconfig/scripts/python/env_manager/path_manager_tui.py,sha256=VL_VuM9XuZL6dekAOq_vpU4meluHnwSv6_MTxIo1_30,6932
+machineconfig/scripts/python/env_manager/path_manager_tui.py,sha256=EX4BuxWG8wdAdwILgwfxwI6VMZpjfWxArSXJgwQfsNE,6932
 machineconfig/scripts/python/helpers_cloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/helpers_cloud/cloud_copy.py,sha256=OV1w3ajFVFs6FJytjIPOntYB_aW2ywGohKi73V4Dm2Y,8691
 machineconfig/scripts/python/helpers_cloud/cloud_helpers.py,sha256=GA-bxXouUmknk9fyQAsPT-Xl3RG9-yBed71a2tu9Pig,4914
@@ -175,12 +175,12 @@ machineconfig/scripts/python/helpers_croshell/start_slidev.py,sha256=HfJReOusTPh
 machineconfig/scripts/python/helpers_croshell/viewer.py,sha256=heQNjB9fwn3xxbPgMofhv1Lp6Vtkl76YjjexWWBM0pM,2041
 machineconfig/scripts/python/helpers_croshell/viewer_template.py,sha256=ve3Q1-iKhCLc0VJijKvAeOYp2xaFOeIOC_XW956GWCc,3944
 machineconfig/scripts/python/helpers_devops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/scripts/python/helpers_devops/cli_config.py,sha256=AhnxhxlmnfktAOJ7p46HHide2OGcoj4Ti7VhnHg_nYM,7218
+machineconfig/scripts/python/helpers_devops/cli_config.py,sha256=9nyOc-twOdyvnK1imdmpMI2DMHCPQIJAFtAwoksB45I,7218
 machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py,sha256=fluxRtD6hlbh131_RmeKr2Dy8tZpeC4H9-wp2sYt0dM,2486
 machineconfig/scripts/python/helpers_devops/cli_data.py,sha256=79Xvx7YnbueruEnl69hrDg2AhVxf_zCUdlVcKfeMGyQ,1774
 machineconfig/scripts/python/helpers_devops/cli_nw.py,sha256=B5Xa9pV5MdC4vPo3EmKaHvNMlThsY3c5F92YPE5j3rI,4176
 machineconfig/scripts/python/helpers_devops/cli_repos.py,sha256=Xwkv1adqHZvTfRSPWiqSK3PZ1XADyx3llw_YkbxaKyE,12505
-machineconfig/scripts/python/helpers_devops/cli_self.py,sha256=ixRdjOHgLdyfAz8jRucgCnWpNtpioH6U4yuri4CBSwQ,6225
+machineconfig/scripts/python/helpers_devops/cli_self.py,sha256=yq0nS7ukWDDCAzvuI-Znf87n2fU9tsHnsG0NDHY_MN8,6225
 machineconfig/scripts/python/helpers_devops/cli_share_server.py,sha256=q9pFJ6AxPuygMr3onMNOKEuuQHbVE_6Qoyo7xRT5FX0,4196
 machineconfig/scripts/python/helpers_devops/cli_terminal.py,sha256=k_PzXaiGyE0vXr0Ii1XcJz2A7UvyPJrR31TRWt4RKRI,6019
 machineconfig/scripts/python/helpers_devops/cli_utils.py,sha256=KGIU1uTWC4g3kvBBkGrM-TtmcR8V1jTxVMGKXDSLnLA,10183
@@ -222,7 +222,7 @@ machineconfig/scripts/python/helpers_navigator/search_bar.py,sha256=kDi8Jhxap8wd
 machineconfig/scripts/python/helpers_repos/action.py,sha256=8je051kpGZ7A_GRsQyWKhPZ8xVW7tSm4bnPu6VjxaXk,9755
 machineconfig/scripts/python/helpers_repos/action_helper.py,sha256=XRCtkGkNrxauqUd9qkxtfJt02Mx2gejSYDLL0jyWn24,6176
 machineconfig/scripts/python/helpers_repos/clone.py,sha256=UULEG5xJuXlPGU0nqXH6U45jA9DOFqLw8B4iPytCwOQ,5471
-machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py,sha256=B1vZC587lRYvAWxWKfZqm2URZUUuMB3AuCtvYo4MicI,10450
+machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py,sha256=rB9qr8cqg4iMy94ty_Ev8Mc2FsKLBr0ZwJno-MsgZAA,10450
 machineconfig/scripts/python/helpers_repos/count_lines.py,sha256=Q5c7b-DxvTlQmljoic7niTuiAVyFlwYvkVQ7uRJHiTo,16009
 machineconfig/scripts/python/helpers_repos/count_lines_frontend.py,sha256=vSDtrF4829jziwp6WZmGt9G8MJ9jY4hfXqtf0vhkYSE,607
 machineconfig/scripts/python/helpers_repos/entrypoint.py,sha256=WYEFGUJp9HWImlFjbs_hiFZrUqM_KEYm5VvSUjWd04I,2810
@@ -238,7 +238,7 @@ machineconfig/scripts/python/nw/add_ssh_key.py,sha256=9JLmWu8pE7PAL5VuCFd19iVEdC
 machineconfig/scripts/python/nw/devops_add_identity.py,sha256=aPjcHbTLhxYwWYcandyAHdwuO15ZBu3fB82u6bI0tMQ,3773
 machineconfig/scripts/python/nw/devops_add_ssh_key.py,sha256=CkIl85hZLtG9k7yXLSzqi88YrilHV4hIUWHAPBwxWjw,8922
 machineconfig/scripts/python/nw/mount_drive,sha256=zemKofv7hOmRN_V3qK0q580GkfWw3VdikyVVQyiu8j8,3514
-machineconfig/scripts/python/nw/mount_nfs,sha256=TBTU0sFK2d_v-A-XBsZG3gTrsHYj8MbpMsrM9LySXX4,1855
+machineconfig/scripts/python/nw/mount_nfs,sha256=MOBehvwbM5G-6Z454lFWcxajUmnppkAwd-UCcL0gYJ8,1855
 machineconfig/scripts/python/nw/mount_nfs.py,sha256=lOMDY4RS7tx8gsCazVR5tNNwFbaRyO2PJlnwBCDQgCM,3573
 machineconfig/scripts/python/nw/mount_nw_drive,sha256=BqjGBCbwe5ZAsZDO3L0zHhh_gJfZy1CYOcqXA4Y-WkQ,2262
 machineconfig/scripts/python/nw/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lDkuliVpPV5_uBTVVhXtjQ,1550
@@ -253,10 +253,11 @@ machineconfig/scripts/windows/fzfb.ps1,sha256=Bmngm2aY8hnPa3iKAOK6EPDYdKzGLUc81w
 machineconfig/scripts/windows/fzfg.ps1,sha256=CHJbMrMuZePd4dxwIwz3g4XWAEmWmckuX-Nrx2xgRkg,27
 machineconfig/scripts/windows/fzfrga.bat,sha256=rU_KBMO6ii2EZ0akMnmDk9vpuhKSUZqkV0o8a8ywXcM,488
 machineconfig/scripts/windows/mcfgs.ps1,sha256=uuK5pEz38D3_SOjfhbvkDT8Kt4I62YhNzkExlW8VSps,577
+machineconfig/scripts/windows/term.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/windows/mounts/mount_nfs.ps1,sha256=XrAdzpxE6a4OccSmWJ7YWHJTnsZK8uXnFE5j9GOPA20,2026
 machineconfig/scripts/windows/mounts/mount_nw.ps1,sha256=puxcfZc3ZCJerm8pj8OZGVoTYkhzp-h7oV-MrksSqIE,454
 machineconfig/scripts/windows/mounts/mount_smb.ps1,sha256=PzYWpIO9BpwXjdWlUQL9pnMRnOGNSkxfh4bHukJFme8,69
-machineconfig/scripts/windows/mounts/mount_ssh.ps1,sha256=TGTSzYfJ8kOx1Anx2CIUpWzRd6E3cQ2rmzkQcm5QwxA,322
+machineconfig/scripts/windows/mounts/mount_ssh.ps1,sha256=ldmxaQcjVhrwy9YlY57sQSOtEzXkJw5FIOTRneZzSWU,322
 machineconfig/scripts/windows/mounts/share_cloud.cmd,sha256=exD7JCdxw2LqVjw2MKCYHbVZlEqmelXtwnATng-dhJ4,1028
 machineconfig/scripts/windows/mounts/share_smb.ps1,sha256=U7x8ULYSjbgzTtiHNSKQuTaZ_apilDvkGV5Xm5hXk5M,384
 machineconfig/scripts/windows/mounts/unlock_bitlocker.ps1,sha256=Wv-SLscdckV-1mG3p82VXKPY9zW3hgkRmcLUXIZ1daE,253
@@ -327,7 +328,7 @@ machineconfig/settings/rofi/config.rasi,sha256=nDX5B8wdXQYF1fwiOTBRJUI4l_gQbYaLa
 machineconfig/settings/rofi/config_default.rasi,sha256=rTfKnC-bZuWX1l-lWQACCUOE1ShhkfykAxtXX9PlQHE,4694
 machineconfig/settings/shells/alacritty/alacritty.toml,sha256=EbL-2Y4QunW1pvRWB2yuLCw8MMPONheJr5LFoWRieUQ,871
 machineconfig/settings/shells/alacritty/alacritty.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/settings/shells/bash/init.sh,sha256=sSocJ3oyi47Oe_Ryg3VMjWRzRsV9n1NCo15nW7MB9XE,2695
+machineconfig/settings/shells/bash/init.sh,sha256=JiZ6UUar6nmNiu9-sMemYnxIF6pjVlqxBMwKKq8hu9o,2709
 machineconfig/settings/shells/hyper/.hyper.js,sha256=h-HqeYlvPvPD4Ee7828Cxo87uVkzbMGJFqXTZIWoegw,8884
 machineconfig/settings/shells/ipy/profiles/default/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/settings/shells/ipy/profiles/default/startup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -335,7 +336,7 @@ machineconfig/settings/shells/ipy/profiles/default/startup/playext.py,sha256=OJ3
 machineconfig/settings/shells/kitty/kitty.conf,sha256=lDdx-dUX3jbKGb3BkS2f2TOpmgGiS-CI-_-lFvhD5A4,52870
 machineconfig/settings/shells/nushell/config.nu,sha256=xtko80MPteDXuOJmwJHNFhXmfHT6fIBfmTgsF29GiEc,748
 machineconfig/settings/shells/nushell/env.nu,sha256=4VmaXb-qP6qnMD5TPzkXMLFNlB5QC4l9HEzCvXZE2GQ,315
-machineconfig/settings/shells/pwsh/init.ps1,sha256=g1C4bgy2ZVTGD4fhBYMmSI526QBU5cqKYEO0hK7iWj0,1970
+machineconfig/settings/shells/pwsh/init.ps1,sha256=5DfRhHt8kMSh74JbW4ALJOH6NRa_MlRgG34ouew7qsc,2000
 machineconfig/settings/shells/pwsh/profile.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/settings/shells/starship/starship.toml,sha256=5rQTY7ZpKnrnhgu2Y9OJKUYMz5lPLIftO1p1VRuVZwQ,1150
 machineconfig/settings/shells/vtm/settings.xml,sha256=5TNXd-i0eUGo2w3tuhY9aOkwoJdqih8_HO_U6uL2Dts,18262
@@ -373,7 +374,7 @@ machineconfig/setup_linux/others/cli_installation.sh,sha256=gVvszYZJgKPRJx2SEaE3
 machineconfig/setup_linux/others/mint_keyboard_shortcuts.sh,sha256=F5dbg0n9RHsKGPn8fIdZMn3p0RrHEkb8rWBGsdVGbus,1207
 machineconfig/setup_linux/ssh/openssh_all.sh,sha256=3dg6HEUFbHQOzLfSAtzK_D_GB8rGCCp_aBnxNdnidVc,824
 machineconfig/setup_linux/ssh/openssh_wsl.sh,sha256=1eeRGrloVB34K5z8yWVUMG5b9pV-WBfHgV9jqXiYgCQ,1398
-machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=Bkw6JQMZlDqshUjxRBvmf6PPtn_eUtgGRyYdJn2LI5k,464
+machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=90vbyrktpMWaQw1NzqK9yzgDvKGUlU9nNbOAaYoMYsw,488
 machineconfig/setup_mac/__init__.py,sha256=Q1waupi5vCBroLqc8Rtnw69_7jLnm2Cs7_zH_GSZgMs,616
 machineconfig/setup_mac/apps.sh,sha256=R0N6fBwLCzwy4qAormyMerXXXrHazibSkY6NrNOpTQU,2772
 machineconfig/setup_mac/uv.sh,sha256=CSN8oCBKS-LK1vJJqYOhAMcrouTf4Q_F3cpplc_ddMA,1157
@@ -387,25 +388,25 @@ machineconfig/setup_windows/others/power_options.ps1,sha256=c7Hn94jBD5GWF29CxMhm
 machineconfig/setup_windows/ssh/add-sshkey.ps1,sha256=qfPdqCpd9KP3VhH4ifsUm1Xvec7c0QVl4Wt8JIAm9HQ,1653
 machineconfig/setup_windows/ssh/add_identity.ps1,sha256=b8ZXpmNUSw3IMYvqSY7ClpdWPG39FS7MefoWnRhWN2U,506
 machineconfig/setup_windows/ssh/openssh-server.ps1,sha256=OMlYQdvuJQNxF5EILLPizB6BZAT3jAmDsv1WcVVxpFQ,2529
-machineconfig/setup_windows/web_shortcuts/interactive.ps1,sha256=tSaANlJUcCi_sYBIp38KXrYqqYj7ambmaSHk6kYQN4E,581
+machineconfig/setup_windows/web_shortcuts/interactive.ps1,sha256=iOpIYEwkXw5RuxT6-vBfWe-KVklKuADn2jP3DkWV3QU,616
 machineconfig/setup_windows/wt_and_pwsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=ogxJnwpdcpH7N6dFJu95UCNoGYirZKQho_3X0F_hmXs,6791
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/accessories.py,sha256=Rs8R0GUb2Ub6YimkgXHnI02CShS5BKlrZdCigVxfPlk,4339
-machineconfig/utils/code.py,sha256=2hz171Uw706QGbvup0X7RUH0L_0ELRBekKjco71hFEQ,5493
+machineconfig/utils/code.py,sha256=QpSBeeX1wbZ3UUaOz7BTVNtp5VqHpSU0FxkfNy_NIY8,5650
 machineconfig/utils/installer.py,sha256=UzI_DtTcKbgvkAkWkNLAPUtx-RVqITHCpvZyLiCpD9g,10377
 machineconfig/utils/io.py,sha256=4dSieoqZO8Vvi4vW8lLoITDHBvmFp4dtl3kyeZHQ6Co,2528
 machineconfig/utils/links.py,sha256=KM6vIn3hag9FYEzLSHP5MAM9tU_RStw2mCq2_OvmmZA,23672
 machineconfig/utils/meta.py,sha256=RXbq3_DSFAFNAEt9GjWqP2TjCWUs0v7gAkKCgRpdwO8,9853
 machineconfig/utils/notifications.py,sha256=tuXIudcip0tEioG-bm8BbLr3FMDve4f6BktlznBhKxM,9013
-machineconfig/utils/options.py,sha256=vUO4Kej-vDOv64wHr2HNDyu6PATURpjd7xp6N8OOoJg,7083
+machineconfig/utils/options.py,sha256=VWYx3EKJxIp-CJ8gDGYdjclKSc1tMUhyrC8v3seeneo,7447
 machineconfig/utils/path_extended.py,sha256=WyJwoHnXdvSQQJ-yrxTX78FpqYmgVeKDYpNEB9UsRck,53223
 machineconfig/utils/path_helper.py,sha256=0e3Xh3BAEv27oqcezNeVLHJllGmLEgLH4T1l90m-650,8014
 machineconfig/utils/procs.py,sha256=YPA_vEYQGwPd_o_Lc6nOTBo5BrB1tSs8PJ42XiGpenM,10957
 machineconfig/utils/scheduler.py,sha256=fguwvINyaupOxdU5Uadyxalh_jXTXDzt0ioEgjEOKcM,14705
 machineconfig/utils/scheduling.py,sha256=6x5zLA7sY5gohrEtN6zGrXIqNFasMoyBfwLcOjrjiME,11109
 machineconfig/utils/source_of_truth.py,sha256=ZAnCRltiM07ig--P6g9_6nEAvNFC4X4ERFTVcvpIYsE,764
-machineconfig/utils/ssh.py,sha256=3jsTdPocNGLnJBMmkKBEsRCgE_p9u3ts02FcweqQTxE,39009
+machineconfig/utils/ssh.py,sha256=-w9b6kbJfCEJjTepS9sfDJ8MToY_m1OeU2-ZxDXSR_A,39009
 machineconfig/utils/terminal.py,sha256=VDgsjTjBmMGgZN0YIc0pJ8YksLDrBtiXON1EThy7_is,4264
 machineconfig/utils/tst.py,sha256=6u1GI49NdcpxH2BYGAusNfY5q9G_ytCGVzFM5b6HYpM,674
 machineconfig/utils/upgrade_packages.py,sha256=TCohwiwc0btSsInOloxDVuk5i88yc1vBK8RZcoMWoUw,3425
@@ -434,8 +435,8 @@ machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoS
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
 machineconfig/utils/ssh_utils/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig-6.83.dist-info/METADATA,sha256=av1Q9f0ye-XEKl0wkJXHAVKpL_N1Yxee12RH2ktRdWQ,2928
-machineconfig-6.83.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-6.83.dist-info/entry_points.txt,sha256=2OetLXw0yXtfG6MmJXbzZipCQfPueeM3oMgTORSEfYs,465
-machineconfig-6.83.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-6.83.dist-info/RECORD,,
+machineconfig-6.84.dist-info/METADATA,sha256=72Q2T1CT1wbWoqzrp9P4nHz42XroVZ3W7TSsyxnrYj8,2928
+machineconfig-6.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-6.84.dist-info/entry_points.txt,sha256=uf_ZPJa02_y3Fw5Z7m22cq7PwxhYd1QV2FfPNZTl_dQ,519
+machineconfig-6.84.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-6.84.dist-info/RECORD,,

{machineconfig-6.83.dist-info → machineconfig-6.84.dist-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/scripts/linux/other/share_smb

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

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