machineconfig 6.51__tar.gz → 6.53__tar.gz

{machineconfig-6.51/src/machineconfig.egg-info → machineconfig-6.53}/PKG-INFO

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

{machineconfig-6.51 → machineconfig-6.53}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.51"
+version = "6.53"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -99,6 +99,7 @@ dev = [
     "pre-commit>=4.3.0",
     "pudb>=2025.1",
     "pylint>=3.3.8",
+    "pypdf>=6.1.1",
     "pyrefly>=0.33.1",
     "pyright>=1.1.405",
     "pytest>=8.4.2",

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -5,13 +5,13 @@ from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutCo
 from pathlib import Path
 
 def get_fire_command_and_artifact_files(func: FunctionType):
-    from machineconfig.utils.meta import function_to_script
-    py_script =  function_to_script(func, call_with_kwargs=None)
+    from machineconfig.utils.meta import lambda_to_defstring
+    py_script =  lambda_to_defstring(lmb=lambda: func, in_global=True)
     from machineconfig.utils.accessories import randstr
     py_script_path = Path.home().joinpath("tmp_results", "tmp_py_scripts", f"tmp_{randstr(10)}.py")
     py_script_path.parent.mkdir(parents=True, exist_ok=True)
     py_script_path.write_text(py_script, encoding="utf-8")
-    command_to_run = f"uv run --project $HOME/ {py_script_path}"
+    command_to_run = f"uv run {py_script_path}"
     tab_config: TabConfig = {
         "command": command_to_run,
         "startDir": "$HOME",

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/jobs/installer/check_installations.py

@@ -221,7 +221,6 @@ APP_SUMMARY_PATH = CONFIG_ROOT.joinpath(f"profile/records/{platform.system().low
 #         #     cli_installers = get_cli_py_installers()
 #         # else: raise NotImplementedError(f"Platform {platform.system().lower()} is not supported yet.")
 
-#         if name == "essentials":
 #             print(f"""
 # {'=' * 150}
 # 📥 DOWNLOAD | Downloading {len(self.data)} apps...

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/jobs/installer/installer_data.json

@@ -2144,6 +2144,23 @@
         }
       }
     },
+    {
+      "appName": "cline",
+      "repoURL": "CMD",
+      "doc": "Cline agent extension in the terminal",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "npm install -g cline",
+          "windows": "npm install -g cline",
+          "macos": "npm install -g cline"
+        },
+        "arm64": {
+          "linux": "npm install -g cline",
+          "windows": "npm install -g cline",
+          "macos": "npm install -g cline"
+        }
+      }
+    },
     {
       "appName": "copilot",
       "repoURL": "CMD",

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/croshell.py

@@ -127,7 +127,7 @@ def croshell(
         fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--with "marimo,machineconfig[plot]>=6.51" """
+        else: requirements = """--with "marimo,machineconfig[plot]>=6.52" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -135,14 +135,14 @@ uv run  {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with jupyterlab """
-        else: requirements = """--with "machineconfig[plot]>=6.51" """
+        else: requirements = """--with "machineconfig[plot]>=6.52" """
         fire_line = f"uv run {requirements} jupyter-lab {str(nb_target)}"
     elif vscode:
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv init --python 3.14
 uv venv
-uv add "machineconfig[plot]>=6.51"
+uv add "machineconfig[plot]>=6.52"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -150,7 +150,7 @@ code --new-window {str(pyfile)}
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
         if Path.home().joinpath("code/machineconfig").exists(): ve_line = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: ve_line = """--with "machineconfig[plot]>=6.51" """
+        else: ve_line = """--with "machineconfig[plot]>=6.52" """
         # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.51",
+#     "machineconfig>=6.52",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/fire_jobs.py

@@ -204,19 +204,22 @@ def fire(
     cmd: Annotated[bool, typer.Option("--cmd", "-B", help="Create a cmd fire command to launch the job asynchronously")] = False,
     interactive: Annotated[bool, typer.Option("--interactive", "-i", help="Whether to run the job interactively using IPython")] = False,
     debug: Annotated[bool, typer.Option("--debug", "-d", help="Enable debug mode")] = False,
-    choose_function: Annotated[bool, typer.Option("--choose_function", "-c", help="Choose function interactively")] = False,
+    choose_function: Annotated[bool, typer.Option("--choose-function", "-c", help="Choose function interactively")] = False,
     loop: Annotated[bool, typer.Option("--loop", "-l", help="Infinite recursion (runs again after completion/interruption)")] = False,
     jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="Open in a jupyter notebook")] = False,
-    submit_to_cloud: Annotated[bool, typer.Option("--submit_to_cloud", "-C", help="Submit to cloud compute")] = False,
-    remote: Annotated[bool, typer.Option("--remote", "-r", help="Launch on a remote machine")] = False,
     module: Annotated[bool, typer.Option("--module", "-m", help="Launch the main file")] = False,
+    optimized: Annotated[bool, typer.Option("--optimized", "-O", help="Run the optimized version of the function")] = False,
+    zellij_tab: Annotated[Optional[str], typer.Option("--zellij-tab", "-z", help="Open in a new zellij tab")] = None,
+    
+    submit_to_cloud: Annotated[bool, typer.Option("--submit-to-cloud", "-C", help="Submit to cloud compute")] = False,
+    remote: Annotated[bool, typer.Option("--remote", "-r", help="Launch on a remote machine")] = False,
+
     streamlit: Annotated[bool, typer.Option("--streamlit", "-S", help="Run as streamlit app")] = False,
     environment: Annotated[str, typer.Option("--environment", "-E", help="Choose ip, localhost, hostname or arbitrary url")] = "",
     holdDirectory: Annotated[bool, typer.Option("--holdDirectory", "-D", help="Hold current directory and avoid cd'ing to the script directory")] = False,
     PathExport: Annotated[bool, typer.Option("--PathExport", "-P", help="Augment the PYTHONPATH with repo root")] = False,
-    git_pull: Annotated[bool, typer.Option("--git_pull", "-g", help="Start by pulling the git repo")] = False,
-    optimized: Annotated[bool, typer.Option("--optimized", "-O", help="Run the optimized version of the function")] = False,
-    zellij_tab: Annotated[Optional[str], typer.Option("--zellij_tab", "-z", help="Open in a new zellij tab")] = None,
+
+    git_pull: Annotated[bool, typer.Option("--git-pull", "-g", help="Start by pulling the git repo")] = False,
     watch: Annotated[bool, typer.Option("--watch", "-w", help="Watch the file for changes")] = False,
 ) -> None:
     """Main function to process fire jobs arguments."""
@@ -254,7 +257,6 @@ def fire(
     except Exception as e:
         # For other exceptions, print clean error message and exit
         import sys
-
         print(f"❌ Error: {e}", file=sys.stderr)
         sys.exit(1)
 

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -36,13 +36,14 @@ def shell():
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     create_default_shell_profile()
 
+
 def path():
     """📚 NAVIGATE PATH variable with TUI"""
     from machineconfig.scripts.python import env_manager as navigator
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
     from machineconfig.utils.code import run_shell_script
-    if not Path.home().joinpath("code/machineconfig").exists(): executable = """--with "machineconfig>=6.51,textual" """
+    if not Path.home().joinpath("code/machineconfig").exists(): executable = """--with "machineconfig>=6.52,textual" """
     else: executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
     run_shell_script(f"""uv run {executable} {path}""")
 
@@ -78,7 +79,7 @@ def get_app():
     config_apps.command("path", no_args_is_help=False, help="📚  [p] NAVIGATE PATH variable with TUI")(path)
     config_apps.command("p", no_args_is_help=False, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
     config_apps.command("pwsh-theme", no_args_is_help=False, help="🔗  [t] Select powershell prompt theme.")(pwsh_theme)
-    config_apps.command("t", no_args_is_help=True, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
+    config_apps.command("t", no_args_is_help=False, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
     config_apps.command("copy-assets", no_args_is_help=True, help="🔗  [c] Copy asset files from library to machine.", hidden=False)(copy_assets)
     config_apps.command("c", no_args_is_help=True, help="Copy asset files from library to machine.", hidden=True)(copy_assets)
     return config_apps

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -40,9 +40,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install --upgrade "machineconfig>=6.51" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.52" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.51" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.52" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -67,7 +67,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.51,textual" """
+    else: executable = """--with "machineconfig>=6.52,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -78,8 +78,51 @@ def download(
             raise typer.Exit(code=1)
 
 
+def merge_pdfs(
+        pdf1: Annotated[str, typer.Argument(..., help="Path to the first PDF file.")],
+        pdf2: Annotated[str, typer.Argument(..., help="Path to the second PDF file.")],
+        output: Annotated[Optional[str], typer.Option("--output", "-o", help="Output merged PDF file path.")] = None,
+        compress: Annotated[bool, typer.Option("--compress", "-c", help="Compress the output PDF.")] = False,
+    ) -> None:
+    def merge_pdfs_internal(pdf1: str, pdf2: str, output: Optional[str], compress: bool) -> None:
+        from pypdf import PdfReader, PdfWriter
+        writer = PdfWriter()
+        for pdf_path in [pdf1, pdf2]:
+            reader = PdfReader(pdf_path)
+            for page in reader.pages:
+                writer.add_page(page)
+        output_path = output if output else "merged.pdf"
+        if compress:
+            try:
+                for p in writer.pages:
+                    try:
+                        # PageObject.compress_content_streams exists in pypdf
+                        p.compress_content_streams()
+                    except Exception:
+                        # best-effort: ignore per-page compression failures
+                        continue
+            except Exception:
+                pass
+            try:
+                writer.compress_identical_objects()
+            except Exception:
+                # non-fatal if this fails
+                pass
+        writer.write(output_path)
+        print(f"✅ Merged PDF saved to: {output_path}")
+    from machineconfig.utils.meta import lambda_to_defstring
+    code = lambda_to_defstring(lambda : merge_pdfs_internal(pdf1=pdf1, pdf2=pdf2, output=output, compress=compress), in_global=True)
+    import tempfile
+    tmp_py_file = Path(tempfile.mkstemp(suffix=".py")[1])
+    tmp_py_file.write_text(code, encoding="utf-8")
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(f"""uv run --with pypdf {tmp_py_file} """)
+
+
 def get_app() -> typer.Typer:
     app = typer.Typer(help="🛠️ [u]  utilities operations", no_args_is_help=True, add_help_option=False, add_completion=False)
     app.command(name="download", no_args_is_help=True, help="[d] Download a file from a URL and optionally decompress it.")(download)
     app.command(name="d", no_args_is_help=True, hidden=True)(download)
+    app.command(name="merge-pdfs", no_args_is_help=True, help="[m] Merge two PDF files into one.")(merge_pdfs)
+    app.command(name="m", no_args_is_help=True, hidden=True)(merge_pdfs)
     return app

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -6,7 +6,7 @@ import typer
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
 from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
-from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
+from machineconfig.utils.code import get_shell_file_executing_python_script
 from pathlib import Path
 import platform
 import subprocess
@@ -76,10 +76,17 @@ git pull originEnc master
 
 """
 
-    if Path.home().joinpath("code/machineconfig").exists(): executable = f"""uv run --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-    else: executable = """uv run --with "machineconfig>=6.51" """
+    if Path.home().joinpath("code/machineconfig").exists():
+        uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
+        uv_with = None
+    else:
+        uv_with = ["machineconfig>=6.52"]
+        uv_project_dir = None
+
+    import tempfile
+    shell_path = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+    shell_path.write_text(script, encoding="utf-8")
 
-    shell_path = write_shell_script_to_file(shell_script=script)
     command = f". {shell_path}"
     if platform.system() == "Windows":
         completed = subprocess.run(["powershell", "-Command", command], capture_output=True, check=False, text=True)
@@ -100,20 +107,12 @@ git pull originEnc master
 
         # ================================================================================
         option1 = "Delete remote copy and push local:"
-        from machineconfig.utils.meta import function_to_script
+        from machineconfig.utils.meta import lambda_to_defstring
         def func2(remote_repo: str, local_repo: str, cloud: str):
             from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
             delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
-            return "done"
-        # def func2(remote_repo: str=str(repo_remote_root), local_repo: str=str(repo_local_root), cloud: str=str(cloud_resolved)):
-        #     from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
-        #     delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
-        #     return "done"
-        # program_1_py = function_to_script(func=func2, call_with_kwargs=None)
-        program_1_py = function_to_script(func=func2, call_with_kwargs={"remote_repo": str(repo_remote_root), "local_repo": str(repo_local_root), "cloud": cloud_resolved})
-
-
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable=executable)
+        program_1_py = lambda_to_defstring(lambda: func2(remote_repo=str(repo_remote_root), local_repo=str(repo_local_root), cloud=str(cloud_resolved)), in_global=True)
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
@@ -126,15 +125,19 @@ sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
-        shell_file_2 = write_shell_script_to_file(shell_script=program_2)
+        import tempfile
+        shell_file_2 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+        shell_file_2.write_text(program_2, encoding="utf-8")
+
         # ================================================================================
         option3 = "Inspect repos:"
         def func(repo_local_root: str, repo_remote_root: str):
             from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
             inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
-            return "done"
-        program_3_py = function_to_script(func=func, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable=executable)
+        # program_3_py = function_to_script(func=func, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
+        # shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable=executable)
+        program_3_py = lambda_to_defstring(lambda: func(repo_local_root=str(repo_local_root), repo_remote_root=str(repo_remote_root)), in_global=True)
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"
@@ -145,7 +148,8 @@ cd $HOME/dotfiles
 git commit -am "finished merging"
 . {shell_file_1}
 """
-        shell_file_4 = write_shell_script_to_file(shell_script=program_4)
+        shell_file_4 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+        shell_file_4.write_text(program_4, encoding="utf-8")
         # ================================================================================
 
         console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_repos/count_lines_frontend.py

@@ -8,7 +8,7 @@ def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help=
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
     # --project $HOME/code/ machineconfig --group plot
-    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.51" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.52" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/helpers_repos/sync.py

@@ -1,5 +1,4 @@
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.code import write_shell_script_to_file
 import platform
 from pathlib import Path
 from rich.console import Console
@@ -56,11 +55,12 @@ def inspect_repos(repo_local_root: str, repo_remote_root: str):
 
     if platform.system() == "Windows":
         program = get_wt_cmd(wd1=PathExtended(repo_local_root), wd2=PathExtended(repo_local_root))
-        write_shell_script_to_file(shell_script=program)
-        return None
     elif platform.system() in ["Linux", "Darwin"]:
         program = get_zellij_cmd(wd1=PathExtended(repo_local_root), wd2=PathExtended(repo_remote_root))
-        write_shell_script_to_file(shell_script=program)
-        return None
     else:
         raise NotImplementedError(f"Platform {platform.system()} not implemented.")
+    import tempfile
+    with tempfile.NamedTemporaryFile(mode='w', suffix=".sh" if platform.system() != "Windows" else ".ps1", delete=False, encoding='utf-8') as temp_file:
+        temp_file.write(program)
+        temp_script_path = PathExtended(temp_file.name)
+    console.print(Panel(f"🚀 Launching repo inspection tool...\n\n[blue]{temp_script_path}[/blue]", border_style="blue"))

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.51" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.52" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.51" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.52" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-6.51 → machineconfig-6.53}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.51" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.52" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

machineconfig-6.53/src/machineconfig/setup_mac/__init__.py

@@ -0,0 +1,17 @@
+"""Mac setup module for machineconfig.
+
+This module provides setup script locations and configurations for macOS systems.
+It mirrors the layout used by the Linux setup module and exposes Path objects
+pointing at common scripts (so other code can import these paths).
+"""
+
+from pathlib import Path
+
+# Path to main installer script for macOS
+APPS = Path(__file__).parent.joinpath("apps.sh")
+# Optional helper scripts (may or may not exist)
+UV = Path(__file__).parent.joinpath("uv.sh")
+# Path to macOS SSH helper
+SSH_SETUP = Path(__file__).parent.joinpath("ssh/openssh_setup.sh")
+
+__all__ = ["APPS", "UV", "SSH_SETUP"]

machineconfig-6.53/src/machineconfig/setup_mac/apps.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+echo "🔄 Updating Homebrew..."
+brew update || true
+
+# --GROUP:ESSENTIAL_SYSTEM:git,nano,curl,nvm,nodejs,brave-browser,visual-studio-code
+echo "📥 Installing essential tools..."
+echo "📥 Installing Git version control..."
+echo "📥 Installing Nano text editor..."
+echo "📥 Installing Node Version Manager (NVM)..."
+# Note: git and nano are pre-installed on macOS, but we install via Homebrew to ensure latest versions
+brew install git || true
+brew install nano || true
+brew install curl || true
+# Install NVM
+if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
+    echo "📥 Installing NVM (Node Version Manager)..."
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+fi
+echo "🔧 Configuring NVM environment..."
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+echo "📥 Installing latest Node.js..."
+nvm install node || true
+brew install --cask brave-browser || true
+brew install --cask visual-studio-code || true
+
+# Database tools
+# echo "📥 Installing SQLite - lightweight SQL database..."
+# echo "📥 Installing PostgreSQL client..."
+# echo "📥 Installing Redis command-line tools..."
+# brew install sqlite3 || true
+# brew install postgresql || true
+# brew install redis || true
+
+# --GROUP:TerminalEyeCandy:fortune,toilet,sl,cmatrix,chafa
+echo "📥 Installing fortune - random wisdom generator..."
+echo "📥 Installing figlet - ASCII art text generator..."
+echo "📥 Installing cowsay - ASCII cow speech generator..."
+echo "📥 Installing lolcat - colorized text output..."
+echo "📥 Installing chafa - terminal image viewer..."
+brew install fortune || true
+brew install figlet || true
+brew install cowsay || true
+brew install lolcat || true
+brew install chafa || true
+
+# --GROUP:NetworkTools: sshfs,nfs-utils
+echo "📥 Installing SSHFS - mount remote filesystems over SSH..."
+echo "📥 Installing NFS utilities..."
+brew install sshfs || true
+brew install nfs-utils || true
+
+# --GROUP:DEV_SYSTEM: graphviz,make,rust,sqlite3,postgresql-client,redis-tools,ffmpeg
+echo "📥 Installing Graphviz - graph visualization software..."
+echo "📥 Installing make - build automation tool..."
+echo "📥 Installing FFmpeg - multimedia framework..."
+echo "📥 Installing SSL/TLS development libraries..."
+echo "📥 Installing Rust programming language and toolchain..."
+brew install graphviz || true
+brew install make || true
+brew install ffmpeg || true
+brew install openssl || true
+
+# Install Rust if not already installed
+if ! command -v rustc &> /dev/null; then
+    echo "📥 Installing Rust..."
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y || true
+fi
+
+
+

machineconfig-6.53/src/machineconfig/setup_mac/ssh/openssh_setup.sh

@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+
+# 🔐 OpenSSH Setup for macOS
+# This script sets up SSH configuration and permissions on macOS
+
+echo "🔐 Starting OpenSSH setup for macOS..."
+
+# ✅ SSH is built-in on macOS (OpenSSH comes pre-installed)
+echo "✅ OpenSSH is pre-installed on macOS"
+
+# 📁 Create SSH directory with correct permissions
+echo "📁 Setting up SSH directory..."
+mkdir -p ~/.ssh
+chmod 700 ~/.ssh
+echo "✅ SSH directory created with correct permissions (700)"
+
+# 📝 Create authorized_keys file if it doesn't exist
+if [ ! -f ~/.ssh/authorized_keys ]; then
+    touch ~/.ssh/authorized_keys
+    chmod 600 ~/.ssh/authorized_keys
+    echo "✅ Created authorized_keys file"
+else
+    echo "✅ authorized_keys file already exists"
+    chmod 600 ~/.ssh/authorized_keys
+fi
+
+# 🔑 Create SSH keys if they don't exist
+if [ ! -f ~/.ssh/id_rsa ]; then
+    echo "🔑 Generating SSH keys (RSA)..."
+    ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa -N "" -C "$(whoami)@$(hostname)"
+    echo "✅ SSH RSA keys generated: ~/.ssh/id_rsa"
+else
+    echo "✅ SSH keys already exist"
+fi
+
+# 🔐 Create Ed25519 keys (modern alternative)
+if [ ! -f ~/.ssh/id_ed25519 ]; then
+    echo "🔑 Generating SSH keys (Ed25519)..."
+    ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -N "" -C "$(whoami)@$(hostname)"
+    echo "✅ SSH Ed25519 keys generated: ~/.ssh/id_ed25519"
+else
+    echo "✅ SSH Ed25519 keys already exist"
+fi
+
+# 🔧 Configure SSH config file for convenience
+SSH_CONFIG="$HOME/.ssh/config"
+if [ ! -f "$SSH_CONFIG" ]; then
+    echo "📝 Creating SSH config file..."
+    cat > "$SSH_CONFIG" << 'EOF'
+# SSH Config File for macOS
+# Add your remote hosts below
+
+# Example host configuration:
+# Host myserver
+#     HostName example.com
+#     User username
+#     Port 22
+#     IdentityFile ~/.ssh/id_ed25519
+#     IdentityFile ~/.ssh/id_rsa
+
+# Global settings
+Host *
+    AddKeysToAgent yes
+    UseKeychain yes
+    IdentityFile ~/.ssh/id_ed25519
+    IdentityFile ~/.ssh/id_rsa
+    ServerAliveInterval 60
+EOF
+    chmod 600 "$SSH_CONFIG"
+    echo "✅ SSH config file created: $SSH_CONFIG"
+else
+    echo "✅ SSH config file already exists"
+fi
+
+# 🔒 Ensure correct file permissions
+echo "🔒 Setting correct SSH file permissions..."
+chmod 700 ~/.ssh
+chmod 600 ~/.ssh/authorized_keys 2>/dev/null || true
+chmod 600 ~/.ssh/id_rsa 2>/dev/null || true
+chmod 644 ~/.ssh/id_rsa.pub 2>/dev/null || true
+chmod 600 ~/.ssh/id_ed25519 2>/dev/null || true
+chmod 644 ~/.ssh/id_ed25519.pub 2>/dev/null || true
+chmod 600 ~/.ssh/config 2>/dev/null || true
+echo "✅ SSH file permissions configured correctly"
+
+# ℹ️ Display SSH key information
+echo ""
+echo "📋 SSH Setup Summary:"
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "SSH Directory: ~/.ssh"
+echo "SSH Config: ~/.ssh/config"
+echo ""
+echo "Available SSH Keys:"
+if [ -f ~/.ssh/id_rsa.pub ]; then
+    echo "  • RSA Key: ~/.ssh/id_rsa"
+fi
+if [ -f ~/.ssh/id_ed25519.pub ]; then
+    echo "  • Ed25519 Key: ~/.ssh/id_ed25519"
+fi
+echo ""
+echo "💡 Next Steps:"
+echo "  1. View your public key:"
+echo "     cat ~/.ssh/id_ed25519.pub  (or id_rsa.pub)"
+echo "  2. Add it to your GitHub/GitLab/server authorized_keys"
+echo "  3. Test connection:"
+echo "     ssh -v your_server"
+echo "  4. Configure hosts in ~/.ssh/config for easy access"
+echo ""
+echo "📚 Learn more about SSH:"
+echo "  • man ssh"
+echo "  • man ssh-keygen"
+echo "  • man ssh_config"
+echo ""
+echo "✅ OpenSSH setup complete!"