machineconfig 5.37__tar.gz → 5.38__tar.gz

{machineconfig-5.37/src/machineconfig.egg-info → machineconfig-5.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.37
+Version: 5.38
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -9,7 +9,7 @@ Project-URL: Bug Tracker, https://github.com/thisismygitrepo/machineconfig/issue
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.13
+Requires-Python: <3.14,>=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: fire>=0.7.0
@@ -24,9 +24,8 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: questionary>=2.1.1
-Requires-Dist: typer>=0.19.2
+Requires-Dist: typer-slim>=0.19.2
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot
@@ -86,5 +85,9 @@ iex (iwr bit.ly/cfgwindows).Content
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 
+# Contributor
+Ruby Chan. [email](mailto:ruby.chan@sa.gov.au)
+
+
 [![Alex's github activity graph](https://github-readme-activity-graph.vercel.app/graph?username=thisismygitrepo)](https://github.com/ashutosh00710/github-readme-activity-graph)
 

{machineconfig-5.37 → machineconfig-5.38}/README.md

@@ -41,5 +41,9 @@ iex (iwr bit.ly/cfgwindows).Content
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 
+# Contributor
+Ruby Chan. [email](mailto:ruby.chan@sa.gov.au)
+
+
 [![Alex's github activity graph](https://github-readme-activity-graph.vercel.app/graph?username=thisismygitrepo)](https://github.com/ashutosh00710/github-readme-activity-graph)
 

{machineconfig-5.37 → machineconfig-5.38}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.37"
+version = "5.38"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -18,7 +18,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
-requires-python = ">=3.13"
+requires-python = ">=3.13,<3.14"
 dependencies = [
     "cryptography>=44.0.2",
     "fire>=0.7.0",
@@ -33,9 +33,8 @@ dependencies = [
     "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
     "pyjson5>=1.6.9",
-    "typer-slim>=0.19.2",
     "questionary>=2.1.1",
-    "typer>=0.19.2",
+    "typer-slim>=0.19.2",
 ]
 
 [project.optional-dependencies]
@@ -95,6 +94,7 @@ dev = [
     "ipython>=9.5.0",
     "matplotlib>=3.10.6",
     "mypy>=1.18.2",
+    "nuitka>=2.7.16",
     "numpy>=2.3.3",
     "plotly>=6.3.0",
     "polars>=1.33.1",

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/cluster/remote/script_execution.py

@@ -169,7 +169,6 @@
 # if params.session_name != "":
 #     if platform.system() in ["Linux", "Darwin"]:
 #         Terminal().run(f"""zellij --session {params.session_name} action new-tab --name results  """)
-#         # --layout ~/code/machineconfig/src/machineconfig/settings/zellij/layouts/d.kdl --cwd {res_folder.as_posix()}
 #         Terminal().run(f"""zellij --session {params.session_name} action write-chars "cd {res_folder.as_posix()};lf" """)
 #     elif platform.system() == "Windows":
 #         Terminal().run(f"""wt --window {params.session_name} new-tab --title results -startingDirectory {res_folder.as_posix()} lf """)

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py

@@ -51,12 +51,10 @@ class ProcessMonitor:
             return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "command": "", "tab_name": tab_name, "processes": [], "remote": self.remote_executor.remote_name}
 
         command = tab_config["command"]
-
         try:
             check_script = self._create_process_check_script(command)
             remote_cmd = f"$HOME/code/machineconfig/.venv/bin/python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
-
             if result.returncode == 0:
                 try:
                     matching_processes = json.loads(result.stdout.strip())

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py

@@ -25,14 +25,14 @@ nerd_fonts: InstallerData = {
     "doc": "Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons)",
     "fileNamePattern": {
         "amd64": {
-            "windows": "CaskaydiaCoveNerdFontWindows.zip",
-            "linux": "CaskaydiaCoveNerdFontLinux.zip",
-            "macos": "CaskaydiaCoveNerdFontMac.zip",
+            "windows": "CascadiaCode.zip",
+            "linux": "CascadiaCode.zip",
+            "macos": "CascadiaCode.zip",
         },
         "arm64": {
-            "windows": "CaskaydiaCoveNerdFontWindows.zip",
-            "linux": "CaskaydiaCoveNerdFontLinux.zip",
-            "macos": "CaskaydiaCoveNerdFontMac.zip",
+            "windows": "CascadiaCode.zip",
+            "linux": "CascadiaCode.zip",
+            "macos": "CascadiaCode.zip",
         }
     }
 }
@@ -40,10 +40,10 @@ nerd_fonts: InstallerData = {
 
 # Patterns to match any installed variant (NF, Nerd Font, Mono, Propo, style weights) of Cascadia/Caskaydia
 # We'll compile them at runtime for flexibility. Keep them simple to avoid false positives.
-REQUIRED_FONT_PATTERNS: tuple[str, ...] = (
-    r"caskaydiacove.*(nf|nerd ?font)",
-    r"cascadiacode.*(nf|nerd ?font)"
-)
+# REQUIRED_FONT_PATTERNS: tuple[str, ...] = (
+#     r"caskaydiacove.*(nf|nerd ?font)",
+#     r"cascadiacode.*(nf|nerd ?font)"
+# )
 
 
 console = Console()
@@ -92,7 +92,7 @@ def _missing_required_fonts(installed_fonts: Iterable[str]) -> list[str]:
 
     installed_norm = [f.lower().replace(" ", "") for f in installed_fonts]
     missing: list[str] = []
-    for pattern in REQUIRED_FONT_PATTERNS:
+    for pattern in ["cascadiacode*"]:
         regex = re.compile(pattern)
         if not any(regex.search(f) for f in installed_norm):
             missing.append(pattern)
@@ -136,7 +136,7 @@ def install_nerd_fonts() -> None:
     file = PathExtended.tmpfile(suffix=".ps1")
     file.parent.mkdir(parents=True, exist_ok=True)
     
-    raw_content = LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
+    raw_content = LIBRARY_ROOT.joinpath("jobs/installer/pwsh_scripts/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
     # PowerShell 5.1 can choke on certain unicode chars in some locales; keep ASCII only.
     content = "".join(ch for ch in raw_content if ord(ch) < 128)
     file.write_text(content, encoding="utf-8")

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/jobs/installer/installer_data.json

@@ -188,6 +188,40 @@
         }
       }
     },
+    {
+      "appName": "croc",
+      "repoURL": "https://github.com/schollz/croc",
+      "doc": "🦎 Easily and securely send things from one computer to another",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "croc_{version}_Linux-64bit.tar.gz",
+          "windows": "croc_{version}_Windows-64bit.zip",
+          "macos": "croc_{version}_macOS-64bit.tar.gz"
+        },
+        "arm64": {
+          "linux": "croc_{version}_Linux-ARM64.tar.gz",
+          "windows": null,
+          "macos": "croc_{version}_macOS-ARM64.tar.gz"
+        }
+      }
+    },
+    {
+      "appName": "wormhole-rs",
+      "repoURL": "https://github.com/magic-wormhole/magic-wormhole.rs",
+      "doc": "🐛 Get things from one computer to another, safely (Rust implementation)",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "magic-wormhole-cli-x86_64-unknown-linux-gnu.tgz",
+          "windows": "magic-wormhole-cli-x86_64-pc-windows-gnu.tgz",
+          "macos": "magic-wormhole-cli-aarch64-apple-darwin.tgz"
+        },
+        "arm64": {
+          "linux": null,
+          "windows": null,
+          "macos": null
+        }
+      }
+    },
     {
       "appName": "easy-sharing",
       "repoURL": "CMD",
@@ -1328,9 +1362,9 @@
       }
     },
     {
-      "appName": "bitwarden",
+      "appName": "bw",
       "repoURL": "CMD",
-      "doc": "🔐 bw is a password manager.",
+      "doc": "🔐 bitwarden is a password manager.",
       "fileNamePattern": {
         "amd64": {
           "linux": "npm install -g @bitwarden/cli",
@@ -1752,6 +1786,23 @@
         }
       }
     },
+    {
+      "appName": "docker",
+      "repoURL": "CMD",
+      "doc": "🐳 Docker is an open platform for developing, shipping, and running applications.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "docker.sh",
+          "macos": "docker.sh",
+          "windows": null
+        },
+        "arm64": {
+          "linux": "docker.sh",
+          "macos": "docker.sh",
+          "windows": null
+        }
+      }
+    },
     {
       "appName": "lazydocker",
       "repoURL": "https://github.com/jesseduffield/lazydocker",

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/jobs/windows/archive/archive_pygraphviz.ps1

@@ -5,9 +5,7 @@
 # winget install Microsoft.VC++2015-2022Redist-x86
 
 
-. "$env:USERPROFILE\code\machineconfig\.venv\Scripts\Activate.ps1"
-Set-Location C:
-python -m pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
+uv pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
 # not including the options as above (from https://pygraphviz.github.io/documentation/stable/install.html)
 # would result in an error like this: pygraphviz/graphviz_wrap.c(2711): fatal error C1083: Cannot open include file: 'graphviz/cgraph.h': No such file or directory
 

{machineconfig-5.37/src/machineconfig/scripts/linux → machineconfig-5.38/src/machineconfig/scripts/linux/other}/share_cloud.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# https://temp.sh/
 # 📤 CLOUD FILE SHARING SCRIPT 📤
 # This script uploads files or directories to transfer.sh for easy sharing
 # Usage: share_cloud <file|directory> or command | share_cloud <file_name>
@@ -14,6 +15,8 @@ if [ $# -eq 0 ]; then
     return 1
 fi
 
+# https://temp.sh/
+
 # Process the input
 if tty -s; then
     # Direct file/directory upload mode

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/ai/solutions/generic.py

@@ -46,6 +46,7 @@ def adjust_gitignore(repo_root: Path) -> None:
         ".ai",
         "GEMINI.md",
         "CLAUDE.md",
+        "CRUSH.md",
         ".cursor",
         ".github/instructions",
         ".github/chatmodes",

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/croshell.py

@@ -46,6 +46,7 @@ console = Console()
 p = PathExtended(r'{path}').absolute()
 try:
     from machineconfig.utils.files.read import Read
+    from machineconfig.utils.accessories import pprint
     dat = Read.read(p)
     if isinstance(dat, dict):
         panel_title = f"📄 File Data: {{p.name}}"
@@ -64,12 +65,12 @@ except Exception as e:
 def main(
     python: Annotated[bool, typer.Option("--python", "-p", help="flag to use python over IPython.")] = False,
     fzf: Annotated[bool, typer.Option("--fzf", "-F", help="search with fuzzy finder for python scripts and run them")] = False,
-    ve: Annotated[Optional[str], typer.Option("--ve", "-v", help="virtual enviroment to use, defaults to activated ve, if existed, else ve.")] = None,
     profile: Annotated[Optional[str], typer.Option("--profile", "-P", help="ipython profile to use, defaults to default profile.")] = None,
     read: Annotated[str, typer.Option("--read", "-r", help="read a binary file.")] = "",
     jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="run in jupyter interactive console")] = False,
     streamlit_viewer: Annotated[bool, typer.Option("--stViewer", "-s", help="view in streamlit app")] = False,
     visidata: Annotated[bool, typer.Option("--visidata", "-V", help="open data file in visidata")] = False,
+    local: Annotated[bool, typer.Option("--local", "-l", help="run in local mode, not in virtual env.")]= False,
 ) -> None:
     # ==================================================================================
     # flags processing
@@ -141,7 +142,9 @@ from pathlib import Path
     else:
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
-        fire_line = f"uv run --python 3.13 --with machineconfig[plot] {interpreter} {interactivity} {profile} {str(pyfile)}"
+        if local: ve_line = "--project $HOME/code/machineconfig"
+        else: ve_line = "--with machineconfig[plot]"
+        fire_line = f"uv run --python 3.13 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script
     run_shell_script(fire_line, clean_env=False)

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/devops.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 import machineconfig.scripts.python.devops_helpers.cli_repos as cli_repos
 import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
-from machineconfig.scripts.python.devops_helpers.cli_self import self_app
+from machineconfig.scripts.python.devops_helpers.cli_self import cli_app as cli_app
 import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
 import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
@@ -21,29 +21,12 @@ def install( which: Optional[str] = typer.Option(None, "--which", "-w", help="Co
     installer_entry_point.main(which=which, group=group, interactive=interactive)
 
 
-app.add_typer(cli_repos.app, name="repos", help="📁 Manage git repositories")
+app.add_typer(cli_repos.app, name="repos")
 app.add_typer(cli_config.config_apps, name="config")
 app.add_typer(cli_data.app_data, name="data")
-app.add_typer(self_app, name="self")
+app.add_typer(cli_app, name="self")
 app.add_typer(cli_network.nw_apps, name="network")
 
 
-
-
-# @app.command()
-# def scheduler():
-#     """⏰ SCHEDULER"""
-#     # from machineconfig.scripts.python.scheduler import main as helper
-#     # helper()
-
-
-
-# @app.command()
-# def scheduler():
-#     """⏰ SCHEDULER"""
-#     # from machineconfig.scripts.python.scheduler import main as helper
-#     # helper()
-
-
 if __name__ == "__main__":
-    pass
+    app()

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -1,5 +1,6 @@
 
 import machineconfig.scripts.python.devops_helpers.cli_terminal as cli_terminal
+import machineconfig.scripts.python.devops_helpers.cli_share_server as cli_share_server
 import typer
 from typing import Optional
 
@@ -7,7 +8,7 @@ nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
 
 
 nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(cli_terminal.main)
-
+nw_apps.command(name="share-server", help="🌐 Start local/global server to share files/folders via web browser", no_args_is_help=True)(cli_share_server.main)
 
 @nw_apps.command()
 def install_ssh_server():

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -8,7 +8,6 @@ in the event that username@github.com is not mentioned in the remote url.
 from pathlib import Path
 from typing import Annotated, Optional
 import typer
-from git import Repo, InvalidGitRepositoryError
 from machineconfig.scripts.python.helpers_repos.secure_repo import main as secure_repo_main
 
 
@@ -26,7 +25,6 @@ CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁
 def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
-
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
 
 
@@ -143,7 +141,7 @@ def cleanup(repo: DirectoryArgument = None, recursive: RecursiveOption = False)
         repo = Path.cwd().as_posix()
     
     arg_path = Path(repo).expanduser().absolute()
-    
+    from git import Repo, InvalidGitRepositoryError
     if not recursive:
         # Check if the directory is a git repo
         try:

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -1,25 +1,25 @@
 
 import typer
 
-self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
+cli_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
 
 
-@self_app.command()
+@cli_app.command()
 def update():
     """🔄 UPDATE essential repos"""
     import machineconfig.scripts.python.devops_helpers.devops_update_repos as helper
     helper.main()
-@self_app.command()
+@cli_app.command()
 def interactive():
     """🤖 INTERACTIVE configuration of machine."""
     from machineconfig.scripts.python.interactive import main
     main()
-@self_app.command()
+@cli_app.command()
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
     import machineconfig.scripts.python.devops_helpers.devops_status as helper
     helper.main()
-@self_app.command()
+@cli_app.command()
 def clone():
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     import platform
@@ -33,7 +33,7 @@ def clone():
         create_default_shell_profile(method="reference")
     run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
 
-@self_app.command()
+@cli_app.command()
 def navigate():
     """📚 NAVIGATE command structure with TUI"""
     from machineconfig.scripts.python.devops_navigator import main

machineconfig-5.38/src/machineconfig/scripts/python/devops_helpers/cli_share_server.py

@@ -0,0 +1,109 @@
+from pathlib import Path
+from typing import Optional, Annotated
+import typer
+# import typer
+
+
+
+def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> None:
+    """Display a flashy, unmissable share URL announcement."""
+
+    from rich.console import Console
+    from rich.panel import Panel
+    from rich.text import Text
+    from rich.align import Align
+    console = Console()
+    
+    # Create the main message with styling
+    url_text = Text(f"{protocol}://{local_ip_v4}:{port}", style="bold bright_cyan underline")
+    message = Text.assemble(
+        ("🚀 ", "bright_red"),
+        ("Share server is now accessible at: ", "bright_white bold"),
+        url_text,
+        (" 🚀", "bright_red")
+    )
+    
+    # Create a fancy panel with borders and styling
+    panel = Panel(
+        Align.center(message),
+        title="[bold bright_green]🌐 SHARE SERVER READY 🌐[/bold bright_green]",
+        subtitle="[italic bright_yellow]⚡ Click the link above to access your shared files! ⚡[/italic bright_yellow]",
+        border_style="bright_magenta",
+        padding=(1, 2),
+        expand=False
+    )
+    
+    # Print with extra spacing and attention-grabbing elements
+    console.print(panel)
+
+
+def main(
+    path: Annotated[str, typer.Argument(help="Path to the file or directory to share")],
+    port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the share server on (default: 8080)")] = None,
+    username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for share access (default: current user)")] = None,
+    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for share access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None,
+    over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the share server over the internet using ngrok")] = False
+) -> None:
+    from machineconfig.utils.installer_utils.installer import install_if_missing
+    install_if_missing("ezshare")
+    if over_internet: install_if_missing("ngrok")
+
+    if username is None:
+        import getpass
+        username = getpass.getuser()
+    if password is None:
+        pwd_path = Path.home().joinpath("dotfiles/creds/passwords/quick_password")
+        if pwd_path.exists():
+            password = pwd_path.read_text(encoding="utf-8").strip()
+        else:
+            raise ValueError("Password not provided and default password file does not exist.")
+
+    if port is None:
+        port = 8080  # Default port for ezshare
+
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8',80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+
+    # Display the flashy share announcement  
+    protocol = "http"
+    display_share_url(local_ip_v4, port, protocol)
+    import subprocess
+    import time
+    # Build ezshare command
+    ezshare_cmd = f"ezshare --port {port} --username {username} --password {password} {path}"
+    ezshare_process = subprocess.Popen(ezshare_cmd, shell=True)
+    processes = [ezshare_process]
+    
+    if over_internet:
+        ngrok_process = subprocess.Popen(f"ngrok http {port}", shell=True)
+        processes.append(ngrok_process)
+        time.sleep(3)
+        try:
+            import requests
+            response = requests.get("http://localhost:4040/api/tunnels")
+            data = response.json()
+            public_url = data['tunnels'][0]['public_url']
+            print(f"🌐 Ngrok tunnel ready: {public_url}")
+        except Exception as e:
+            print(f"Could not retrieve ngrok URL: {e}")
+    
+    try:
+        while True:
+            print("Share server is running. Press Ctrl+C to stop.")
+            time.sleep(2)
+    except KeyboardInterrupt:
+        print("\nTerminating processes...")
+        for p in processes:
+            p.terminate()
+            p.wait()
+
+
+def main_with_parser():
+    typer.run(main)
+
+
+if __name__ == "__main__":
+    pass

{machineconfig-5.37 → machineconfig-5.38}/src/machineconfig/scripts/python/devops_helpers/cli_terminal.py

@@ -1,8 +1,8 @@
-
-
 from pathlib import Path
 from typing import Optional, Annotated
 import typer
+import subprocess
+import time
 
 
 
@@ -49,19 +49,6 @@ def display_terminal_url(local_ip_v4: str, port: int, protocol: str = "http") ->
     # console.print("🔥" * 60 + "\n", style="bright_red bold")
 
 
-def install_ttyd():
-    # uv run --python 3.13 --with machineconfig devops install ttyd
-    from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
-    exists = check_tool_exists("ttyd")
-    if exists:
-        print("✅ ttyd is already installed.")
-        return
-    print("⏳ ttyd not found. Installing...")
-    from machineconfig.utils.installer_utils.installer import main
-    main(which="ttyd")
-
-
-
 def main(
     port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the terminal server on (default: 7681)")] = None,
     username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for terminal access (default: current user)")] = None,
@@ -70,9 +57,13 @@ def main(
     ssl: Annotated[bool, typer.Option("--ssl", "-S", help="Enable SSL")] = False,
     ssl_cert: Annotated[Optional[str], typer.Option("--ssl-cert", "-C", help="SSL certificate file path")] = None,
     ssl_key: Annotated[Optional[str], typer.Option("--ssl-key", "-K", help="SSL key file path")] = None,
-    ssl_ca: Annotated[Optional[str], typer.Option("--ssl-ca", "-A", help="SSL CA file path for client certificate verification")] = None
+    ssl_ca: Annotated[Optional[str], typer.Option("--ssl-ca", "-A", help="SSL CA file path for client certificate verification")] = None,
+    over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the terminal over the internet using ngrok")] = False
 ) -> None:
-    install_ttyd()
+    from machineconfig.utils.installer_utils.installer import install_if_missing
+    install_if_missing("ttyd")
+    if over_internet: install_if_missing("ngrok")
+
     if username is None:
         import getpass
         username = getpass.getuser()
@@ -128,12 +119,33 @@ def main(
             start_command = "powershell"
         else:
             start_command = "bash"
-    code = f"""
-#!/bin/bash
-ttyd --writable -t enableSixel=true {ssl_args} --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' {start_command}
-"""
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(code, display_script=False)
+    
+    ttyd_cmd = f"ttyd --writable -t enableSixel=true {ssl_args} --port {port} --credential \"{username}:{password}\" -t 'theme={{\"background\": \"black\"}}' {start_command}"
+    ttyd_process = subprocess.Popen(ttyd_cmd, shell=True)
+    processes = [ttyd_process]
+    
+    if over_internet:
+        ngrok_process = subprocess.Popen(f"ngrok http {port}", shell=True)
+        processes.append(ngrok_process)
+        time.sleep(3)
+        try:
+            import requests
+            response = requests.get("http://localhost:4040/api/tunnels")
+            data = response.json()
+            public_url = data['tunnels'][0]['public_url']
+            print(f"🌐 Ngrok tunnel ready: {public_url}")
+        except Exception as e:
+            print(f"Could not retrieve ngrok URL: {e}")
+    
+    try:
+        while True:
+            print("Terminal server is running. Press Ctrl+C to stop.")
+            time.sleep(2)
+    except KeyboardInterrupt:
+        print("\nTerminating processes...")
+        for p in processes:
+            p.terminate()
+            p.wait()
 
 
 def main_with_parser():