machineconfig 3.2__tar.gz → 3.5__tar.gz

{machineconfig-3.2/src/machineconfig.egg-info → machineconfig-3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.2
+Version: 3.5
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -24,9 +24,6 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: toml>=0.10.2
-Requires-Dist: tomli>=2.2.1
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs

{machineconfig-3.2 → machineconfig-3.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.02"
+version = "3.05"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -33,9 +33,6 @@ dependencies = [
     "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
     "pyjson5>=1.6.9",
-    "pyyaml>=6.0.2",
-    "toml>=0.10.2",
-    "tomli>=2.2.1",
 ]
 
 [project.optional-dependencies]
@@ -83,6 +80,7 @@ crocodile = { path = "../crocodile", editable = true }
 
 [dependency-groups]
 dev = [
+    "aider>=0.2.6",
     "cleanpy>=0.5.1",
     "ipdb>=0.13.13",
     "ipykernel>=6.30.1",

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/wt_local_manager.py

@@ -6,7 +6,7 @@ import logging
 import subprocess
 from pathlib import Path
 from typing import Optional, Dict, List, Any
-from machineconfig.utils.utils5 import Scheduler
+from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.wt_local import WTLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/wt_remote_manager.py

@@ -4,7 +4,7 @@ import uuid
 import logging
 from pathlib import Path
 from typing import Optional, Any
-from machineconfig.utils.utils5 import Scheduler
+from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.wt_local import run_command_in_wt_tab
 from machineconfig.cluster.sessions_managers.wt_remote import WTRemoteLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/zellij_local.py

@@ -204,7 +204,7 @@ class ZellijLayoutGenerator:
                     elif cmd in proc_cmdline[0] and cmd not in shells:
                         # Non-shell command in first argument
                         is_match = True
-                    
+
                     # Additional shell wrapper filter - be more restrictive for shells
                     if is_match and proc_name in shells and args:
                         # For shell processes, ensure the match is actually meaningful
@@ -216,7 +216,7 @@ class ZellijLayoutGenerator:
                                 meaningful_match = True
                                 break
                             # Or if it's an exact script name match
-                            elif arg.endswith('.py') or arg.endswith('.sh') or arg.endswith('.rb'):
+                            elif arg.endswith(".py") or arg.endswith(".sh") or arg.endswith(".rb"):
                                 if any(arg in cmdline_arg for cmdline_arg in proc_cmdline[1:]):
                                     meaningful_match = True
                                     break

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/zellij_local_manager.py

@@ -11,7 +11,7 @@ from typing import Optional, List
 from rich.console import Console
 
 from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types import SessionReport, GlobalSummary, StartResult, ActiveSessionInfo, StatusRow
-from machineconfig.utils.utils5 import Scheduler
+from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.zellij_local import ZellijLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/zellij_remote_manager.py

@@ -3,7 +3,7 @@ import json
 import uuid
 from pathlib import Path
 from typing import Optional, Dict
-from machineconfig.utils.utils5 import Scheduler
+from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.zellij_local import run_command_in_zellij_tab
 from machineconfig.cluster.sessions_managers.zellij_remote import ZellijRemoteLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/sessions_managers/zellij_utils/monitoring_types.py

@@ -1,4 +1,3 @@
-
 from typing import NotRequired, TypedDict, Optional
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 
@@ -16,11 +15,11 @@ class ProcessInfo(TypedDict):
 
 
 class CommandStatus(TypedDict):
-    status: str                   # e.g. running | not_running | unknown | error
-    running: bool                 # Convenience boolean
+    status: str  # e.g. running | not_running | unknown | error
+    running: bool  # Convenience boolean
     processes: list[ProcessInfo]  # Matching processes (can be empty)
-    command: str                  # Original command string ('' if unknown)
-    tab_name: str                 # Tab identifier
+    command: str  # Original command string ('' if unknown)
+    tab_name: str  # Tab identifier
     # Optional / contextual fields
     cwd: NotRequired[str]
     error: NotRequired[str]
@@ -30,12 +29,15 @@ class CommandStatus(TypedDict):
     method: NotRequired[str]
     raw_output: NotRequired[str]
     verification_method: NotRequired[str]
+
+
 class CommandSummary(TypedDict):
     total_commands: int
     running_commands: int
     stopped_commands: int
     session_healthy: bool
 
+
 class ZellijSessionStatus(TypedDict):
     zellij_running: bool
     session_exists: bool
@@ -48,20 +50,28 @@ class SessionReport(TypedDict):
     session_status: ZellijSessionStatus  # ZellijSessionStatus from zellij_local
     commands_status: dict[str, CommandStatus]  # dict[str, CommandStatus from zellij_local]
     summary: CommandSummary
+
+
 class ComprehensiveStatus(TypedDict):
     zellij_session: ZellijSessionStatus
     commands: dict[str, CommandStatus]
     summary: CommandSummary
+
+
 class SessionMetadata(TypedDict):
     session_name_prefix: str
     created_at: str
     num_managers: int
     sessions: list[str]
     manager_type: str
+
+
 class ManagerData(TypedDict):
     session_name: Optional[str]
     layout_config: Optional[LayoutConfig]  # Will be LayoutConfig from layout_types
     layout_path: Optional[str]
+
+
 class ActiveSessionInfo(TypedDict):
     session_name: str
     is_active: bool
@@ -84,11 +94,11 @@ class StartResult(TypedDict):
     success: bool
     message: NotRequired[str]
     error: NotRequired[str]
+
+
 class StatusRow(TypedDict):
     session: str
     tab: str
     running: bool
     command: str
     processes: int
-
-

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/cluster/templates/utils.py

@@ -1,5 +1,5 @@
 from typing import Optional
-from machineconfig.utils.path_reduced import PathExtended, PLike
+from machineconfig.utils.path_extended import PathExtended, PLike
 
 
 def to_cloud(

machineconfig-3.5/src/machineconfig/jobs/linux/msc/cli_agents.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+
+# Terminal-based CLI agents and tools for productivity and coding.
+npm install -g @google/gemini-cli
+npm install -g @charmland/crush
+npm install -g opencode-ai@latest  # or curl -fsSL https://opencode.ai/install | bash
+uv tool install --force --python python3.12 --with pip aider-chat@latest
+
+
+# cursor-cli
+curl https://cursor.com/install -fsS | bash
+cd $HOME/Downloads
+curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
+unzip q.zip
+./q/install.sh  # goes to ~/.local/bin.
+rm q.zip
+rm -rfd q
+
+# Vscode extensions for AI-assisted coding.
+# Github copilot
+# Roo
+# Cline
+# Kilocode
+# Continue
+# CodeGPT
+# qodo (and cli)
+
+# Editors based on AI
+# Kiro
+# Cursor
+

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python/python_ve_symlink.py

@@ -1,6 +1,6 @@
 """Symlinks"""
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 # from machineconfig.utils.utils import display_options
 
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python/vscode/api.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.accessories import randstr
 
 
 def open_file_in_new_instance(file_path: str):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python/vscode/select_interpreter.py

@@ -3,8 +3,8 @@
 # import os
 # import json
 from pathlib import Path
-from machineconfig.utils.io_save import save_json
-from machineconfig.utils.utils2 import read_json
+from machineconfig.utils.io import save_json
+from machineconfig.utils.io import read_json
 import argparse
 import platform
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python/vscode/sync_code.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from configparser import SectionProxy
-from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.io import read_ini
 
 config = read_ini(Path.home().joinpath(".ssh", "config"))
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/archive/ngrok.py

@@ -5,15 +5,16 @@ flagged as virus by 35% of antivirus engines
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {
-    "repo_url": "CUSTOM",
+config_dict: InstallerData = {
+    "appName": "ngrok",
+    "repoURL": "CUSTOM",
     "doc": "ngrok secure introspectable tunnels to localhost",
-    "filename_template_windows_amd_64": "ngrok-stable-windows-amd64.zip",
-    "filename_template_linux_amd_64": "ngrok-stable-linux-amd64.zip",
-    "strip_v": False,
-    "exe_name": "ngrok",
+    "filenameTemplate": {"amd64": {"windows": "ngrok-stable-windows-amd64.zip", "linux": "ngrok-stable-linux-amd64.zip", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "ngrok",
 }
 
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/aider.py

@@ -1,7 +1,15 @@
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 import platform
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Aider Chat", "filename_template_windows_amd_64": "aider-chat-{}.exe", "filename_template_linux_amd_64": "aider-chat-{}.deb", "strip_v": True, "exe_name": "aider-chat"}
+config_dict: InstallerData = {
+    "appName": "aider-chat",
+    "repoURL": "https://github.com/paul-gauthier/aider",
+    "doc": "Aider Chat",
+    "filenameTemplate": {"amd64": {"windows": "aider-chat-{}.exe", "linux": "aider-chat-{}.deb", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "aider-chat",
+}
 
 
 def main(version: Optional[str] = None):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/alacritty.py

@@ -2,9 +2,10 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Terminal Console", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "alacritty"}
+config_dict: InstallerData = {"appName": "Alacritty", "repoURL": "CUSTOM", "doc": "Terminal Console", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "alacritty"}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/brave.py

@@ -3,8 +3,17 @@
 import platform
 from typing import Optional
 
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Chrome with no ads", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "brave"}
+
+config_dict: InstallerData = {
+    "appName": "Brave",
+    "repoURL": "CUSTOM",
+    "doc": "Privacy-focused web browser with built-in ad blocking",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "brave",
+}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/bypass_paywall.py

@@ -2,10 +2,18 @@
 
 # from platform import system
 from typing import Optional
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-
-
-config_dict = {"repo_url": "CUSTOM", "doc": """Plugin for chrome to bypass paywalls""", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "pluginName"}
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+
+
+config_dict: InstallerData = {
+    "appName": "bypass-paywalls-chrome",
+    "repoURL": "https://github.com/iamadamdev/bypass-paywalls-chrome",
+    "doc": """Plugin for chrome to bypass paywalls""",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "",
+}
 
 
 def main(version: Optional[str] = None):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/code.py

@@ -2,9 +2,16 @@
 
 from typing import Optional
 import platform
-
-
-config_dict = {"repo_url": "CUSTOM", "doc": "Visual Studio Code", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "code"}
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+config_dict: InstallerData = {
+    "appName": "Visual Studio Code",
+    "repoURL": "CUSTOM",
+    "doc": "Visual Studio Code",
+    "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "code",
+}
 
 
 def main(version: Optional[str] = None):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/cursor.py

@@ -4,9 +4,10 @@ from pathlib import Path
 import platform
 import subprocess
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Cursor", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "cursor"}
+config_dict: InstallerData = {"appName": "Cursor", "repoURL": "CUSTOM", "doc": "Cursor", "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}}, "stripVersion": True, "exeName": "cursor"}
 
 
 def install_linux(version: Optional[str] = None):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/docker_desktop.py

@@ -4,6 +4,7 @@ Installer
 
 # from machineconfig.utils.installer import get_latest_release
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 # https://docs.docker.com/desktop/install/ubuntu/
 # https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository
@@ -14,13 +15,13 @@ from typing import Optional
 # fname = r"bytehound-x86_64-unknown-linux-gnu.tgz"
 
 
-config_dict = {
-    "repo_url": "CUSTOM",
+config_dict: InstallerData = {
+    "appName": "docker_desktop",
+    "repoURL": "CUSTOM",
     "doc": """Docker Desktop for Ubuntu as per https://docs.docker.com/desktop/install/ubuntu/""",
-    "filename_template_windows_amd_64": "gh_{}_windows_amd64.zip",
-    "filename_template_linux_amd_64": "gh_{}_linux_amd64.tar.gz",
-    "strip_v": True,
-    "exe_name": "docker",
+    "filenameTemplate": {"amd64": {"windows": "gh_{}_windows_amd64.zip", "linux": "gh_{}_linux_amd64.tar.gz", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "docker",
 }
 
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/espanso.py

@@ -5,8 +5,16 @@ https://github.com/espanso/espanso
 """
 
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "A text expander.", "filename_template_windows_amd_64": "Espanso-Win-Installer-x86_64.exe", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "espanso"}
+config_dict: InstallerData = {
+    "appName": "espanso",
+    "repoURL": "CUSTOM",
+    "doc": "A text expander.",
+    "filenameTemplate": {"amd64": {"windows": "Espanso-Win-Installer-x86_64.exe", "linux": "", "macos": "Espanso.dmg"}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "espanso",
+}
 
 
 def main(version: Optional[str]):
@@ -21,7 +29,7 @@ def main(version: Optional[str]):
     _ = version
     import platform
 
-    config_dict["repo_url"] = "https://github.com/espanso/espanso"
+    config_dict["repoURL"] = "https://github.com/espanso/espanso"
     if platform.system() == "Windows":
         print("🪟 Installing Espanso on Windows...")
     elif platform.system() in ["Linux", "Darwin"]:
@@ -36,7 +44,7 @@ def main(version: Optional[str]):
 📦 Using Wayland-specific package
 {"=" * 150}
 """)
-                config_dict["filename_template_linux_amd_64"] = "espanso-debian-wayland-amd64.deb"
+                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-wayland-amd64.deb"
             else:
                 print(f"""
 {"=" * 150}
@@ -44,10 +52,10 @@ def main(version: Optional[str]):
 📦 Using X11-specific package
 {"=" * 150}
 """)
-                config_dict["filename_template_linux_amd_64"] = "espanso-debian-x11-amd64.deb"
+                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-x11-amd64.deb"
         else:  # Darwin/macOS
             print("🍎 Installing Espanso on macOS...")
-            config_dict["filename_template_linux_amd_64"] = "Espanso.dmg"
+            config_dict["filenameTemplate"]["amd64"]["macos"] = "Espanso.dmg"
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         print(f"""
@@ -60,7 +68,7 @@ def main(version: Optional[str]):
     print("🚀 Installing Espanso using installer...")
     from machineconfig.utils.installer_utils.installer_class import Installer
 
-    installer = Installer.from_dict(config_dict, name="espanso")
+    installer = Installer(config_dict)
     installer.install(version=None)
 
     config = """

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/goes.py

@@ -5,7 +5,16 @@ https://github.com/ShishirPatil/gorilla
 
 # import subprocess
 
-config_dict = {"repo_url": "CUSTOM", "doc": "natural language to API", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "goex"}
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+config_dict: InstallerData = {
+    "appName": "Gorilla",
+    "repoURL": "https://github.com/ShishirPatil/gorilla",
+    "doc": "natural language to API",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "goex",
+}
 
 ve_name = "goex"
 

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/lvim.py

@@ -4,13 +4,21 @@ from machineconfig.utils.terminal import Terminal
 import subprocess
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
 _ = Terminal, subprocess
 # as per https://www.lunarvim.org/docs/installation
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Terminal text editor based on neovim.", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "lvim"}
+config_dict: InstallerData = {
+    "appName": "lvim",
+    "repoURL": "CUSTOM",
+    "doc": "Terminal text editor based on neovim.",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "lvim",
+}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/nerdfont.py

@@ -2,9 +2,17 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "lightweight containerization", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "nerdfont"}
+config_dict: InstallerData = {
+    "appName": "nerdfont",
+    "repoURL": "CUSTOM",
+    "doc": "lightweight containerization",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "nerdfont",
+}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/redis.py

@@ -2,9 +2,9 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-
-config_dict = {"repo_url": "CUSTOM", "doc": "submillisecond fast key-value db", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "redis"}
+config_dict: InstallerData = {"appName": "Redis", "repoURL": "CUSTOM", "doc": "submillisecond fast key-value db", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "redis"}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/wezterm.py

@@ -3,8 +3,10 @@
 import platform
 from typing import Optional
 
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "cli for wezterm", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "wezterm"}
+
+config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CUSTOM", "doc": "Modern, GPU-accelerated terminal emulator", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "wezterm"}
 
 
 def main(version: Optional[str]):

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/dev/winget.py

@@ -3,9 +3,10 @@ import requests
 import tempfile
 from pathlib import Path
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "winget installer", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "winget"}
+config_dict: InstallerData = {"appName": "winget", "repoURL": "CUSTOM", "doc": "winget installer", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "winget"}
 
 
 def is_winget_available() -> bool:

{machineconfig-3.2 → machineconfig-3.5}/src/machineconfig/jobs/python_custom_installers/docker.py

@@ -2,9 +2,17 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "lightweight containerization", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "docker"}
+config_dict: InstallerData = {
+    "appName": "docker",
+    "repoURL": "CUSTOM",
+    "doc": "lightweight containerization",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "docker",
+}
 
 
 def main(version: Optional[str]):