machineconfig 5.25__py3-none-any.whl → 5.27__py3-none-any.whl

machineconfig/jobs/installer/custom/hx.py

@@ -77,7 +77,7 @@ def main(version: Optional[str], install_lib: bool = False):
     print(f"   ✨ Cleaned '{runtime_path}' and '{contrib_path}'.")
 
     print("\n📦 [Step 4/5] Installing Helix components...")
-    target_config_dir = PathExtended("~/.config/helix").expanduser()
+    target_config_dir = PathExtended.home().joinpath(".config/helix").expanduser()
     target_config_dir.mkdir(parents=True, exist_ok=True)
 
     if platform.system() in ["Linux", "Darwin"]:

machineconfig/jobs/installer/custom_dev/alacritty.py

@@ -30,8 +30,8 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
         program = """
 
 cargo install alacritty
-mkdir -p ~/.config/alacritty/themes
-git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/themes
+mkdir -p $HOME/.config/alacritty/themes
+git clone https://github.com/alacritty/alacritty-theme $HOME/.config/alacritty/themes
 
 """
     elif platform.system() in ["Linux", "Darwin"]:
@@ -41,8 +41,8 @@ git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/theme
 
 
 cargo install alacritty
-mkdir -p ~/.config/alacritty/themes
-git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/themes
+mkdir -p $HOME/.config/alacritty/themes
+git clone https://github.com/alacritty/alacritty-theme $HOME/.config/alacritty/themes
 
 """
     else:

machineconfig/jobs/installer/installer_data.json

@@ -1,6 +1,23 @@
 {
   "version": "1",
   "installers": [
+    {
+      "appName": "jq",
+      "repoURL": "https://github.com/jqlang/jq",
+      "doc": "🧙‍♂️ Command-line JSON processor",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "jq-linux-amd64",
+          "windows": null,
+          "macos": null
+        },
+        "arm64": {
+          "linux": "jq-linux-arm64",
+          "windows": null,
+          "macos": null
+        }
+      }
+    },
     {
       "appName": "speedtest",
       "repoURL": "CMD",

machineconfig/jobs/installer/linux_scripts/wezterm.sh

@@ -36,5 +36,5 @@ echo """#=======================================================================
 #=======================================================================
 """
 echo "🚀 You can now launch WezTerm from your applications menu or by typing 'wezterm' in terminal"
-echo "💡 Configure WezTerm by editing ~/.config/wezterm/wezterm.lua"
+echo "💡 Configure WezTerm by editing $HOME/.config/wezterm/wezterm.lua"
 echo "🔗 For more information and configuration options, visit: https://wezfurlong.org/wezterm/"

machineconfig/jobs/installer/package_groups.py

@@ -16,13 +16,6 @@ PACKAGES_AI_TOOLS = [
     "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 = [
@@ -41,6 +34,8 @@ PACKAGES_BROWSERS = [
     "bypass-paywalls-chrome",
     "browsh",
     "carbonyl",
+    "m365",
+    "zoomit",
 ]
 
 # Code Editors & IDEs - Code editing tools
@@ -51,16 +46,7 @@ PACKAGES_CODE_EDITORS = [
     "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 = [
@@ -70,12 +56,6 @@ PACKAGES_DATABASE = [
     "duckdb",
 ]
 
-# Documentation & Conversion - Document conversion, diagram tools, and fast file operations
-PACKAGES_DOC_CONVERSION = [
-    "mermaid-cli",
-    "html2markdown",
-    "pandoc",
-]
 
 # Media & Entertainment - Music players and media tools
 PACKAGES_MEDIA = [
@@ -88,8 +68,10 @@ PACKAGES_MEDIA = [
 
 # File Sharing & Cloud - File sharing, transfer, backup, sync, and QR tools
 PACKAGES_FILE_SHARING = [
-    "cpz",
-    "rmz",
+    "ngrok",
+    "devtunnel",
+    "cloudflared",
+    "forward-cli",
     "ffsend",
     "portal",
     "qrcp",
@@ -108,14 +90,6 @@ PACKAGES_FILE_SHARING = [
 ]
 
 
-# Git & Docker Tools - Version control and container utilities
-PACKAGES_GIT_DOCKER_TOOLS = [
-    "lazygit",
-    "onefetch",
-    "gitcs",
-    "lazydocker",
-]
-
 # Development Tools - Various development utilities
 PACKAGES_DEV_UTILS = [
     "devcontainer",
@@ -126,6 +100,10 @@ PACKAGES_DEV_UTILS = [
 
 # Code Analysis, Git & Docs - Code analysis, statistics, documentation, and Git tools
 PACKAGES_CODE_ANALYSIS = [
+    "lazygit",
+    "onefetch",
+    "gitcs",
+    "lazydocker",
     "hyperfine",
     "kondo",
     "tokei",
@@ -134,6 +112,8 @@ PACKAGES_CODE_ANALYSIS = [
     "gitui",
     "delta",
     "gh",
+    "watchexec",
+    "jq",
 ]
 
 # Productivity & Utilities - Productivity tools, security, remote access, and terminal enhancements
@@ -141,16 +121,25 @@ PACKAGES_PRODUCTIVITY = [
     "espanso",
     "bitwarden",
     "openpomodoro-cli",
-    "just",
     "rustdesk",
+    "mermaid-cli",
+    "html2markdown",
+    "pandoc",
+    "patat",
+    "marp",
+    "presenterm",
+    "glow",
+    "gum",
+    "hx",
 ]
 
 # Miscellaneous Tools - Other tools
 PACKAGES_MISC_DEV = [
+    "lolcatjs",
+    "figlet-cli",
+    "boxes",
     "Gorilla",
-    "nerdfont",
     "Redis",
-    "winget",
     "transmission",
     "exa",
     "bytehound",
@@ -162,24 +151,6 @@ PACKAGES_MISC_DEV = [
     "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 = [
@@ -193,33 +164,16 @@ PACKAGES_SYSTEM_MONITORS = [
     "cpufetch",
     "fastfetch",
     "topgrade",
+    "speedtest",
 ]
 
 
-# File Tools - File browsing, navigation, listing, directory jumping, and disk usage analysis
-PACKAGES_FILE_TOOLS = [
-    "xplr",
-    "joshuto",
-    "lf",
-    "tere",
-    "yazi",
-    "lsd",
-    "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 = [
+PACKAGES_FILE = [
+    "nerdfont",
+    "winget",
     "fd",
     "fzf",
     "broot",
@@ -227,6 +181,21 @@ PACKAGES_SEARCH = [
     "rga",
     "ugrep",
     "ouch",
+    "pistol",
+    "bat",
+    "viu",
+    "xplr",
+    "joshuto",
+    "lf",
+    "tere",
+    "yazi",
+    "lsd",
+    "zoxide",
+    "diskonaut",
+    "dua",
+    "dust",
+    "cpz",
+    "rmz",
 ]
 
 # Terminal & Shell Enhancements - Terminal multiplexers, shell history, and prompts
@@ -235,41 +204,14 @@ PACKAGES_TERMINAL_SHELL = [
     "mprocs",
     "mcfly",
     "starship",
-    "lolcatjs",
-    "figlet-cli",
-]
-# Web Sharing - Share terminal over web
-PACKAGES_WEB_TERMINAL = [
     "gotty",
     "ttyd",
-]
-
-
-# Cloud & Utilities - Cloud storage, file watching, web terminal, and presentation tools
-PACKAGES_CLOUD_UTILS = [
     "rclone",
-    "watchexec",
-    "m365",
-    "zoomit",
-    "speedtest",
 ]
 
 
 
 
-# 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",
@@ -297,31 +239,48 @@ PACKAGE_GROUPS: TypeAlias = Literal[
     "CLOUD_UTILS",
     "WEB_TERMINAL",
 ]
+
+
+
+# Main ESSENTIAL package list - combines all subgroups
+PACKAGES_NAMES_ESSENTIAL = [
+    *PACKAGES_CODE_ANALYSIS,
+    *PACKAGES_SYSTEM_MONITORS,
+    *PACKAGES_TERMINAL_SHELL,
+    *PACKAGES_FILE,
+    *PACKAGES_AI_TOOLS,
+]
+PACKAGES_NAMES_DEV = [
+    *PACKAGES_AI_TOOLS,
+    *PACKAGES_TERMINAL_EMULATORS,
+    *PACKAGES_BROWSERS,
+    *PACKAGES_CODE_EDITORS,
+    *PACKAGES_DATABASE,
+    *PACKAGES_MEDIA,
+    *PACKAGES_FILE_SHARING,
+    *PACKAGES_DEV_UTILS,
+    *PACKAGES_CODE_ANALYSIS,
+    *PACKAGES_PRODUCTIVITY,
+    *PACKAGES_MISC_DEV,
+]
+
 PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
     "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,
+    "SEARCH": PACKAGES_FILE,
     "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
-    "CLOUD_UTILS": PACKAGES_CLOUD_UTILS,
-    "WEB_TERMINAL": PACKAGES_WEB_TERMINAL,
 }
 
 _ = Union, Literal

machineconfig/scripts/python/agents.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import cast, Iterable, Optional, get_args
 import typer
-from machineconfig.scripts.python.fire_agents_helper_types import AGENTS
+from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS
 
 
 def _write_list_file(target: Path, files: Iterable[Path]) -> None:
@@ -28,9 +28,9 @@ def create(
     agents_dir: Optional[Path] = typer.Option(None, help="Directory to store agent files. If not provided, will be constructed automatically."),
 ):
 
-    from machineconfig.scripts.python.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
-    from machineconfig.scripts.python.fire_agents_help_search import search_files_by_pattern, search_python_files
-    from machineconfig.scripts.python.fire_agents_load_balancer import chunk_prompts
+    from machineconfig.scripts.python.helpers_fire.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
+    from machineconfig.scripts.python.helpers_fire.fire_agents_help_search import search_files_by_pattern, search_python_files
+    from machineconfig.scripts.python.helpers_fire.fire_agents_load_balancer import chunk_prompts
     from machineconfig.utils.accessories import get_repo_root, randstr
     import json
 

machineconfig/scripts/python/choose_wezterm_theme.py

@@ -52,14 +52,14 @@ def main2():
 
 def set_theme(theme: str):
     print(f"🔄 Setting WezTerm theme to: {theme}")
-    txt_lines = PathExtended("~/.config/wezterm/wezterm.lua").expanduser().read_text(encoding="utf-8").splitlines()
+    txt_lines = PathExtended.home().joinpath(".config/wezterm/wezterm.lua").expanduser().read_text(encoding="utf-8").splitlines()
     res_lines = []
     for line in txt_lines:
         if "config.color_scheme = " in line:
             res_lines.append(f"config.color_scheme = '{theme}'")
         else:
             res_lines.append(line)
-    PathExtended("~/.config/wezterm/wezterm.lua").expanduser().write_text("\n".join(res_lines), encoding="utf-8")
+    PathExtended.home().joinpath(".config/wezterm/wezterm.lua").expanduser().write_text("\n".join(res_lines), encoding="utf-8")
     time.sleep(0.1)
     print("💾 Configuration saved")
 

machineconfig/scripts/python/devops.py

@@ -34,7 +34,7 @@ app.add_typer(self_app, name="self")
 @self_app.command()
 def update():
     """🔄 UPDATE essential repos"""
-    import machineconfig.scripts.python.devops_update_repos as helper
+    import machineconfig.scripts.python.devops_helpers.devops_update_repos as helper
     helper.main()
 @self_app.command()
 def interactive():
@@ -44,7 +44,7 @@ def interactive():
 @self_app.command()
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
-    import machineconfig.scripts.python.devops_status as helper
+    import machineconfig.scripts.python.devops_helpers.devops_status as helper
     helper.main()
 @self_app.command()
 def clone():
@@ -100,12 +100,12 @@ def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="C
 @nw_apps.command()
 def add_key():
     """🔑 SSH add pub key to this machine"""
-    import machineconfig.scripts.python.devops_add_ssh_key as helper
+    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
     helper.main()
 @nw_apps.command()
 def add_identity():
     """🗝️ SSH add identity (private key) to this machine"""
-    import machineconfig.scripts.python.devops_add_identity as helper
+    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
     helper.main()
 @nw_apps.command()
 def connect():
@@ -131,14 +131,14 @@ def setup():
 @app_data.command()
 def backup():
     """💾 BACKUP"""
-    from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="BACKUP")
 
 
 @app_data.command()
 def retrieve():
     """📥 RETRIEVE"""
-    from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="RETRIEVE")
 
 

machineconfig/scripts/python/{devops_update_repos.py → devops_helpers/devops_update_repos.py}

@@ -8,7 +8,7 @@ from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
 
-from machineconfig.scripts.python.repos_helper_update import RepositoryUpdateResult, run_uv_sync, update_repository
+from machineconfig.scripts.python.repos_helpers.repos_helper_update import RepositoryUpdateResult, run_uv_sync, update_repository
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 

machineconfig/scripts/python/fire_jobs.py

@@ -12,7 +12,7 @@ from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.path_helper import match_file_name, sanitize_path
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import get_repo_root, randstr
-from machineconfig.scripts.python.fire_jobs_args_helper import FireJobArgs, extract_kwargs, parse_fire_args_from_context
+from machineconfig.scripts.python.helpers_fire_command.fire_jobs_args_helper import FireJobArgs, extract_kwargs, parse_fire_args_from_context
 
 import platform
 from typing import Optional, Annotated
@@ -55,13 +55,13 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
     # =========================  choosing function to run
     choice_function: Optional[str] = None  # Initialize to avoid unbound variable
     if args.choose_function:
-        from machineconfig.scripts.python.fire_jobs_route_helper import choose_function_or_lines
+        from machineconfig.scripts.python.helpers_fire_command.fire_jobs_route_helper import choose_function_or_lines
         choice_function, choice_file, kwargs_dict = choose_function_or_lines(choice_file, kwargs_dict)
     else:
         choice_function = args.function
 
     if choice_file.suffix == ".py":
-        from machineconfig.scripts.python.fire_jobs_route_helper import get_command_streamlit
+        from machineconfig.scripts.python.helpers_fire_command.fire_jobs_route_helper import get_command_streamlit
         if args.streamlit:  exe = get_command_streamlit(choice_file, args.environment, repo_root)
         elif args.interactive is False: exe = "python"
         elif args.jupyter: exe = "jupyter-lab"

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -1,13 +1,26 @@
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.scripts.python.get_zellij_cmd import get_zellij_cmd
 from machineconfig.utils.code import write_shell_script_to_file
 import platform
+from pathlib import Path
 from rich.console import Console
 from rich.panel import Panel
 
 console = Console()
 
 
+def get_zellij_cmd(wd1: Path, wd2: Path) -> str:
+    _ = wd1, wd2
+    lines = [
+        """ zellij action new-tab --name gitdiff""",
+        """zellij action new-pane --direction down --name local --cwd ./data """,
+        """zellij action write-chars "cd '{wd1}'; git status" """,
+        """zellij action move-focus up; zellij action close-pane """,
+        """zellij action new-pane --direction down --name remote --cwd code """,
+        """zellij action write-chars "cd '{wd2}' """,
+        """git status" """,
+    ]
+    return "; ".join(lines)
+
 def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cloud: str):
     console.print(Panel("🗑️  Deleting remote repo copy and pushing local copy", title="[bold blue]Repo Sync[/bold blue]", border_style="blue"))
     repo_sync_root = PathExtended(remote_repo).expanduser().absolute()

machineconfig/scripts/python/{fire_agents_help_launch.py → helpers_fire/fire_agents_help_launch.py}

@@ -2,7 +2,7 @@
 import random
 import shlex
 from pathlib import Path
-from machineconfig.scripts.python.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER
+from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER
 
 
 def get_gemini_api_keys() -> list[str]: