machineconfig 3.97__py3-none-any.whl → 3.98__py3-none-any.whl

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/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/scripts/python/interactive.py

@@ -39,36 +39,23 @@ def run_command(command: str, description: str) -> bool:
     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)
-    ))
-
-
+    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)
-    ))
-
-
+    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]
+
+    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]
@@ -84,172 +71,105 @@ def display_dotfiles_instructions() -> None:
     [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)
-    ))
+
+    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 UV and Repos           - Set up Python environment and repositories", 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="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),
+        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()
-    
+    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"
-    )
-    
+    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"
-        ))
-        run_command(
-            "curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash",
-            "Installing base system applications"
-        )
-    
+        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"
-        ))
+        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"
-        ))
-        run_command(
-            "curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash",
-            "Setting up Python environment and repositories"
-        )
-    
+        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"
-        ))
+        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")
-    
-    # Always display dotfiles instructions if symlinks are selected
+
     if "create_symlinks" in selected_options:
         display_dotfiles_instructions()
-        
-        dotfiles_ready = questionary.confirm(
-            "📂 Have you finished copying dotfiles?", 
-            default=True
-        ).ask()
-        
+        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"
-            )
+            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"
-        )
+        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"
-        )
+        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"
-        )
-    
+        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"
-        ))
+        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"
-        )
-    
+        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"
-        ))
+        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()    
+    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()    
+    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)    
+    execute_installations(selected_options)
     display_completion_message()
 
 

machineconfig/scripts/python/share_terminal.py

@@ -1,7 +1,7 @@
 
 
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Annotated
 import typer
 from rich.console import Console
 from rich.panel import Panel
@@ -43,12 +43,33 @@ def display_terminal_url(local_ip_v4: str, port: int) -> None:
     )
     
     # Print with extra spacing and attention-grabbing elements
-    console.print("\n" + "🔥" * 60 + "\n", style="bright_red bold")
+    # console.print("\n" + "🔥" * 60 + "\n", style="bright_red bold")
     console.print(panel)
-    console.print("🔥" * 60 + "\n", style="bright_red bold")
-
-
-def main(port: Optional[int]=None, password: Optional[str]=None) -> None:
+    # 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():
@@ -67,11 +88,9 @@ def main(port: Optional[int]=None, password: Optional[str]=None) -> None:
 
     # Display the flashy terminal announcement
     display_terminal_url(local_ip_v4, port)
-
-    code = f"""
-#!/bin/bash
-uv run --python 3.13 --with machineconfig install -ttyd
-ttyd --writable -t enableSixel=true --port {port} --credential "$USER:{password}" -t 'theme={"background": "black"}' bash
+    
+    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)

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -2,57 +2,8 @@
 
 echo """
 =======================================================================
-📦 MACHINE CONFIGURATION | Interactive Installation Script
+📦 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 ia
-
-
-
-
-echo """#=======================================================================
-📂 DOTFILES MIGRATION | Configuration transfer options
-#=======================================================================
-
-🖱️  Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE
-    On original machine, run:
-    cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew --username al
-    Then open brave on new machine to get MouseWithoutBorders password
-
-🔐 Method 2: USING SSH
-    FROM REMOTE, RUN:
-    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
-
-☁️  Method 3: USING INTERNET SECURE SHARE
-    cd ~
-    cloud_copy SHARE_URL . --config ss
-    (requires symlinks to be created first)
-"""
-
-echo """#=======================================================================
-📂 DOTFILES STATUS | Configuration files check
-#=======================================================================
-"""
-read -p "📂 Have you finished copying dotfiles? [y]/n? " choice
-
-echo """#=======================================================================
-🔗 SYMLINK CREATION | Configuration setup
-#=======================================================================
-"""
-read -p "🔗 Create Symlinks (finish dotfiles transfer first) [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Creating symlinks and setting permissions...
-    """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main_symlinks --choice=all
-    sudo chmod 600 $HOME/.ssh/*
-    sudo chmod 700 $HOME/.ssh
-else
-    echo """    ⏭️  Skipping symlink creation
-    """
-fi
-
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops ia

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
+

machineconfig/utils/installer_utils/installer_abc.py

@@ -1,7 +1,11 @@
+
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
-from typing import Optional
+from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH, INSTALL_VERSION_ROOT
+
+from pathlib import Path
+from typing import Any, Optional
 import subprocess
+import platform
 
 
 def find_move_delete_windows(downloaded_file_path: PathExtended, exe_name: Optional[str] = None, delete: bool = True, rename_to: Optional[str] = None):
@@ -106,3 +110,104 @@ def find_move_delete_linux(downloaded: PathExtended, tool_name: str, delete: Opt
     exe_new_location = PathExtended(LINUX_INSTALL_PATH).joinpath(exe.name)
     print(f"✅ Executable installed at: {exe_new_location}\n{'=' * 80}")
     return exe_new_location
+
+
+def check_tool_exists(tool_name: str) -> bool:
+    if platform.system() == "Windows":
+        tool_name = tool_name.replace(".exe", "") + ".exe"
+        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        tool_name = tool_name.replace(".exe", "") + ".exe"
+        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        return res1 or res2
+    elif platform.system() in ["Linux", "Darwin"]:
+        root_path = Path(LINUX_INSTALL_PATH)
+        return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
+    else:
+        raise NotImplementedError(f"platform {platform.system()} not implemented")
+
+
+def check_if_installed_already(exe_name: str, version: Optional[str], use_cache: bool) -> tuple[str, str, str]:
+    print(f"\n{'=' * 80}\n🔍 CHECKING INSTALLATION STATUS: {exe_name} 🔍\n{'=' * 80}")
+    INSTALL_VERSION_ROOT.joinpath(exe_name).parent.mkdir(parents=True, exist_ok=True)
+    tmp_path = INSTALL_VERSION_ROOT.joinpath(exe_name)
+
+    if use_cache:
+        print("🗂️  Using cached version information...")
+        if tmp_path.exists():
+            existing_version = tmp_path.read_text(encoding="utf-8").rstrip()
+            print(f"📄 Found cached version: {existing_version}")
+        else:
+            existing_version = None
+            print("ℹ️  No cached version information found")
+    else:
+        print("🔍 Checking installed version directly...")
+        result = subprocess.run([exe_name, "--version"], check=False, capture_output=True, text=True)
+        if result.stdout.strip() == "":
+            existing_version = None
+            print("ℹ️  Could not detect installed version")
+        else:
+            existing_version = result.stdout.strip()
+            print(f"📄 Detected installed version: {existing_version}")
+
+    if existing_version is not None and version is not None:
+        if existing_version == version:
+            print(f"✅ {exe_name} is up to date (version {version})")
+            print(f"📂 Version information stored at: {INSTALL_VERSION_ROOT}")
+            return ("✅ Up to date", version.strip(), version.strip())
+        else:
+            print(f"🔄 {exe_name} needs update: {existing_version.rstrip()} → {version}")
+            tmp_path.write_text(version, encoding="utf-8")
+            return ("❌ Outdated", existing_version.strip(), version.strip())
+    else:
+        print(f"📦 {exe_name} is not installed. Will install version: {version}")
+        # tmp_path.write_text(version, encoding="utf-8")
+
+    print(f"{'=' * 80}")
+    return ("⚠️ NotInstalled", "None", version or "unknown")
+
+
+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

machineconfig/utils/installer_utils/installer_class.py

@@ -1,7 +1,7 @@
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.installer_utils.installer_abc import find_move_delete_linux, find_move_delete_windows
 from machineconfig.utils.source_of_truth import INSTALL_TMP_DIR, INSTALL_VERSION_ROOT, LIBRARY_ROOT
-from machineconfig.utils.options import check_tool_exists
+from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
 from machineconfig.utils.io import read_json
 from machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles, get_os_name, get_normalized_arch
 
@@ -356,43 +356,3 @@ class Installer:
                 return None, None
         browser_download_url = f"{repo_url}/releases/download/{actual_version}/{filename}"
         return browser_download_url, actual_version
-
-    @staticmethod
-    def check_if_installed_already(exe_name: str, version: Optional[str], use_cache: bool) -> tuple[str, str, str]:
-        print(f"\n{'=' * 80}\n🔍 CHECKING INSTALLATION STATUS: {exe_name} 🔍\n{'=' * 80}")
-        INSTALL_VERSION_ROOT.joinpath(exe_name).parent.mkdir(parents=True, exist_ok=True)
-        tmp_path = INSTALL_VERSION_ROOT.joinpath(exe_name)
-
-        if use_cache:
-            print("🗂️  Using cached version information...")
-            if tmp_path.exists():
-                existing_version = tmp_path.read_text(encoding="utf-8").rstrip()
-                print(f"📄 Found cached version: {existing_version}")
-            else:
-                existing_version = None
-                print("ℹ️  No cached version information found")
-        else:
-            print("🔍 Checking installed version directly...")
-            result = subprocess.run([exe_name, "--version"], check=False, capture_output=True, text=True)
-            if result.stdout.strip() == "":
-                existing_version = None
-                print("ℹ️  Could not detect installed version")
-            else:
-                existing_version = result.stdout.strip()
-                print(f"📄 Detected installed version: {existing_version}")
-
-        if existing_version is not None and version is not None:
-            if existing_version == version:
-                print(f"✅ {exe_name} is up to date (version {version})")
-                print(f"📂 Version information stored at: {INSTALL_VERSION_ROOT}")
-                return ("✅ Up to date", version.strip(), version.strip())
-            else:
-                print(f"🔄 {exe_name} needs update: {existing_version.rstrip()} → {version}")
-                tmp_path.write_text(version, encoding="utf-8")
-                return ("❌ Outdated", existing_version.strip(), version.strip())
-        else:
-            print(f"📦 {exe_name} is not installed. Will install version: {version}")
-            # tmp_path.write_text(version, encoding="utf-8")
-
-        print(f"{'=' * 80}")
-        return ("⚠️ NotInstalled", "None", version or "unknown")

machineconfig/utils/options.py

@@ -1,25 +1,12 @@
 from pathlib import Path
+from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
 from rich.text import Text
 from rich.panel import Panel
 from rich.console import Console
-import platform
 import subprocess
 from typing import Optional, Union, Iterable, overload, Literal
-from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
-
-
-def check_tool_exists(tool_name: str) -> bool:
-    if platform.system() == "Windows":
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        return res1 or res2
-    elif platform.system() in ["Linux", "Darwin"]:
-        root_path = Path(LINUX_INSTALL_PATH)
-        return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
-    else:
-        raise NotImplementedError(f"platform {platform.system()} not implemented")
+
+
     # _ = cmd
     #     cmd = "where.exe"
     #     cmd = "which"

{machineconfig-3.97.dist-info → machineconfig-3.98.dist-info}/METADATA

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

{machineconfig-3.97.dist-info → machineconfig-3.98.dist-info}/RECORD

@@ -144,11 +144,11 @@ machineconfig/scripts/python/cloud_mount.py,sha256=RFMzRUep2D5HtVXANIi-pab3EkI-W
 machineconfig/scripts/python/cloud_repo_sync.py,sha256=GBhdUu9BJwhLYmhxxtvqJGLy7xKdQcnH9kkL4jcbzEE,9502
 machineconfig/scripts/python/cloud_sync.py,sha256=RWGpAfJ9fnN18yNBSgN44dzA38Hmd4879JL5r2pcyrM,3514
 machineconfig/scripts/python/croshell.py,sha256=shv0FmFfD2Br0EVE-zvpt4i5Tl8kliLlIvxkx0umGiA,8954
-machineconfig/scripts/python/devops.py,sha256=NuCnXAyJ3VDx-wUO7CLvSDbqFiyMqxCb3_XINAcLe0I,6862
+machineconfig/scripts/python/devops.py,sha256=qjBXv6x-7mfJRPyLfGNzcadGBpoHoxWaZFTJCqx0DS4,4554
 machineconfig/scripts/python/devops_add_identity.py,sha256=JfN3ZrYMCgmt4ks_VCfnV9BIIHAsOYO3E0W0wZ15FR8,3791
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=KaoX83KltBsmutfKhSfZjd7nP_R1hJ2OLAWRhbswO7o,6889
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jZe5Vki7E2GCMG8hvqUZeOONFC4cNzISoGzq_dMG4GA,5601
-machineconfig/scripts/python/devops_devapps_install.py,sha256=utqZdXD_2i9ZpOhgwgQAPTAhbXiop8xZCOk5eifWnuw,10850
+machineconfig/scripts/python/devops_devapps_install.py,sha256=Oe8u6_EurEltEtJagcuapz-G3DyZdRyWqQ8kSEp-zHQ,8911
 machineconfig/scripts/python/devops_update_repos.py,sha256=c5qBc9cuTGDEqDHufkjDT4d_vvJsswv3tlqk9MAulYk,8063
 machineconfig/scripts/python/dotfile.py,sha256=SRcX-9Ak1jRvF-killBTTm2IWcsNxfiLucH6ZsytAFA,2202
 machineconfig/scripts/python/fire_agents.py,sha256=IpglbN30zJ1jIBzHNCR2LmPULoIdFaj2M0JBsEfZEZg,9216
@@ -162,7 +162,7 @@ machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_
 machineconfig/scripts/python/ftpx.py,sha256=l_gdJS0QB2wVZErubtZvm4HJD9HZAJxSP68sbY73xwo,10278
 machineconfig/scripts/python/get_zellij_cmd.py,sha256=e35-18hoXM9N3PFbvbizfkNY_-63iMicieWE3TbGcCQ,576
 machineconfig/scripts/python/gh_models.py,sha256=3BLfW25mBRiPO5VKtVm-nMlKLv-PaZDw7mObajq6F6M,5538
-machineconfig/scripts/python/interactive.py,sha256=wSGhhsVFFLd8ElaPqaLJzKgUoYolkvAVFk9I8oTptlk,11079
+machineconfig/scripts/python/interactive.py,sha256=qGcvn8XXCkck1xidcEFqPGBawgiEJXctwQqd_-dhRIQ,10162
 machineconfig/scripts/python/mount_nfs.py,sha256=c8pWXimDWdgCkSskcnPgT-8ESPosil6Cvy2hGSaIBJE,3359
 machineconfig/scripts/python/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lDkuliVpPV5_uBTVVhXtjQ,1550
 machineconfig/scripts/python/mount_ssh.py,sha256=rGY2pgtlnWMi0Rrge1aCdjtfbULrj2cyaStDoX-y2w4,2236
@@ -174,7 +174,7 @@ machineconfig/scripts/python/repos_helper_clone.py,sha256=xW5YZEoNt3k7h9NIULhUhO
 machineconfig/scripts/python/repos_helper_record.py,sha256=YEEQORfEiLddOIIgePo5eEkyQUFruFg3kc8npMvRL-o,10927
 machineconfig/scripts/python/repos_helper_update.py,sha256=AYyKIB7eQ48yoYmFjydIhRI1lV39TBv_S4_LCa-oKuQ,11042
 machineconfig/scripts/python/scheduler.py,sha256=rKhssuxkD697EY6qaV6CSdNhxpAQLDWO4fE8GMCQ9FA,3061
-machineconfig/scripts/python/share_terminal.py,sha256=QkzxEqvGZG29heiFByB4JrT21UvG8qyYhwG2JIgR_hw,2551
+machineconfig/scripts/python/share_terminal.py,sha256=3d0tOjAiXbonuJprHitoUmyU4zVLnexQGdTNs1-5qq0,3455
 machineconfig/scripts/python/snapshot.py,sha256=aDvKeoniZaeTSNv9zWBUajaj2yagAxVdfuvO1_tgq5Y,1026
 machineconfig/scripts/python/start_slidev.py,sha256=U5ujAL7R5Gd5CzFReTsnF2SThjY91aFBg0Qz_MMl6U4,4573
 machineconfig/scripts/python/start_terminals.py,sha256=DRWbMZumhPmL0DvvsCsbRNFL5AVQn1SgaziafTio3YQ,6149
@@ -353,13 +353,14 @@ machineconfig/settings/zellij/layouts/panes.kdl,sha256=KlhKtelBy4Z2ENV_pix4xE7NH
 machineconfig/settings/zellij/layouts/st.kdl,sha256=QXLRK7Wx05aKbKRHVmm4RspLYzPmEa44JMK1TwXQk58,523
 machineconfig/settings/zellij/layouts/st2.kdl,sha256=1FKTH3qQWYMWp_wPMreP7fKOTlVd4cfBy3J8fv4zCBc,1489
 machineconfig/settings/zellij/layouts/stacked_panes.kdl,sha256=usY8kKKwX1KUMXnWDivPg0i0drpM1Biw-tOnNZVjiZU,163
+machineconfig/setup_linux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_linux/nix/cli_installation.sh,sha256=AQ_wRmldeD1tPqCmU7qgz9ZrZFly4OYwBJDGRpb9IJ0,5470
 machineconfig/setup_linux/others/mint_keyboard_shortcuts.sh,sha256=F5dbg0n9RHsKGPn8fIdZMn3p0RrHEkb8rWBGsdVGbus,1207
 machineconfig/setup_linux/others/openssh-server_add_pub_key.sh,sha256=UiJcD1o4UekKKtp5YJKRq135PpqdTLXy7M6HvQ-Qum4,1993
 machineconfig/setup_linux/web_shortcuts/android.sh,sha256=gzep6bBhK7FCBvGcXK0fdJCtkSfBOftt0aFyDZq_eMs,68
 machineconfig/setup_linux/web_shortcuts/ascii_art.sh,sha256=RWcxH_Db7WHH37PclYmc92o6zAS557wGZxcYTuyTUZ0,3550
 machineconfig/setup_linux/web_shortcuts/croshell.sh,sha256=X9-B1cVptbaFWaWTA-2ELNQx_2ktxu7ZVe48RvpCmkU,316
-machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=DOv0iYsDgavKrBkzTZm6hcuwfYok_isg6KDNr5h3fjk,2178
+machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=o_rw_1lVKU7dazJ4ST58ZbaDwZ6FGLRyTD-yI2dBShk,454
 machineconfig/setup_linux/web_shortcuts/ssh.sh,sha256=k6BAY-zAWsi1beOMiZODxw4VOjZCTABZu__gxSET1eU,1924
 machineconfig/setup_windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/others/docker.ps1,sha256=M8NfsSxH8YlmY92J4rSe1xWOwTW8IFrdgb8cI8Riu2E,311
@@ -374,11 +375,11 @@ machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=rZZJamy3YxAeJh
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/accessories.py,sha256=W_9dLzjwNTW5JQk_pe3B2ijQ1nA2-8Kdg2r7VBtzgQs,4340
 machineconfig/utils/code.py,sha256=pKPHInKgXJWeACVbxuE7sMdYeZCbNttaYCsfonGhFfc,4464
-machineconfig/utils/installer.py,sha256=N8Vg5P7SEwIZdjSNbwrocIOv1l2_D3pdNIG3zdzJ2iQ,8982
+machineconfig/utils/installer.py,sha256=Cfu0arQ-QE2TfDThP5Bb5HHpDA7kHlsWpAqGFrTA8c0,8954
 machineconfig/utils/io.py,sha256=ZXB3aataS1IZ_0WMcCRSmoN1nbkvEO-bWYcs-TpngqU,2872
 machineconfig/utils/links.py,sha256=riNUrG8aGElRszdOPOic4M2AyOcpdcth_-y8JEiZpJ4,10253
 machineconfig/utils/notifications.py,sha256=vvdsY5IX6XEiILTnt5lNyHxhCi0ljdGX2T_67VRfrG4,9009
-machineconfig/utils/options.py,sha256=aEFeVbHfbX0d3VjjZcUAQA0jSOsKhKhr7P0kGHYhPd0,9284
+machineconfig/utils/options.py,sha256=8pG-apcc28xxJ5BQiACsGNTKwWtkQyH3hCtzBEhokK8,8366
 machineconfig/utils/path_extended.py,sha256=nTETtTxzNaxdrapIH3WzkR__b-1k6Lx7SpRAXqmIJN4,51793
 machineconfig/utils/path_helper.py,sha256=jqOf3TAlw5cqSp4HBAlOqjAR_bzC8_fvjA-_-CooI6Y,8030
 machineconfig/utils/procs.py,sha256=KjEbrwfbdoi5IBM518scxMDVi7NxTZLHuYiKmwdGlzg,11393
@@ -395,14 +396,14 @@ machineconfig/utils/cloud/onedrive/setup_oauth.py,sha256=ZTVkqgrwbV_EoPvyT8dyOTU
 machineconfig/utils/cloud/onedrive/transaction.py,sha256=m-aNcnWj_gfZVvJOSpkdIqjZxU_3nXx2CA-qKbQgP3I,26232
 machineconfig/utils/installer_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/installer_utils/github_release_bulk.py,sha256=vK5WJ-a566egAIEHdKsn3iOAh5LBqeY4zPDHPgqHVcE,6887
-machineconfig/utils/installer_utils/installer_abc.py,sha256=iB1_PZLQGouCdEA8bixdB4kZAQ2OnPqZeRcwaf4LzuI,5178
-machineconfig/utils/installer_utils/installer_class.py,sha256=Pvaz8n8BEBZMVzXyNprVN9djVkx8Qp-0WwR61BQ1eRc,22388
+machineconfig/utils/installer_utils/installer_abc.py,sha256=6lN_luAmyiPnncD9o-TjRQBYZHCwdrLU8V9eFp9eZBc,9549
+machineconfig/utils/installer_utils/installer_class.py,sha256=6IQswaC9mxIdeaMG-rOt-vqyKGYibBRMvC0UglZ_3mI,20268
 machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=CCs5ebomW1acKWZRpv9dyDzM-W6pwvVplikcutE2D8I,2339
 machineconfig/utils/schemas/installer/installer_types.py,sha256=DLagmIe0G5-xg7HZ9VrlFCDk1gIbwvX7O4gZjwq0wh0,1326
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=M1ZFCz_kjRZPhxM19rIYUDR5lDDpwa09odR_ihtIFq0,1932
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-3.97.dist-info/METADATA,sha256=41d56Jx9vgeCV42fom4BZPQrRIj-yV3CRoMJondht1c,7032
-machineconfig-3.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-3.97.dist-info/entry_points.txt,sha256=94GY2PC5gimDHncsCsa2RM-xDRVbWsp8a01p4YGDb2M,1282
-machineconfig-3.97.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-3.97.dist-info/RECORD,,
+machineconfig-3.98.dist-info/METADATA,sha256=Lp-8scw6tGrHgQ7ENdFL1_uwZYhb2pT3V6P87zYmWtc,7032
+machineconfig-3.98.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-3.98.dist-info/entry_points.txt,sha256=c6ea0waVseT1rbfz1bw3k-eph2yVaB67x9hx64Mpvfs,1066
+machineconfig-3.98.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-3.98.dist-info/RECORD,,

{machineconfig-3.97.dist-info → machineconfig-3.98.dist-info}/entry_points.txt

@@ -5,17 +5,14 @@ cloud_mount = machineconfig.scripts.python.cloud_mount:arg_parser
 cloud_repo_sync = machineconfig.scripts.python.cloud_repo_sync:args_parser
 cloud_sync = machineconfig.scripts.python.cloud_sync:arg_parser
 croshell = machineconfig.scripts.python.croshell:arg_parser
-devops = machineconfig.scripts.python.devops:args_parser
+devops = machineconfig.scripts.python.devops:app
 fire = machineconfig.scripts.python.fire_jobs:main_from_parser
 fire_agents = machineconfig.scripts.python.fire_agents:main
 ftpx = machineconfig.scripts.python.ftpx:main_from_parser
-ia = machineconfig.scripts.python.interactive:main
 initai = machineconfig.scripts.python.ai.initai:main
-install = machineconfig.scripts.python.devops_devapps_install:main_with_parser
 kill_process = machineconfig.utils.procs:main
 mount_nfs = machineconfig.scripts.python.mount_nfs:main
 mount_nw_drive = machineconfig.scripts.python.mount_nw_drive:main
 repos = machineconfig.scripts.python.repos:main_from_parser
-share_terminal = machineconfig.scripts.python.share_terminal:main_with_parser
 start_slidev = machineconfig.scripts.python.start_slidev:arg_parser
 wifi_conn = machineconfig.scripts.python.wifi_conn:arg_parser