machineconfig 4.8__py3-none-any.whl → 4.91__py3-none-any.whl

machineconfig/scripts/python/interactive.py

@@ -21,6 +21,7 @@ import subprocess
 import sys
 from pathlib import Path
 from platform import system
+from typing import cast
 
 import questionary
 from questionary import Choice
@@ -29,6 +30,7 @@ from rich.panel import Panel
 from rich.text import Text
 
 
+_ = cast
 console = Console()
 
 
@@ -81,24 +83,7 @@ def install_windows_desktop_apps() -> bool:
     """Install Windows desktop applications using winget."""
     if system() != "Windows":
         console.print("❌ This function is only available on Windows systems.", style="bold red")
-        return False
-    
-    console.print(Panel("💻 [bold cyan]WINDOWS DESKTOP APPS[/bold cyan]\n[italic]Installing Brave, Windows Terminal, PowerShell, and VSCode[/italic]", border_style="cyan"))
-    
-    # Install winget applications
-    winget_commands = [
-        ('winget install --no-upgrade --name "Windows Terminal" --Id "Microsoft.WindowsTerminal" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Windows Terminal"),
-        ('winget install --no-upgrade --name "Powershell" --Id "Microsoft.PowerShell" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing PowerShell"),
-        ('winget install --no-upgrade --name "Brave" --Id "Brave.Brave" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Brave Browser"),
-        ('winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Visual Studio Code"),
-    ]
-    
-    success = True
-    for command, description in winget_commands:
-        if not run_command(command, description):
-            success = False
-    
-    # Install Nerd Fonts via Python
+        return False   
     console.print("🔧 Installing Nerd Fonts", style="bold cyan")
     try:
         from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
@@ -106,34 +91,29 @@ def install_windows_desktop_apps() -> bool:
         console.print("✅ Nerd Fonts installed successfully", style="bold green")
     except Exception as e:
         console.print(f"❌ Error installing Nerd Fonts: {e}", style="bold red")
-        success = False
-    
-    # Set Windows Terminal settings via Python
     console.print("🔧 Setting Windows Terminal settings", style="bold cyan")
     try:
         from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
         set_wt_settings_main()
         console.print("✅ Windows Terminal settings configured successfully", style="bold green")
     except Exception as e:
-        console.print(f"❌ Error setting Windows Terminal settings: {e}", style="bold red")
-        success = False
-    
-    return success
+        console.print(f"❌ Error setting Windows Terminal settings: {e}", style="bold red")    
+    return True
 
 
 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="ESSENTIAL_SYSTEM", title="📥 Install Apps                    - Install base system applications", checked=False),
+        Choice(value="ESSENTIAL", title="⚡ Install CLI Apps               - Command-line tools installation", checked=False),
+        Choice(value="DEV_SYSTEM", title="🛠️  Install Development Tools      - rust, libssl-dev, ffmpeg, wezterm, brave, code", checked=False),
+        Choice(value="TerminalEyeCandy", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", checked=False),
+        Choice(value="install_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),
     ]
     # Add Windows-specific options
     if system() == "Windows":
@@ -148,24 +128,28 @@ def execute_installations(selected_options: list[str]) -> None:
     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"))
-        if system() == "Windows":
-            # Windows: Use PowerShell to execute local apps.ps1 script
-            from machineconfig import setup_windows as module
-            script = Path(module.__file__).parent / "apps.ps1"
-            run_command(f'powershell -ExecutionPolicy Bypass -File "{script}"', "Installing Windows applications")
-        else:
-            # Linux: Use existing bash script approach
-            from machineconfig import setup_linux as module
-            script = Path(module.__file__).parent / "apps.sh"
-            run_command(f"bash {script}", "Installing Linux base system applications")
+    for maybe_a_group in selected_options:
+        if maybe_a_group in ("ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM", "TerminalEyeCandy"):
+            console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
+            console.print("🔧 Installing CLI applications", style="bold cyan")
+            try:
+                from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
+                # maybe_a_group = cast(PA, maybe_a_group)
+                devops_devapps_install_main(group=maybe_a_group)  # type: ignore
+                console.print("✅ CLI applications installed successfully", style="bold green")
+            except Exception as e:
+                console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
+            run_command(". $HOME/.bashrc", "Reloading bash configuration")
 
     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:
+        if system() == "Windows":
+            console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
+        elif system() == "Linux":
+            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")
+        else:
+            console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
+    if "install_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
         script = Path(module.__file__).parent / "repos.sh"
@@ -199,30 +183,6 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         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"))
-        console.print("🔧 Installing CLI applications", style="bold cyan")
-        try:
-            from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
-            devops_devapps_install_main(which="essentials")
-            console.print("✅ CLI applications installed successfully", style="bold green")
-        except Exception as e:
-            console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
-        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")
-        console.print("🔧 Installing development applications", style="bold cyan")
-        try:
-            from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
-            devops_devapps_install_main(which="wezterm,brave,code")
-            console.print("✅ Development applications installed successfully", style="bold green")
-        except Exception as e:
-            console.print(f"❌ Error installing development applications: {e}", style="bold red")
-
     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"))
         from machineconfig.scripts.python import repos as module
@@ -238,12 +198,6 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
 
-    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"))
-        from machineconfig import setup_linux as module
-        script = Path(module.__file__).parent / "web_shortcuts" / "ascii_art.sh"
-        run_command(f"bash {script}", "Installing ASCII art libraries")
-
     if "install_windows_desktop" in selected_options:
         install_windows_desktop_apps()
 

machineconfig/scripts/python/{fire_jobs_layout_helper.py → sessions.py}

@@ -127,5 +127,12 @@ def launch(layout_path: str = typer.Argument(..., help="Path to the layout.json
         print(f"❌ Unsupported platform: {platform.system()}")
 
 
+def main_from_parser():
+    layouts_app = typer.Typer(help="Layouts management subcommands")
+    layouts_app.command("launch")(launch)
+    layouts_app.command("load-balance")(load_balance)
+    return layouts_app()
+
+
 if __name__ == "__main__":
     from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig

machineconfig/utils/installer.py

@@ -1,13 +1,15 @@
 """package manager"""
 
-from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already
+from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already, parse_apps_installer_linux, parse_apps_installer_windows
+
 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 machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles, get_normalized_arch, get_os_name, OPERATING_SYSTEMS, CPU_ARCHITECTURES
+from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS, PACKAGE_GROUP2NAMES
 from rich.console import Console
 from rich.panel import Panel
 
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT, LINUX_INSTALL_PATH
+from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT, LINUX_INSTALL_PATH, LIBRARY_ROOT
 from machineconfig.utils.io import read_json
 
 from typing import Any
@@ -18,7 +20,7 @@ from joblib import Parallel, delayed
 def check_latest():
     console = Console()  # Added console initialization
     console.print(Panel("🔍  CHECKING FOR LATEST VERSIONS", title="Status", expand=False))  # Replaced print with Panel
-    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
+    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["ESSENTIAL"])
     installers_github = []
     for inst__ in installers:
         app_name = inst__["appName"]
@@ -91,30 +93,52 @@ def get_installed_cli_apps():
     return apps
 
 
-def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: list[APP_INSTALLER_CATEGORY]) -> list[InstallerData]:
+def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: list[PACKAGE_GROUPS]) -> list[InstallerData]:
     print(f"\n{'=' * 80}\n🔍 LOADING INSTALLER CONFIGURATIONS 🔍\n{'=' * 80}")
-    res_all = get_all_installer_data_files(which_cats=which_cats)
+    res_all = get_all_installer_data_files()
+    acceptable_apps_names: list[str] = []
+    for cat in which_cats:
+        acceptable_apps_names += PACKAGE_GROUP2NAMES[cat]
     all_installers: list[InstallerData] = []
-    for _category, installer_data_files in res_all.items():
-        suitable_installers = []
-        for an_installer in installer_data_files["installers"]:
-            if an_installer["fileNamePattern"][arch][os] is None:
+    for installer_data in res_all:
+        if installer_data["appName"] in acceptable_apps_names:
+            if installer_data["fileNamePattern"][arch][os] is None:
                 continue
-            suitable_installers.append(an_installer)
-        all_installers.extend(suitable_installers)
+            all_installers.append(installer_data)
     print(f"✅ Loaded {len(all_installers)} installer configurations\n{'=' * 80}")
     return all_installers
 
 
-def get_all_installer_data_files(which_cats: list[APP_INSTALLER_CATEGORY]) -> dict[APP_INSTALLER_CATEGORY, InstallerDataFiles]:
+def get_all_installer_data_files() -> list[InstallerData]:
     print(f"\n{'=' * 80}\n📂 LOADING CONFIGURATION FILES 📂\n{'=' * 80}")
     import machineconfig.jobs.installer as module
     from pathlib import Path
     print("📂 Loading configuration files...")
-    res_final: dict[APP_INSTALLER_CATEGORY, InstallerDataFiles] = {key: read_json(Path(module.__file__).parent.joinpath(f"packages_{key.lower()}.json")) for key in which_cats}
+    res_raw: InstallerDataFiles = read_json(Path(module.__file__).parent.joinpath("installer_data.json"))
+    res_final: list[InstallerData] = res_raw["installers"]
     print(f"Loaded: {len(res_final)} installer categories")
-    for k, v in res_final.items():
-        print(f" - {k}: {len(v['installers'])} items")
+    return res_final
+
+
+def get_installers_system_groups():
+    res_final: list[InstallerData] = []
+    from platform import system
+    if system() == "Windows":
+        options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
+    elif system() == "Linux" or system() == "Darwin":
+        options_system = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text(encoding="utf-8"))
+    else:
+        raise NotImplementedError(f"❌ System {system()} not supported")
+    os_name = get_os_name()
+    for group_name, (docs, script) in options_system.items():
+        item: InstallerData = {
+            "appName": group_name,
+            "doc": docs,
+            "repoURL": "CMD",
+            "fileNamePattern": {
+                "amd64": {os_name: script,},
+                "arm64": {os_name: script,},}}
+        res_final.append(item)  
     return res_final
 
 

machineconfig/utils/installer_utils/github_release_bulk.py

@@ -109,8 +109,7 @@ def main() -> None:
     current_dir = Path(__file__).parent
     installer_dir = current_dir.parent.parent / "jobs" / "installer"
     
-    standard_json = installer_dir / "packages_standard.json"
-    dev_json = installer_dir / "packages_dev.json"
+    standard_json = installer_dir / "installer_data.json"
     output_json = current_dir / "github_releases.json"
     
     print("🔍 Starting GitHub release data extraction...")
@@ -125,16 +124,7 @@ def main() -> None:
         all_github_repos.update(repos)
         print(f"   Found {len(repos)} GitHub repos")
     else:
-        print(f"⚠️  File not found: {standard_json}")
-        
-    if dev_json.exists():
-        print(f"📄 Reading {dev_json.name}...")
-        repos = extract_github_repos_from_json(dev_json)
-        all_github_repos.update(repos)
-        print(f"   Found {len(repos)} GitHub repos")
-    else:
-        print(f"⚠️  File not found: {dev_json}")
-    
+        print(f"⚠️  File not found: {standard_json}")    
     print(f"🎯 Total unique GitHub repositories found: {len(all_github_repos)}")
     
     if not all_github_repos:

machineconfig/utils/installer_utils/installer_abc.py

@@ -3,7 +3,7 @@ from machineconfig.utils.path_extended import PathExtended as PathExtended
 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
+from typing import Optional
 import subprocess
 import platform
 
@@ -166,75 +166,71 @@ def check_if_installed_already(exe_name: str, version: Optional[str], use_cache:
     return ("⚠️ NotInstalled", "None", version or "unknown")
 
 
-def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
+def parse_apps_installer_linux(txt: str) -> dict[str, tuple[str, str]]:
     """Parse Linux shell installation scripts into logical chunks.
     
-    Supports two formats:
-    1. Legacy format with 'yes '' | sed 3q; echo "----------------------------- installing' delimiter
-    2. New format with # --BLOCK:<name>-- comment signatures
+    Splits scripts by # --GROUP:<name>:<description> comment signatures into a dictionary
+    mapping block names to (description, shell script content) tuples.
     
     Returns:
-        dict[str, str]: Dictionary mapping block/section names to their installation scripts
+        dict[str, tuple[str, str]]: Dictionary mapping block/section names to (description, installation_script) tuples
     """
-    # Try new block format first
-    if "# --BLOCK:" in txt:
-        import re
-        # Split by block signatures: # --BLOCK:<name>--
-        blocks = re.split(r'# --BLOCK:([^-]+)--', txt)
-        res: dict[str, str] = {}
+    chunks = txt.split('# --GROUP:')
+    res: dict[str, tuple[str, str]] = {}
+    
+    for chunk in chunks[1:]:  # Skip first empty chunk before first group
+        lines = chunk.split('\n')
+        # First line contains the group name and description in format "NAME:DESCRIPTION"
+        group_line = lines[0].strip()
+        
+        # Extract group name and description
+        if ':' in group_line:
+            parts = group_line.split(':', 1)  # Split only on first colon
+            group_name = parts[0].strip()
+            group_description = parts[1].strip() if len(parts) > 1 else ""
+        else:
+            group_name = group_line
+            group_description = ""
         
-        # Process blocks in pairs (block_name, block_content)
-        for i in range(1, len(blocks), 2):
-            if i + 1 < len(blocks):
-                block_name = blocks[i].strip()
-                block_content = blocks[i + 1].strip()
-                if block_content:
-                    res[block_name] = block_content
+        # Rest is the content
+        content = '\n'.join(lines[1:]).strip()
         
-        return res
+        if group_name and content:
+            res[group_name] = (group_description, content)
     
-    # Legacy format fallback
-    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)
+def parse_apps_installer_windows(txt: str) -> dict[str, tuple[str, str]]:
+    """Parse Windows PowerShell installation scripts into logical chunks.
+    
+    Splits scripts by # --GROUP:<name>:<description> comment signatures into a dictionary
+    mapping block names to (description, PowerShell script content) tuples.
+    
+    Returns:
+        dict[str, tuple[str, str]]: Dictionary mapping block/section names to (description, installation_script) tuples
+    """
+    chunks = txt.split('# --GROUP:')
+    res: dict[str, tuple[str, str]] = {}
+    
+    for chunk in chunks[1:]:  # Skip first chunk before first group
+        lines = chunk.split('\n')
+        # First line contains the group name and description in format "NAME:DESCRIPTION"
+        group_line = lines[0].strip()
+        
+        # Extract group name and description
+        if ':' in group_line:
+            parts = group_line.split(':', 1)  # Split only on first colon
+            group_name = parts[0].strip()
+            group_description = parts[1].strip() if len(parts) > 1 else ""
         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
+            group_name = group_line
+            group_description = ""
+        
+        # Rest is the content
+        content = '\n'.join(lines[1:]).strip()
+        
+        if group_name and content:
+            res[group_name] = (group_description, content)
+    
     return res

machineconfig/utils/schemas/installer/installer_types.py

@@ -2,7 +2,6 @@ from typing import TypedDict, Literal, TypeAlias, Optional
 import platform
 
 
-APP_INSTALLER_CATEGORY: TypeAlias = Literal["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL", "GITHUB_DEV", "CUSTOM_DEV"]
 CPU_ARCHITECTURES: TypeAlias = Literal["amd64", "arm64"]
 OPERATING_SYSTEMS: TypeAlias = Literal["windows", "linux", "macos"]
 

{machineconfig-4.8.dist-info → machineconfig-4.91.dist-info}/METADATA

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

{machineconfig-4.8.dist-info → machineconfig-4.91.dist-info}/RECORD

@@ -42,10 +42,8 @@ machineconfig/cluster/templates/run_remote.py,sha256=vCc56t8BUAUJp7tyb0PFfwy5hlm
 machineconfig/cluster/templates/utils.py,sha256=5lHgjHvodoSPBD31AwluHBBNgwimwThUsDNWGN8iH9I,1647
 machineconfig/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/installer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/jobs/installer/packages_custom_dev.json,sha256=MiHmV7hCfa4RzmO6LK3PPz0VGn3yQJgPJxrSgxKvwdc,10027
-machineconfig/jobs/installer/packages_custom_essential.json,sha256=-Mgu436rbGE7JWCy-NYxxsnkxCxPxv4Gatu0wXp5XMI,775
-machineconfig/jobs/installer/packages_github_dev.json,sha256=11LVsvIVKMjp8i3y_TNO31IpXaZgQWGGlmhMa_wUilE,31889
-machineconfig/jobs/installer/packages_github_essential.json,sha256=dCGFovFPCnEu-4wed7FJDBxPHdz8ekkAK58VTQobsdg,26472
+machineconfig/jobs/installer/installer_data.json,sha256=sOfqIPU4uarxbuD4HBRs3tXfIKx5tUtNQQdALygwk2o,71545
+machineconfig/jobs/installer/package_groups.py,sha256=SayXJYkgYZiUyAT2YLWrDBXB1YYJbuHe0D_eFQQIQn8,2505
 machineconfig/jobs/installer/custom/gh.py,sha256=hic8Z1ZdncbljY6hgHzl2rmOLOcb6imIUstMALSS3-Y,3082
 machineconfig/jobs/installer/custom/hx.py,sha256=FrUD0mlhWG2GxrnarccVIaW_sHJ5mxeF6yyzbBWyx6w,5840
 machineconfig/jobs/installer/custom_dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,7 +59,7 @@ machineconfig/jobs/installer/custom_dev/nerdfont.py,sha256=oOYC5BpukZIA_pGSDRMZm
 machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py,sha256=sdgbHCbu_6d8VotLRvpL_GrwpEoxY4dupOyRUjtpaYA,5554
 machineconfig/jobs/installer/custom_dev/redis.py,sha256=KjqJkCKZi8fbdW6IhIZjmA4pdo8oZF84Fflij_7dVbg,2291
 machineconfig/jobs/installer/custom_dev/wezterm.py,sha256=BuTVRqV5WQUS2C7FpWMU4pQWgkPt4p3VVGcE6fTVG-0,2311
-machineconfig/jobs/installer/custom_dev/winget.py,sha256=GZ-ZXhT48UpvL8yfmeoKC6hCGvK1bgOLc64up4S3UjQ,5511
+machineconfig/jobs/installer/custom_dev/winget.py,sha256=gLdwM20jKMf2bMV3BAcOg4MkuzwF09CU5OhXvLkPoHo,5738
 machineconfig/jobs/installer/linux_scripts/brave.sh,sha256=m01xquA4YZW3YrhJiTCvTZuLliELmRI1avYFyuE5-Ws,2119
 machineconfig/jobs/installer/linux_scripts/docker.sh,sha256=xP219QeQ5eLwhvOHsNYqOERMGdjBqvrL5jeoZj749XE,5347
 machineconfig/jobs/installer/linux_scripts/docker_start.sh,sha256=TiS-hWRltw66_p_Fq8gfkA_rqUIuwxoIkFZItVF6TXA,1478
@@ -104,6 +102,7 @@ machineconfig/profile/records/windows/apps_summary_report.csv,sha256=nN5BoACBqXg
 machineconfig/profile/records/windows/apps_summary_report.md,sha256=O5hmAcpObaLmOjYLvHg9kkPJryqFwFaP8OsmfPwfR1o,137
 machineconfig/scripts/__init__.py,sha256=v0cMjnaIo39C3ltLiTf1S0fCTMAqWtEU7zrVenUj4PQ,71
 machineconfig/scripts/cloud/init.sh,sha256=zPn3_hwsHduaRxHs97TTn-BoLaJS44I2XwlLmZudQ80,4646
+machineconfig/scripts/linux/agents,sha256=zahzfVZ8_NIkC1TKMjcZqo0vsBtFl-xBhpz63sn29yA,96
 machineconfig/scripts/linux/choose_wezterm_theme,sha256=T7_vS-XvIZErRkfqtlyoZuHEVKFQQwhIeQMFIVTjtxg,145
 machineconfig/scripts/linux/cloud_copy,sha256=IU5TO7roSUYB-U4Km9bhAZOvlUr4nRJtJf4tqCPIPAs,100
 machineconfig/scripts/linux/cloud_mount,sha256=QnDUPUv9q3V14PONOwM4tAPHqOopF_uvjEN1tL24jZA,102
@@ -127,6 +126,7 @@ machineconfig/scripts/linux/mount_nw_drive,sha256=pNzHc7yZn5YIzn2BkpKvd5530Pqbes
 machineconfig/scripts/linux/mount_smb,sha256=7UN5EP1kuxYL_-CnyaH4f9Wuu2CgALDZpJ0mPcdvCiY,94
 machineconfig/scripts/linux/repos,sha256=1qbmIemZjkjcPmiL1Bp8pD46E83OXsR5EJ0XQt29Bhc,96
 machineconfig/scripts/linux/scheduler,sha256=Z9Wu0N9vWRbi4FoRbpcc4ydq4bVaDjZOXESR35ZN0rI,100
+machineconfig/scripts/linux/sessions,sha256=A4vxUDHnDhyph833iy-tBprgQ7av_DZ5t031PRrbqVQ,98
 machineconfig/scripts/linux/share_cloud.sh,sha256=75IzCm7Nob1wO-zlfaNyPPod1IjAsVCG5lcMFdXmiI4,3010
 machineconfig/scripts/linux/share_nfs,sha256=LDQZQ9TV7z2y7RtNHiO4Wb513MztyGjaAV-GzTGwUdc,1374
 machineconfig/scripts/linux/share_smb,sha256=HZX8BKgMlS9JzkGIYnxTsPvoxEBBuVLVkqzR3pmGFGY,20
@@ -139,33 +139,32 @@ machineconfig/scripts/linux/warp-cli.sh,sha256=shFFZ9viet_DSEEHT8kxlGRHoJpO6o85p
 machineconfig/scripts/linux/wifi_conn,sha256=X4TH3OvcVZfOveSbF9WW8uXb4U_G7ZSnCERc7VYAqkc,95
 machineconfig/scripts/linux/z_ls,sha256=ATZtu0ccN3AKvAOxkwLq1xgQjJ3en5byEWJ3Q8afnNg,3340
 machineconfig/scripts/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+machineconfig/scripts/python/agents.py,sha256=RtRR53Mt3zTqHqJbS5nY7XHRbZPty8hPl1mpgKAvaME,9832
 machineconfig/scripts/python/choose_wezterm_theme.py,sha256=Hlu_EOQhLM6wYdAdY25jcqEK11BkVwQYwkz04xnIBVU,3397
 machineconfig/scripts/python/cloud_copy.py,sha256=_pxA8o3ar5vH9DkrAdwafHcZMiqNCbY_IfNzKCOMJ5k,8395
 machineconfig/scripts/python/cloud_manager.py,sha256=YN0DYLzPKtMBaks-EAVwFmkCu3XeHWMr1D21uqX5dDk,3429
 machineconfig/scripts/python/cloud_mount.py,sha256=RFMzRUep2D5HtVXANIi-pab3EkI-W8P1IJ32k1W7xQA,6756
 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=WMO5VLPkKZ38OAZCfhh_NvPv58HPh1TbhN7ZrQmN2Xs,4043
+machineconfig/scripts/python/croshell.py,sha256=wYi8xWkzYzpfg8YNppmu22mvx0Gxtbs979ERO3kZS2w,8587
+machineconfig/scripts/python/devops.py,sha256=fTEut6gTDfmNqzS8-gRyRAsmWJYPGGIt8X35Irj7Cl8,3434
 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=QbRQhNdDRLLtgJwaRl2pbLmWvajb1b_Xte2ql8N3JRs,9096
+machineconfig/scripts/python/devops_devapps_install.py,sha256=f22pUQQjY0AGs4jjxSgYz1e0LOfZGXucTH1lmgQa5Vw,10233
 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=aLxwM8o3Tpe4nYpNdnEvG8WVdplE3_tfnDECIXONzAg,9579
 machineconfig/scripts/python/fire_agents_help_launch.py,sha256=1ymWiszfjCyPv3ofinWzfOmbzLEt3d7ntac_afLh-V4,5017
 machineconfig/scripts/python/fire_agents_help_search.py,sha256=qIfSS_su2YJ1Gb0_lu4cbjlJlYMBw0v52NTGiSrGjk8,2991
 machineconfig/scripts/python/fire_agents_helper_types.py,sha256=zKu8Vr6iucaGSkCm_Tkt_WrYU7-6Nript3coYyzTXzY,295
 machineconfig/scripts/python/fire_agents_load_balancer.py,sha256=mpqx3uaQdBXYieuvhdK-qsvLepf9oIMo3pwPj9mSEDI,1079
 machineconfig/scripts/python/fire_jobs.py,sha256=7R4CO7wGRkG6akPLK6SMHr82_RdIeXIJNicCAdgh1ok,20262
 machineconfig/scripts/python/fire_jobs_args_helper.py,sha256=5zqnYvBjXSLFUqMHg5fgI62YnDu7CpVC4RLmXUKpI2I,2050
-machineconfig/scripts/python/fire_jobs_layout_helper.py,sha256=u0VssrTXOzH7km89yaL1K8T5DF83LRyllj1E_30N9ZQ,8083
 machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=YA0N_NEbNttYS42ahJOjwoMKoYlvUL_fJapzjSTVOgs,15073
+machineconfig/scripts/python/interactive.py,sha256=AM2jPIAHbXppVj-lA9iYcOTGWmOMWZtIaJIz9K5FxK8,11983
 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
@@ -177,6 +176,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/sessions.py,sha256=WT-WVmrYDe3u-4Gjjm_1Apq879qcOtM6TCR4Q-9JZys,8299
 machineconfig/scripts/python/share_terminal.py,sha256=biuG35YiknTMVr3Mzs4bBZwEq53JcuBRlzMTp6eY90M,5009
 machineconfig/scripts/python/snapshot.py,sha256=aDvKeoniZaeTSNv9zWBUajaj2yagAxVdfuvO1_tgq5Y,1026
 machineconfig/scripts/python/start_slidev.py,sha256=U5ujAL7R5Gd5CzFReTsnF2SThjY91aFBg0Qz_MMl6U4,4573
@@ -361,7 +361,6 @@ machineconfig/setup_linux/nix/cli_installation.sh,sha256=AQ_wRmldeD1tPqCmU7qgz9Z
 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=3bQr-0Gtly7lx6LPXtCUCs49jiCCozv3T1idHK678EY,463
 machineconfig/setup_linux/web_shortcuts/ssh.sh,sha256=k6BAY-zAWsi1beOMiZODxw4VOjZCTABZu__gxSET1eU,1924
@@ -378,7 +377,7 @@ 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=AVAzuJqWkbMmfEk5_eKLGA3kgM6PCTXq7We2QoppZo0,8886
+machineconfig/utils/installer.py,sha256=Aoq93RMOQFmv1iYJS90sxrBHeG_K6N5DtIthYffcIOU,9743
 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
@@ -398,15 +397,15 @@ machineconfig/utils/ai/generate_file_checklist.py,sha256=ajbmhcBToRugl75c_KZRq2X
 machineconfig/utils/cloud/onedrive/setup_oauth.py,sha256=ZTVkqgrwbV_EoPvyT8dyOTUE0ur3BW4sa9o6QYtt5Bo,2341
 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=3jjLHL1xqTPowx52r7BfhjpzF6LQA7CRudjN2QYJP34,10551
+machineconfig/utils/installer_utils/github_release_bulk.py,sha256=WJf_qZlF02SmIc6C7o1h4Gy4gAaJAfeAS8O9s2Itj-k,6535
+machineconfig/utils/installer_utils/installer_abc.py,sha256=MRVfkjCPlPgCQQcSxXdVJMVnr_9CC3SQbFVDJxWy1zI,10813
 machineconfig/utils/installer_utils/installer_class.py,sha256=6IQswaC9mxIdeaMG-rOt-vqyKGYibBRMvC0UglZ_3mI,20268
 machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=pTxvLzIpD5RF508lUUBBkWcc4V1B10J4ylvVgVGkcM0,2037
-machineconfig/utils/schemas/installer/installer_types.py,sha256=DLagmIe0G5-xg7HZ9VrlFCDk1gIbwvX7O4gZjwq0wh0,1326
+machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoSpdmTIdgS9LS-RvE-QZ-D260tD3o,1214
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-4.8.dist-info/METADATA,sha256=U8vakfUTP6B1G5zxfxbaOXsqmyxo43_pNfhlnUscClM,7060
-machineconfig-4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-4.8.dist-info/entry_points.txt,sha256=BhKeN0HFu7k3izf4f-Xp95tU3wGAr-TJrCuxDnfUwWo,1006
-machineconfig-4.8.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-4.8.dist-info/RECORD,,
+machineconfig-4.91.dist-info/METADATA,sha256=6itSuVawfwaAdJH3RfxSZVJddeSL434HDZ20XU63PBk,7061
+machineconfig-4.91.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-4.91.dist-info/entry_points.txt,sha256=LcwklRJPY_uKBvStgtOJn5G_pmFCEdpgRNzUUc6twAQ,1134
+machineconfig-4.91.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-4.91.dist-info/RECORD,,

{machineconfig-4.8.dist-info → machineconfig-4.91.dist-info}/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
+agents = machineconfig.scripts.python.agents:main_from_parser
 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
@@ -13,5 +14,6 @@ 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
+sessions = machineconfig.scripts.python.sessions:main_from_parser
 start_slidev = machineconfig.scripts.python.start_slidev:arg_parser
 wifi_conn = machineconfig.scripts.python.wifi_conn:arg_parser