machineconfig 4.96__py3-none-any.whl → 4.98__py3-none-any.whl

machineconfig/jobs/installer/package_groups.py

@@ -1,157 +1,327 @@
 from typing import Literal, TypeAlias, Union
 
-PACKAGES_NAMES_DEV = Literal[
-    "ngrok",
-    "Visual Studio Code",
+# AI/LLM Tools - AI-powered coding and chat assistants
+PACKAGES_AI_TOOLS = [
     "aider",
     "github-copilot-cli",
     "gemini",
     "crush",
     "opencode-ai",
-    "warp",
+    "ollama",
+    "chatgpt",
+    "mods",
     "q",
     "cursor-cli",
     "droid",
+    "auggie",
+]
+
+# Tunneling/Port Forwarding - Tools for exposing local services
+PACKAGES_TUNNELING = [
+    "ngrok",
+    "devtunnel",
+    "cloudflared",
+    "forward-cli",
+]
+
+# Terminal Emulators & Shells - Terminal applications, emulators, and shell environments
+PACKAGES_TERMINAL_EMULATORS = [
     "Alacritty",
+    "Wezterm",
+    "warp",
+    "vtm",
+    "edex-ui",
+    "extraterm",
+    "nushell",
+]
+
+# Browsers - Web browsers and terminal browsers
+PACKAGES_BROWSERS = [
     "Brave",
     "bypass-paywalls-chrome",
-    "Cursor",
-    "espanso",
-    "Gorilla",
-    "lvim",
-    "nerdfont",
-    "Redis",
-    "Wezterm",
-    "winget",
-    "ytui-music",
-    "youtube-tui",
-    "termusic",
-    "kronos",
-    "transmission",
-    "nnn",
-    "exa",
-    "bytehound",
-    "atuin",
     "browsh",
     "carbonyl",
+]
+
+# Code Editors & IDEs - Code editing tools
+# NOTE: Entries must match the corresponding `appName` in installer_data.json for filtering to work.
+PACKAGES_CODE_EDITORS = [
+    "code",
+    "Cursor",
+    "lvim",
+]
+
+# Presentation & Text UI Tools - Markdown viewers, presentations, prompts, and text decoration
+PACKAGES_PRESENTATION = [
     "patat",
+    "marp",
+    "presenterm",
+    "glow",
+    "gum",
+    "boxes",
+    "hx",
+]
+
+# Database Tools - Database clients and visualizers
+PACKAGES_DATABASE = [
     "SqliteBrowser",
     "DBeaver",
     "rainfrog",
     "duckdb",
-    "cpz",
-    "rmz",
+]
+
+# Documentation & Conversion - Document conversion, diagram tools, and fast file operations
+PACKAGES_DOC_CONVERSION = [
     "mermaid-cli",
     "html2markdown",
-    "xcrawl3r",
-    "obsidian",
-    "marp",
-    "presenterm",
     "pandoc",
-    "devcontainer",
-    "bitwarden",
+    "cpz",
+    "rmz",
+]
+
+# Media & Entertainment - Music players and media tools
+PACKAGES_MEDIA = [
+    "ytui-music",
+    "youtube-tui",
+    "termusic",
+    "kronos",
     "OBS Background removal",
-    "rustdesk",
-    "evcxr",
-    "forward-cli",
-    "bandwhich",
-    "ipinfo",
-    "dust",
-    "ots",
+]
+
+# File Sharing & Cloud - File sharing, transfer, backup, sync, and QR tools
+PACKAGES_FILE_SHARING = [
     "ffsend",
     "portal",
     "qrcp",
-    "qrscan",
     "termscp",
-    "qr",
     "filebrowser",
-    "cloudreve",
+    "qr",
+    "qrscan",
+    "sharewifi",
+    "share-wifi",
+    "easy-sharing",
+    "ezshare",
     "restic",
     "syncthing",
-    "istio",
-    "openpomodoro-cli",
-    "rust-analyzer",
-    "kondo",
-    "tokei",
+    "cloudreve",
+]
+
+
+# Git & Docker Tools - Version control and container utilities
+PACKAGES_GIT_DOCKER_TOOLS = [
     "lazygit",
-    "lazydocker",
     "onefetch",
     "gitcs",
-    "just",
+    "lazydocker",
+]
+
+# Development Tools - Various development utilities
+PACKAGES_DEV_UTILS = [
+    "devcontainer",
+    "rust-analyzer",
+    "evcxr",
+    "geckodriver",
+    "hyperfine",
+]
+
+# Code Analysis, Git & Docs - Code analysis, statistics, documentation, and Git tools
+PACKAGES_CODE_ANALYSIS = [
+    "kondo",
+    "tokei",
     "navi",
     "tealdeer",
-    "sniffnet",
-    "hyperfine",
-    "ollama",
-    "cointop",
-    "vtm",
-    "edex-ui",
-    "extraterm",
-    "nushell",
-    "geckodriver",
+    "gitui",
+    "delta",
+    "gh",
+]
+
+# Productivity & Utilities - Productivity tools, security, remote access, and terminal enhancements
+PACKAGES_PRODUCTIVITY = [
+    "espanso",
+    "bitwarden",
+    "openpomodoro-cli",
+    "just",
+    "rustdesk",
+    "ots",
     "lolcatjs",
     "figlet-cli",
-    "sharewifi",
-    "share-wifi",
 ]
 
-PACKAGES_NAMES_ESSENTIAL = Literal[
-    "gh",
-    "hx",
-    "speedtest",
-    "pistol",
-    "diskonaut",
-    "xplr",
+# Miscellaneous Tools - Other tools
+PACKAGES_MISC_DEV = [
+    "Gorilla",
+    "nerdfont",
+    "Redis",
+    "winget",
+    "transmission",
+    "exa",
+    "bytehound",
+    "atuin",
+    "xcrawl3r",
+    "obsidian",
+    "istio",
+    "cointop",
+    "nnn",
+]
+
+# Main DEV package list - combines all subgroups
+PACKAGES_NAMES_DEV = [
+    *PACKAGES_AI_TOOLS,
+    *PACKAGES_TUNNELING,
+    *PACKAGES_TERMINAL_EMULATORS,
+    *PACKAGES_BROWSERS,
+    *PACKAGES_CODE_EDITORS,
+    *PACKAGES_PRESENTATION,
+    *PACKAGES_DATABASE,
+    *PACKAGES_DOC_CONVERSION,
+    *PACKAGES_MEDIA,
+    *PACKAGES_FILE_SHARING,
+    *PACKAGES_GIT_DOCKER_TOOLS,
+    *PACKAGES_DEV_UTILS,
+    *PACKAGES_CODE_ANALYSIS,
+    *PACKAGES_PRODUCTIVITY,
+    *PACKAGES_MISC_DEV,
+]
+
+# System & Network Monitoring - System resource monitors, process viewers, network analysis, and system info tools
+PACKAGES_SYSTEM_MONITORS = [
     "btop",
-    "gotty",
-    "joshuto",
-    "zellij",
-    "boxes",
-    "ugrep",
-    "zoomit",
-    "ntop",
-    "devtunnel",
-    "bat",
-    "broot",
     "btm",
-    "chatgpt",
-    "cloudflared",
+    "ntop",
+    "procs",
+    "bandwhich",
+    "ipinfo",
+    "sniffnet",
     "cpufetch",
-    "delta",
-    "dua",
     "fastfetch",
-    "fd",
-    "fzf",
-    "gitui",
-    "glow",
-    "gum",
+    "topgrade",
+]
+
+
+# File Tools - File browsing, navigation, listing, directory jumping, and disk usage analysis
+PACKAGES_FILE_TOOLS = [
+    "xplr",
+    "joshuto",
     "lf",
+    "tere",
+    "yazi",
     "lsd",
-    "m365",
-    "mcfly",
-    "mods",
-    "mprocs",
-    "ouch",
-    "procs",
-    "rclone",
+    "zoxide",
+    "diskonaut",
+    "dua",
+    "dust",
+]
+
+# File Viewers - File preview and viewing tools
+PACKAGES_FILE_VIEWERS = [
+    "pistol",
+    "bat",
+    "viu",
+]
+
+
+# Search & Archive Tools - File and content search utilities, archive management
+PACKAGES_SEARCH = [
+    "fd",
+    "fzf",
+    "broot",
     "rg",
     "rga",
+    "ugrep",
+    "ouch",
+]
+
+# Terminal & Shell Enhancements - Terminal multiplexers, shell history, and prompts
+PACKAGES_TERMINAL_SHELL = [
+    "zellij",
+    "mprocs",
+    "mcfly",
     "starship",
-    "tere",
-    "topgrade",
-    "ttyd",
-    "viu",
+]
+
+
+
+# Cloud & Utilities - Cloud storage, file watching, web terminal, and presentation tools
+PACKAGES_CLOUD_UTILS = [
+    "rclone",
     "watchexec",
-    "yazi",
-    "zoxide",
+    "m365",
+    "zoomit",
+    "speedtest",
+]
+
+# Web Sharing - Share terminal over web
+PACKAGES_WEB_TERMINAL = [
+    "gotty",
+    "ttyd",
 ]
 
-PACKAGE_GROUPS: TypeAlias = Literal["ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM"]
+
+# Main ESSENTIAL package list - combines all subgroups
+PACKAGES_NAMES_ESSENTIAL = [
+    *PACKAGES_CODE_ANALYSIS,
+    *PACKAGES_PRESENTATION,
+    *PACKAGES_FILE_VIEWERS,
+    *PACKAGES_FILE_TOOLS,
+    *PACKAGES_SYSTEM_MONITORS,
+    *PACKAGES_WEB_TERMINAL,
+    *PACKAGES_TERMINAL_SHELL,
+    *PACKAGES_SEARCH,
+    *PACKAGES_AI_TOOLS,
+    *PACKAGES_CLOUD_UTILS,
+]
+
+PACKAGE_GROUPS: TypeAlias = Literal[
+    "ESSENTIAL",
+    "DEV",
+    "AI_TOOLS",
+    "TUNNELING",
+    "TERMINAL_EMULATORS",
+    "BROWSERS",
+    "CODE_EDITORS",
+    "PRESENTATION",
+    "DATABASE",
+    "DOC_CONVERSION",
+    "MEDIA",
+    "FILE_SHARING",
+    "GIT_DOCKER_TOOLS",
+    "DEV_UTILS",
+    "CODE_ANALYSIS",
+    "PRODUCTIVITY",
+    "MISC_DEV",
+    "SYSTEM_MONITORS",
+    "FILE_TOOLS",
+    "FILE_VIEWERS",
+    "SEARCH",
+    "TERMINAL_SHELL",
+    "CLOUD_UTILS",
+    "WEB_TERMINAL",
+]
 PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
-    "ESSENTIAL": list(PACKAGES_NAMES_ESSENTIAL.__args__),
-    "DEV": list(PACKAGES_NAMES_DEV.__args__),
-    "ESSENTIAL_SYSTEM": [],
-    "DEV_SYSTEM": [],
+    "ESSENTIAL": PACKAGES_NAMES_ESSENTIAL,
+    "DEV": PACKAGES_NAMES_DEV,
+    "AI_TOOLS": PACKAGES_AI_TOOLS,
+    "TUNNELING": PACKAGES_TUNNELING,
+    "TERMINAL_EMULATORS": PACKAGES_TERMINAL_EMULATORS,
+    "BROWSERS": PACKAGES_BROWSERS,
+    "CODE_EDITORS": PACKAGES_CODE_EDITORS,
+    "PRESENTATION": PACKAGES_PRESENTATION,
+    "DATABASE": PACKAGES_DATABASE,
+    "DOC_CONVERSION": PACKAGES_DOC_CONVERSION,
+    "MEDIA": PACKAGES_MEDIA,
+    "FILE_SHARING": PACKAGES_FILE_SHARING,
+    "GIT_DOCKER_TOOLS": PACKAGES_GIT_DOCKER_TOOLS,
+    "DEV_UTILS": PACKAGES_DEV_UTILS,
+    "CODE_ANALYSIS": PACKAGES_CODE_ANALYSIS,
+    "PRODUCTIVITY": PACKAGES_PRODUCTIVITY,
+    "MISC_DEV": PACKAGES_MISC_DEV,
+    "SYSTEM_MONITORS": PACKAGES_SYSTEM_MONITORS,
+    "FILE_TOOLS": PACKAGES_FILE_TOOLS,
+    "FILE_VIEWERS": PACKAGES_FILE_VIEWERS,
+    "SEARCH": PACKAGES_SEARCH,
+    "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
+    "CLOUD_UTILS": PACKAGES_CLOUD_UTILS,
+    "WEB_TERMINAL": PACKAGES_WEB_TERMINAL,
 }
 
-_ = Union
+_ = Union, Literal

machineconfig/jobs/python/python_cargo_build_share.py

@@ -2,7 +2,6 @@
 cargo install
 """
 
-# from machineconfig.utils.terminal import Terminal
 # from machineconfig.utils.path_reduced import P as PathExtended
 # import platform
 

machineconfig/jobs/python/python_ve_symlink.py

@@ -1,28 +1,36 @@
 """Symlinks"""
 
+from rich import box
+from rich.console import Console
+from rich.panel import Panel
+
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-# from machineconfig.utils.utils import choose_from_options
 
 
-def main():
-    print(f"""
-{"=" * 150}
-🔗 SYMLINK CREATOR | Create symlinks for virtual environments
-{"=" * 150}
-""")
+def main() -> None:
+    console = Console()
+    console.print(
+        Panel.fit(
+            "\n".join(["Create symlinks for virtual environments"]),
+            title="🔗 Symlink Creator",
+            border_style="cyan",
+            box=box.ROUNDED,
+        )
+    )
     target = PathExtended(input("🎯 Symlink to which target? ")).expanduser().absolute()
     source = input(f"📍 Symlink from which source? [default to: CWD/{target.name}] ") or PathExtended.cwd().joinpath(target.name)
     if isinstance(source, str):
         source = PathExtended(source).expanduser().absolute()
     source.symlink_to(target, overwrite=True)
-    print(f"""
-{"=" * 150}
-✅ SUCCESS | Symlink created successfully
-📍 Source: {source}
-🎯 Target: {target}
-{"=" * 150}
-""")
-    print("🔗 Finished creating symlink.")
+    console.print(
+        Panel.fit(
+            "\n".join([f"📍 Source: {source}", f"🎯 Target: {target}"]),
+            title="✅ Symlink Created",
+            border_style="green",
+            box=box.ROUNDED,
+        )
+    )
+    console.print("🔗 Finished creating symlink.", style="bold cyan")
 
 
 if __name__ == "__main__":

machineconfig/jobs/python/vscode/api.py

@@ -1,7 +1,13 @@
 from pathlib import Path
-from machineconfig.utils.accessories import randstr
 from typing import Annotated
+
 import typer
+from rich import box
+from rich.console import Console
+from rich.panel import Panel
+from rich.syntax import Syntax
+
+from machineconfig.utils.accessories import randstr
 
 
 def open_file_in_new_instance(file_path: str):
@@ -19,14 +25,16 @@ ln -s {repo_path} {copy_path}
 cd {copy_path}
 code --profile bitProfile --new-window {file_path}
 """
-    from rich.console import Console
-    from rich.syntax import Syntax
-    from rich.panel import Panel
-
     console = Console()
-    console.print(f"\n{'=' * 150}")
-    console.print(Panel(Syntax(code, lexer="bash"), title="🔍 VS CODE API | Opening file in new instance", subtitle=f"📂 {file_path}"), style="bold blue")
-    console.print(f"{'=' * 150}\n")
+    panel = Panel(
+        Syntax(code, lexer="bash"),
+        title="🔍 VS CODE API | Opening file in new instance",
+        subtitle=f"📂 {file_path}",
+        border_style="bright_blue",
+        box=box.DOUBLE,
+        padding=(1, 2),
+    )
+    console.print(panel)
 
     code_path = Path.home().joinpath(".config", "machingconfig", "vscode_api", "code_temp")
     code_path.parent.mkdir(parents=True, exist_ok=True)

machineconfig/jobs/python/vscode/sync_code.py

@@ -1,58 +1,73 @@
 from pathlib import Path
 from configparser import SectionProxy
+from rich import box
+from rich.console import Console
+from rich.panel import Panel
+from rich.syntax import Syntax
 from machineconfig.utils.io import read_ini
 
 config = read_ini(Path.home().joinpath(".ssh", "config"))
 
 
-def sync_remote(machine_name: str):
-    print(f"""
-{"=" * 150}
-🔄 SYNC REMOTE | Initiating remote code synchronization
-🖥️  Target machine: {machine_name}
-{"=" * 150}
-""")
+def sync_remote(machine_name: str) -> None:
+    console = Console()
+    console.print(
+        Panel.fit(
+            "\n".join([f"🖥️  Target machine: {machine_name}"]),
+            title="🔄 Sync Remote",
+            border_style="cyan",
+            box=box.ROUNDED,
+        )
+    )
 
-    # Handle config as a ConfigParser object
     machine_config: SectionProxy | None = None
     if machine_name in config:
         machine_config = config[machine_name]
 
     if machine_config is None:
         error_msg = f"Machine {machine_name} not found in SSH config."
-        print(f"""
-{"⚠️" * 20}
-❌ ERROR | {error_msg}
-{"⚠️" * 20}
-""")
+        console.print(
+            Panel.fit(
+                "\n".join([error_msg]),
+                title="❌ Error",
+                subtitle="⚠️ Unknown target machine",
+                border_style="red",
+                box=box.ROUNDED,
+            )
+        )
         raise ValueError(error_msg)
 
     code = f"""
 ssh -o "HostName={machine_config["HostName"]}" -o "User={machine_config["User"]}" -o "ProxyCommand=cloudflared access ssh --hostname %h" -o "Port={machine_config["Port"]}" -o "RequestTTY=yes" -o "RemoteCommand=devops --which update; bash" {machine_name}
 """
-    from rich.console import Console
-    from rich.syntax import Syntax
-    from rich.panel import Panel
 
-    console = Console()
-    console.print(f"\n{'=' * 150}")
-    console.print(Panel(Syntax(code, lexer="bash"), title=f"🔄 SYNC COMMAND | Connecting to {machine_name}", subtitle=f"🌐 Host: {machine_config['HostName']}"), style="bold blue")
-    console.print(f"{'=' * 150}\n")
+    syntax = Syntax(code, "bash", line_numbers=False, word_wrap=True)
+    console.print(
+        Panel(
+            syntax,
+            title=f"🔄 Sync Command | {machine_name}",
+            subtitle=f"🌐 Host: {machine_config['HostName']}",
+            border_style="blue",
+            box=box.ROUNDED,
+        )
+    )
 
     code_path = Path.home().joinpath(".config", "machingconfig", "vscode_api", "code_temp")
     code_path.parent.mkdir(parents=True, exist_ok=True)
     code_path.write_text(code, encoding="utf-8")
     code_path.chmod(0o755)
 
-    print(f"🚀 Executing sync command for {machine_name}...")
+    console.print(f"🚀 Executing sync command for {machine_name}...", style="bold yellow")
 
     import subprocess
 
     subprocess.run([str(code_path)], shell=True, check=True)
 
-    print(f"""
-{"=" * 150}
-✅ SUCCESS | Remote sync completed successfully
-🖥️  Machine: {machine_name}
-{"=" * 150}
-""")
+    console.print(
+        Panel.fit(
+            "\n".join([f"🖥️  Machine: {machine_name}"]),
+            title="✅ Sync Completed",
+            border_style="green",
+            box=box.ROUNDED,
+        )
+    )

machineconfig/scripts/python/cloud_repo_sync.py

@@ -4,13 +4,14 @@ from pathlib import Path
 import git
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.terminal import Terminal
+from machineconfig.utils.terminal import Response
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
+import subprocess
 from typing import Optional, Literal
 from rich.console import Console
 from rich.panel import Panel
@@ -73,7 +74,12 @@ git pull originEnc master
 """
 
     shell_path = write_shell_script_to_file(shell_script=script)
-    res = Terminal().run(f". {shell_path}", shell="powershell").capture().print()
+    command = f". {shell_path}"
+    if platform.system() == "Windows":
+        completed = subprocess.run(["powershell", "-Command", command], capture_output=True, check=False, text=True)
+    else:
+        completed = subprocess.run(command, shell=True, capture_output=True, check=False, text=True)
+    res = Response.from_completed_process(completed).capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
         console.print(Panel("✅ Pull succeeded!\n🧹 Removing originEnc remote and local copy\n📤 Pushing merged repository to cloud storage", title="Success", border_style="green"))
@@ -161,8 +167,6 @@ git commit -am "finished merging"
             case _:
                 raise ValueError(f"Unknown action: {action}")
         # PROGRAM_PATH.write_text(program_content, encoding="utf-8")
-        import subprocess
-
         subprocess.run(program_content, shell=True, check=True)
 
     return program_content

machineconfig/scripts/python/devops.py

@@ -1,6 +1,6 @@
 """devops with emojis"""
 
-import machineconfig.scripts.python.devops_devapps_install as installer_entry_point
+import machineconfig.utils.installer_utils.installer as installer_entry_point
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos