machineconfig 3.96__tar.gz → 3.98__tar.gz

{machineconfig-3.96/src/machineconfig.egg-info → machineconfig-3.98}/PKG-INFO

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

{machineconfig-3.96 → machineconfig-3.98}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.96"
+version = "3.98"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -51,9 +51,7 @@ docs = [
 "Bug Tracker" = "https://github.com/thisismygitrepo/machineconfig/issues"
 
 [project.scripts]
-devops = "machineconfig.scripts.python.devops:args_parser"
-ia = "machineconfig.scripts.python.interactive:main"
-install = "machineconfig.scripts.python.devops_devapps_install:main_with_parser"
+devops = "machineconfig.scripts.python.devops:app"
 choose_wezterm_theme = "machineconfig.scripts.python.choose_wezterm_theme:main"
 cloud_copy = "machineconfig.scripts.python.cloud_copy:arg_parser"
 cloud_mount = "machineconfig.scripts.python.cloud_mount:arg_parser"
@@ -70,6 +68,9 @@ repos = "machineconfig.scripts.python.repos:main_from_parser"
 start_slidev = "machineconfig.scripts.python.start_slidev:arg_parser"
 wifi_conn = "machineconfig.scripts.python.wifi_conn:arg_parser"
 kill_process = "machineconfig.utils.procs:main"
+# ia = "machineconfig.scripts.python.interactive:main"  # Used 
+# install = "machineconfig.scripts.python.devops_devapps_install:main_with_parser"
+# share_terminal = "machineconfig.scripts.python.share_terminal:main_with_parser"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{machineconfig-3.96 → machineconfig-3.98}/src/machineconfig/scripts/python/devops.py

@@ -1,22 +1,18 @@
 """devops with emojis"""
 
-from machineconfig.utils.options import choose_from_options
+from machineconfig.scripts.python.share_terminal import main as share_terminal_main
+import machineconfig.scripts.python.devops_devapps_install as installer_entry_point
 
 from platform import system
-from typing import Optional, Literal, TypeAlias
 from rich.console import Console
 from rich.panel import Panel
 import typer
 
 console = Console()
-app = typer.Typer(help="🛠️ DevOps operations with emojis", invoke_without_command=True, no_args_is_help=True)
+app = typer.Typer(help="🛠️ DevOps operations with emojis", no_args_is_help=True)
 
-BOX_WIDTH = 150  # width for box drawing
-
-
-COMMANDS: TypeAlias = Literal["🔄 UPDATE essential repos", "⚙️ DEVAPPS install", "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.", "🆕 SYMLINKS new", "🔑 SSH add pub key to this machine", "🗝️ SSH add identity (private key) to this machine", "🔐 SSH use key pair to connect two machines", "📡 SSH setup", "🐧 SSH setup wsl", "💾 BACKUP", "📥 RETRIEVE", "⏰ SCHEDULER"]
 
-options_list = list(COMMANDS.__args__)
+BOX_WIDTH = 150  # width for box drawing
 
 
 @app.command()
@@ -27,12 +23,9 @@ def update():
     helper.main()
 
 
-@app.command()
-def install():
-    """⚙️ DEVAPPS install"""
-    console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
-    import machineconfig.scripts.python.devops_devapps_install as helper
-    helper.main(which=None)
+app.command(name="install")(installer_entry_point.main)
+app.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal_main)
+
 
 
 @app.command()
@@ -123,55 +116,11 @@ def scheduler():
     # from machineconfig.scripts.python.scheduler import main as helper
     # helper()
 
-
-def args_parser():
-    app()
-
-
-@app.command()
-def interactive(which: Optional[COMMANDS] = None):
-    """🛠️ Interactive menu mode (legacy)"""
-    console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
-    options = options_list
-    if which is None:
-        try:
-            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False, fzf=False)
-        except KeyboardInterrupt:
-            console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
-            return
-    else:
-        choice_key = which
-
-    console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
-
-    if choice_key == "🔄 UPDATE essential repos":
-        update()
-    elif choice_key == "⚙️ DEVAPPS install":
-        install()
-    elif choice_key == "🆕 SYMLINKS new":
-        symlinks_new()
-    elif choice_key == "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.":
-        symlinks()
-    elif choice_key == "🔑 SSH add pub key to this machine":
-        ssh_add_key()
-    elif choice_key == "🔐 SSH use key pair to connect two machines":
-        ssh_connect()
-    elif choice_key == "🗝️ SSH add identity (private key) to this machine":
-        ssh_add_identity()
-    elif choice_key == "📡 SSH setup":
-        ssh_setup()
-    elif choice_key == "🐧 SSH setup wsl":
-        ssh_setup_wsl()
-    elif choice_key == "💾 BACKUP":
-        backup()
-    elif choice_key == "📥 RETRIEVE":
-        retrieve()
-    elif choice_key == "⏰ SCHEDULER":
-        scheduler()
-    else:
-        console.print(Panel("❌ ERROR: Invalid choice", title_align="left", border_style="red", width=BOX_WIDTH))
-        raise ValueError(f"Unimplemented choice: {choice_key}")
+@app.command("ia")
+def interactive():
+    from machineconfig.scripts.python.interactive import main
+    main()
 
 
 if __name__ == "__main__":
-    args_parser()
+    pass

{machineconfig-3.96 → machineconfig-3.98}/src/machineconfig/scripts/python/devops_devapps_install.py

@@ -1,16 +1,11 @@
 """Devops Devapps Install"""
 
-# import subprocess
 import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import choose_from_options
-from machineconfig.utils.installer import get_installers, install_all
-from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
 from platform import system
-from typing import Any, Optional, Literal, TypeAlias, get_args, Annotated
+from typing import Optional, Literal, TypeAlias, cast, get_args, Annotated
 
-WHICH_CAT: TypeAlias = Literal["essentials", "essentialsDev", "systymPackages", "precheckedPackages"]
+WHICH_CAT: TypeAlias = Literal["essentials", "essentialsDev", "systymPackages", "precheckedPackages", "ia"]
 
 
 def main_with_parser():
@@ -20,11 +15,12 @@ def main_with_parser():
     app()
 
 
-def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category or program to install, {list(get_args(WHICH_CAT))} or <program_name>")]) -> None:
-    if which is not None and which in get_args(WHICH_CAT):  # install by category
+def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category or program to install, {list(get_args(WHICH_CAT))} or <program_name> or list of programs names separated by comma.")]) -> None:
+    if which in get_args(WHICH_CAT):  # install by category
         return get_programs_by_category(program_name=which)  # type: ignore
-
-    if which is not None:  # install by name
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.installer import get_installers
+    if which != "ia" and which is not None:  # install by name
         total_messages: list[str] = []
         for a_which in which.split(",") if type(which) == str else which:
             all_installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL", "GITHUB_DEV", "CUSTOM_DEV"])
@@ -53,6 +49,12 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
             print(a_message)
         return None
 
+
+
+def install_interactively():
+    from machineconfig.utils.options import choose_from_options
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.installer import get_installers
     installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL", "GITHUB_DEV", "CUSTOM_DEV"])
     # Check installed programs with progress indicator
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
@@ -84,8 +86,7 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
         if a_program_name.startswith("📦 "):
             category_name = a_program_name[2:]  # Remove "📦 " prefix
             if category_name in get_args(WHICH_CAT):
-                shell_commands = get_programs_by_category(program_name=category_name)  # type: ignore
-                total_commands += "\n" + shell_commands
+                get_programs_by_category(program_name=cast(WHICH_CAT, category_name))
         else:
             # Handle individual installer options
             installer_idx = installer_options.index(a_program_name)
@@ -112,15 +113,18 @@ def get_programs_by_category(program_name: WHICH_CAT):
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ┃ 📦 Installing Category: {program_name}
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
+    from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+    from machineconfig.utils.installer import get_installers, install_all
+    from machineconfig.utils.installer_utils.installer_abc import parse_apps_installer_linux, parse_apps_installer_windows
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.options import choose_from_options
     match program_name:
         case "essentials":
             installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
             install_all(installers=installers_)
-            program = ""
         case "essentialsDev":
             installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_DEV", "CUSTOM_DEV", "GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
             install_all(installers=installers_)
-            program = ""
         case "systymPackages":
             if system() == "Windows":
                 options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
@@ -141,79 +145,14 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 if sub_program.startswith("#winget"):
                     sub_program = sub_program[1:]
                 program += "\n" + sub_program
-        # case "CHOOSE": raise NotImplementedError("CHOOSE is not implemented yet.")
-        # case "OtherDevApps":
-        #     installers = get_installers(dev=True, system=system())
-        #     options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]
-        #     program_names = choose_from_options(multi=True, msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
-        #     if "all" in program_names: program_names = options__
-        #     program = ""
-        #     print("Installing:")
-        #     L(program_names).print()
-        #     for name in program_names:
-        #         try:
-        #             idx = options__.index(name)
-        #         except ValueError as ve:
-        #             print(f"{name=}")
-        #             print(f"{options__=}")
-        #             raise ve
-        #         print(f"Installing {name}")
-        #         sub_program = installers[idx].install_robust(version=None)  # finish the task
-
+        case "ia":
+            install_interactively()
         case "precheckedPackages":
             # from machineconfig.jobs.python.check_installations import precheckedPackages
             # ci = precheckedPackages()
             # ci.download_safe_apps(name="essentials")
             # program = ""
             raise NotImplementedError("precheckedPackages is not implemented yet.")
-    return program
-
-
-def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
-    txts = txt.split("""yes '' | sed 3q; echo "----------------------------- installing """)
-    res = {}
-    for chunk in txts[1:]:
-        try:
-            k = chunk.split("----")[0].rstrip().lstrip()
-            v = "\n".join(chunk.split("\n")[1:])
-            res[k] = v
-        except IndexError as e:
-            print(f"""
-❌ Error parsing chunk:
-{"-" * 50}
-{chunk}
-{"-" * 50}""")
-            raise e
-    return res
-
-
-def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
-    chunks: list[str] = []
-    for idx, item in enumerate(txt.split(sep="winget install")):
-        if idx == 0:
-            continue
-        if idx == 1:
-            chunks.append(item)
-        else:
-            chunks.append("winget install" + item)
-    # progs = L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
-    res: dict[str, str] = {}
-    for a_chunk in chunks:
-        try:
-            name = a_chunk.split("--name ")[1]
-            if "--Id" not in name:
-                print(f"⚠️  Warning: {name} does not have an Id, skipping")
-                continue
-            name = name.split(" --Id ", maxsplit=1)[0].strip('"').strip('"')
-            res[name] = a_chunk
-        except IndexError as e:
-            print(f"""
-❌ Error parsing chunk:
-{"-" * 50}
-{a_chunk}
-{"-" * 50}""")
-            raise e
-    return res
 
 
 if __name__ == "__main__":

machineconfig-3.98/src/machineconfig/scripts/python/interactive.py

@@ -0,0 +1,177 @@
+#!/usr/bin/env python3
+"""
+Interactive Machine Configuration Setup Script
+
+A Python version of the interactive installation script that uses questionary
+for better user experience with checkbox selections.
+
+
+# echo # 📧 Thunderbird Setup Note:
+# Run after installing Thunderbird and starting it once:
+# cd ~/AppData/Roaming/ThunderBird/Profiles
+# $res = ls
+# $name = $res[0].Name
+# mv $backup_folder $name
+#
+
+
+"""
+
+import subprocess
+import sys
+
+import questionary
+from questionary import Choice
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+
+
+console = Console()
+
+
+def run_command(command: str, description: str) -> bool:
+    """Execute a shell command and return success status."""
+    console.print(f"\n🔧 {description}", style="bold cyan")
+    try:
+        result = subprocess.run(command, shell=True, check=True, capture_output=False)
+        return result.returncode == 0
+    except subprocess.CalledProcessError as e:
+        console.print(f"❌ Error executing command: {e}", style="bold red")
+        return False
+def display_header() -> None:
+    """Display the script header."""
+    header_text = Text("MACHINE CONFIGURATION", style="bold magenta")
+    subtitle_text = Text("Interactive Installation Script", style="italic cyan")
+    console.print(Panel(f"📦 {header_text}\n{subtitle_text}", border_style="blue", padding=(1, 2)))
+def display_completion_message() -> None:
+    """Display completion message."""
+    completion_text = Text("INSTALLATION COMPLETE", style="bold green")
+    subtitle_text = Text("System setup finished successfully", style="italic green")
+    console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
+def display_dotfiles_instructions() -> None:
+    """Display instructions for dotfiles migration."""
+    header_text = Text("DOTFILES MIGRATION", style="bold yellow")
+    subtitle_text = Text("Configuration transfer options", style="italic yellow")
+
+    instructions = """
+🖱️  [bold blue]Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE[/bold blue]
+    On original machine, run:
+    [dim]cd ~/dotfiles/creds/msc
+    easy-sharing . --password rew --username al[/dim]
+    Then open brave on new machine to get MouseWithoutBorders password
+
+🔐 [bold blue]Method 2: USING SSH[/bold blue]
+    FROM REMOTE, RUN:
+    [dim]fptx ~/dotfiles $USER@$(hostname):^ -z
+    # OR, using IP address if router has not yet found the hostname:
+    fptx ~/dotfiles $USER@$(hostname -I | awk '{print $1}'):^ -z[/dim]
+
+☁️  [bold blue]Method 3: USING INTERNET SECURE SHARE[/bold blue]
+    [dim]cd ~
+    cloud_copy SHARE_URL . --config ss[/dim]
+    (requires symlinks to be created first)"""
+
+    console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
+
+
+def get_installation_choices() -> list[str]:
+    """Get user choices for installation options."""
+    choices = [
+        Choice(value="install_apps", title="📥 Install Apps                    - Install base system applications", checked=False),
+        Choice(value="upgrade_system", title="🔄 Upgrade System Packages        - Update all system packages", checked=False),
+        Choice(value="install_uv_repos", title="🐍 Install Repos                - Set up Python environment and repositories permanently.", checked=False),
+        Choice(value="install_ssh_server", title="🔒 Install SSH Server             - Set up remote access", checked=False),
+        Choice(value="create_symlinks", title="🔗 Create Symlinks                - Set up configuration symlinks (finish dotfiles transfer first)", checked=False),
+        Choice(value="install_cli_apps", title="⚡ Install CLI Apps               - Command-line tools installation", checked=False),
+        Choice(value="install_dev_tools", title="🛠️  Install Development Tools      - rust, libssl-dev, ffmpeg, wezterm, brave, code", checked=False),
+        Choice(value="retrieve_repositories", title="📚 Retrieve Repositories          - Clone repositories to ~/code", checked=False),
+        Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
+        Choice(value="install_ascii_art", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", checked=False),
+    ]
+    selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
+    return selected or []
+
+
+def execute_installations(selected_options: list[str]) -> None:
+    """Execute the selected installation options."""
+    # Always start with VE setup
+    console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Setting up base virtual environment[/italic]", border_style="green"))
+    run_command("curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash", "Setting up base virtual environment")
+
+    if "install_apps" in selected_options:
+        console.print(Panel("📦 [bold blue]APPLICATIONS[/bold blue]\n[italic]Installing base system applications[/italic]", border_style="blue"))
+        from machineconfig import setup_linux as module
+        from pathlib import Path
+        script = Path(module.__file__).parent / "apps.sh"
+        run_command(f"bash {script}", "Installing base system applications")
+
+    if "upgrade_system" in selected_options:
+        console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
+        run_command("sudo nala upgrade -y", "Upgrading system packages")
+
+    if "install_uv_repos" in selected_options:
+        console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
+        from machineconfig import setup_linux as module
+        from pathlib import Path
+        script = Path(module.__file__).parent / "repos.sh"
+        run_command(f"bash {script}", "Setting up Python environment and repositories")
+
+    if "install_ssh_server" in selected_options:
+        console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
+        run_command("sudo nala install openssh-server -y", "Installing SSH server")
+
+    if "create_symlinks" in selected_options:
+        display_dotfiles_instructions()
+        dotfiles_ready = questionary.confirm("📂 Have you finished copying dotfiles?", default=True).ask()
+        if dotfiles_ready:
+            console.print(Panel("🔗 [bold cyan]SYMLINK CREATION[/bold cyan]\n[italic]Configuration setup[/italic]", border_style="cyan"))
+            run_command("uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main_symlinks --choice=all", "Creating symlinks")
+            run_command("sudo chmod 600 $HOME/.ssh/*", "Setting SSH key permissions")
+            run_command("sudo chmod 700 $HOME/.ssh", "Setting SSH directory permissions")
+        else:
+            console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
+
+    if "install_cli_apps" in selected_options:
+        console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
+        run_command("uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=essentials", "Installing CLI applications")
+        run_command(". $HOME/.bashrc", "Reloading bash configuration")
+
+    if "install_dev_tools" in selected_options:
+        console.print(Panel("🛠️  [bold bright_blue]DEVELOPMENT TOOLS[/bold bright_blue]\n[italic]Software development packages[/italic]", border_style="bright_blue"))
+        run_command("(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true", "Installing Rust toolchain")
+        run_command("sudo nala install libssl-dev -y", "Installing libssl-dev")
+        run_command("sudo nala install ffmpeg -y", "Installing ffmpeg")
+        run_command("uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code", "Installing development applications")
+
+    if "retrieve_repositories" in selected_options:
+        console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
+        run_command("repos ~/code --clone --cloud odg1", "Cloning repositories")
+
+    if "retrieve_data" in selected_options:
+        console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))
+        run_command("uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE", "Retrieving backup data")
+
+    if "install_ascii_art" in selected_options:
+        console.print(Panel("🎨 [bold bright_green]ASCII ART[/bold bright_green]\n[italic]Terminal visualization tools[/italic]", border_style="bright_green"))
+        run_command("curl bit.ly/cfgasciiartlinux -L | sudo bash", "Installing ASCII art libraries")
+
+
+def main() -> None:
+    """Main function to run the interactive installation."""
+    display_header()
+    selected_options = get_installation_choices()
+    if not selected_options:
+        console.print("❌ No options selected. Exiting...", style="bold red")
+        sys.exit(0)
+    console.print(f"\n✅ Selected options: {', '.join(selected_options)}", style="bold green")
+    proceed = questionary.confirm("🚀 Proceed with installation?", default=True).ask()
+    if not proceed:
+        console.print("❌ Installation cancelled.", style="bold red")
+        sys.exit(0)
+    execute_installations(selected_options)
+    display_completion_message()
+
+
+if __name__ == "__main__":
+    pass

machineconfig-3.98/src/machineconfig/scripts/python/share_terminal.py

@@ -0,0 +1,104 @@
+
+
+from pathlib import Path
+from typing import Optional, Annotated
+import typer
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from rich.align import Align
+
+
+"""
+uv run --python 3.13 --with machineconfig 
+reference:
+# https://github.com/tsl0922/ttyd/wiki/Serving-web-fonts
+# -t "fontFamily=CaskaydiaCove" bash
+# --terminal-type xterm-kitty
+
+"""
+
+
+def display_terminal_url(local_ip_v4: str, port: int) -> None:
+    """Display a flashy, unmissable terminal URL announcement."""
+    console = Console()
+    
+    # Create the main message with styling
+    url_text = Text(f"http://{local_ip_v4}:{port}", style="bold bright_cyan underline")
+    message = Text.assemble(
+        ("🚀 ", "bright_red"),
+        ("Terminal 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]🌐 WEB TERMINAL READY 🌐[/bold bright_green]",
+        subtitle="[italic bright_yellow]⚡ Click the link above to access your terminal! ⚡[/italic bright_yellow]",
+        border_style="bright_magenta",
+        padding=(1, 2),
+        expand=False
+    )
+    
+    # Print with extra spacing and attention-grabbing elements
+    # console.print("\n" + "🔥" * 60 + "\n", style="bright_red bold")
+    console.print(panel)
+    # 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.scripts.python.devops_devapps_install 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,
+    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for terminal access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None
+) -> None:
+    install_ttyd()
+    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 = 7681  # Default port for ttyd
+
+    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 terminal announcement
+    display_terminal_url(local_ip_v4, port)
+    
+    code = f"""#!/bin/bash
+ttyd --writable -t enableSixel=true --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' bash
+"""
+    import subprocess
+    subprocess.run(code, shell=True, check=True)
+
+
+def main_with_parser():
+    typer.run(main)
+
+
+if __name__ == "__main__":
+    pass

machineconfig-3.98/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo """
+=======================================================================
+📦 MACHINE CONFIGURATION | Interactive Installation Script. Installing uv then getting started.
+======================================================================="""
+
+curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops ia

{machineconfig-3.96 → machineconfig-3.98}/src/machineconfig/utils/installer.py

@@ -1,13 +1,13 @@
 """package manager"""
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_CATEGORY, InstallerData, InstallerDataFiles, get_normalized_arch, get_os_name, OPERATING_SYSTEMS, CPU_ARCHITECTURES
 from rich.console import Console
-from rich.panel import Panel  # Added import
+from rich.panel import Panel
 
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT
+from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT, LINUX_INSTALL_PATH
 from machineconfig.utils.io import read_json
 
 from typing import Any
@@ -38,7 +38,7 @@ def check_latest():
         repo_url = inst.installer_data.get("repoURL", "")
         print(f"🔎 Checking {exe_name}...")
         _release_url, version_to_be_installed = inst.get_github_release(repo_url=repo_url, version=None)
-        verdict, current_ver, new_ver = inst.check_if_installed_already(exe_name=exe_name, version=version_to_be_installed, use_cache=False)
+        verdict, current_ver, new_ver = check_if_installed_already(exe_name=exe_name, version=version_to_be_installed, use_cache=False)
         return exe_name, verdict, current_ver, new_ver
 
     print("\n⏳ Processing installers...\n")
@@ -188,5 +188,4 @@ def install_all(installers: list[Installer], safe: bool = False, jobs: int = 10,
     print("\n" * 2)
 
 
-if __name__ == "__main__":
-    pass
+