machineconfig 6.91__tar.gz → 6.93__tar.gz

{machineconfig-6.91/src/machineconfig.egg-info → machineconfig-6.93}/PKG-INFO

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

{machineconfig-6.91 → machineconfig-6.93}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.91"
+version = "6.93"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -93,6 +93,7 @@ dev = [
     "ipdb>=0.13.13",
     "ipykernel>=6.30.1",
     "ipython>=9.5.0",
+    "marimo>=0.17.2",
     "matplotlib>=3.10.6",
     "mypy>=1.18.2",
     "numpy>=2.3.3",

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/jobs/installer/custom/hx.py

@@ -20,20 +20,21 @@ config_dict: InstallerData = {
     "doc": "Helix is a post-modern modal text editor.",
     "fileNamePattern": {
         "amd64": {
-            "linux": "hx-linux-amd64.tar.xz",
-            "macos": "hx-macos-amd64.tar.xz",
-            "windows": "hx-windows-amd64.zip",
+            "linux": "helix-{version}-x86_64-linux.tar.xz",
+            "macos": "helix-{version}-x86_64-macos.tar.xz",
+            "windows": "helix-{version}-x86_64-windows.zip",
         },
         "arm64": {
-            "linux": "hx-linux-arm64.tar.xz",
-            "macos": "hx-macos-arm64.tar.xz",
-            "windows": "hx-windows-arm64.zip",
+            "linux": "helix-{version}-arm64-linux.tar.xz",
+            "macos": "helix-{version}-arm64-macos.tar.xz",
+            "windows": "helix-{version}-arm64-windows.zip",
         },
     },
 }
 
 
-def main(version: Optional[str], install_lib: bool = False):
+def main(installer_data: InstallerData, version: Optional[str], install_lib: bool = False):
+    _ = installer_data
     console = Console()
 
     console.print(Panel(f"HELIX EDITOR INSTALLER 🧬\nPlatform: {platform.system()}\nVersion:  {'latest' if version is None else version}", title="Installer", expand=False))
@@ -137,4 +138,4 @@ def main(version: Optional[str], install_lib: bool = False):
 
 
 if __name__ == "__main__":
-    main(version=None)
+    pass

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/profile/create_links.py

@@ -79,7 +79,7 @@ def read_mapper() -> MapperFileData:
 
 
 def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
-                 on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"],
+                 on_conflict: Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"],
                  method: Literal["symlink", "copy"]
                  ):
     operation_records: list[OperationRecord] = []

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/profile/create_links_export.py

@@ -4,7 +4,7 @@ from typing import Optional, Literal, Annotated
 
 
 def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for setting up the config file.")],
-                            on_conflict: Annotated[Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")],
+                            on_conflict: Annotated[Literal["throw-error", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")],
                             which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
                             interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     """Terminology:
@@ -32,7 +32,7 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.
 
 
 def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")] = "throwError",
+                             on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")] = "throw-error",
                              which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
                              interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     from machineconfig.profile.create_links import ConfigMapper, read_mapper

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -7,7 +7,7 @@ import typer
 
 
 def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throwError",
+                             on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
                              which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
                              interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage private configuration files."""
@@ -15,7 +15,7 @@ def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--m
     create_links_export.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
 def public(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for setting up the config file.")],
-                            on_conflict: Annotated[Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throwError",
+                            on_conflict: Annotated[Literal["throw-error", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
                             which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage public configuration files."""
@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.91")
+        uv_with.append("machineconfig>=6.93")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -34,7 +34,7 @@ def main(
         dest_path.mkdir(parents=True, exist_ok=True)
         new_path = dest_path.joinpath(orig_path.name)
 
-    symlink_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict="throwError")
+    symlink_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict="throw-error")
 
     console.print(
         Panel(

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/helpers_devops/cli_nw.py

@@ -104,8 +104,18 @@ def get_app():
     nw_apps = typer.Typer(help="🔐 [n] Network subcommands", no_args_is_help=True, add_help_option=False, add_completion=False)
     nw_apps.command(name="share-terminal", help="📡  [t] Share terminal via web browser")(cli_terminal.main)
     nw_apps.command(name="t", help="Share terminal via web browser", hidden=True)(cli_terminal.main)
+
     nw_apps.command(name="share-server", help="🌐  [s] Start local/global server to share files/folders via web browser", no_args_is_help=True)(cli_share_server.main)
     nw_apps.command(name="s", help="Start local/global server to share files/folders via web browser", hidden=True, no_args_is_help=True)(cli_share_server.main)
+
+    # app = cli_share_server.get_share_file_app()
+    # nw_apps.add_typer(app, name="share-file", help="📁  [f] Share a file via relay server", no_args_is_help=True)
+    # nw_apps.add_typer(app, name="f", help="Share a file via relay server", hidden=True, no_args_is_help=True)
+    nw_apps.command(name="send", no_args_is_help=True, hidden=False, help="📁 [sx] send files from here.")(cli_share_server.share_file_send)
+    nw_apps.command(name="sx", no_args_is_help=True, hidden=True, help="📁 [sx] send files from here.")(cli_share_server.share_file_send)
+    nw_apps.command(name="receive", no_args_is_help=True, hidden=False, help="📁 [rx] receive files to here.")(cli_share_server.share_file_receive)
+    nw_apps.command(name="rx", no_args_is_help=True, hidden=True, help="📁 [rx] receive files to here.")(cli_share_server.share_file_receive)
+
     nw_apps.command(name="install-ssh-server", help="📡  [i] Install SSH server")(install_ssh_server)
     nw_apps.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
     nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine", no_args_is_help=True)(add_ssh_key)
@@ -117,7 +127,7 @@ def get_app():
     nw_apps.command(name="debug-ssh", help="🐛  [d] Debug SSH connection")(debug_ssh)
     nw_apps.command(name="d", help="Debug SSH connection", hidden=True)(debug_ssh)
 
-    nw_apps.command(name="wifi-select", no_args_is_help=True, help="[w] WiFi connection utility.")(wifi_select)
+    nw_apps.command(name="wifi-select", no_args_is_help=True, help="📶 WiFi connection utility.")(wifi_select)
     nw_apps.command(name="w", no_args_is_help=True, hidden=True)(wifi_select)
 
     return nw_apps

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -48,9 +48,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.91" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.93" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.91" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.93" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -75,7 +75,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.91,textual" """
+    else: executable = """--with "machineconfig>=6.93,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

machineconfig-6.93/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -0,0 +1,213 @@
+from pathlib import Path
+from typing import Optional, Annotated
+import typer
+
+
+def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> None:
+    """Display a flashy, unmissable share URL announcement."""
+    from rich.console import Console
+    from rich.panel import Panel
+    from rich.text import Text
+    from rich.align import Align
+    console = Console()
+    # Create the main message with styling
+    url_text = Text(f"{protocol}://{local_ip_v4}:{port}", style="bold bright_cyan underline")
+    message = Text.assemble(
+        ("🚀 ", "bright_red"),
+        ("Share server is now accessible at: ", "bright_white bold"),
+        url_text,
+        (" 🚀", "bright_red")
+    )
+    # Create a fancy panel with borders and styling
+    panel = Panel(
+        Align.center(message),
+        title="[bold bright_green]🌐 SHARE SERVER READY 🌐[/bold bright_green]",
+        subtitle="[italic bright_yellow]⚡ Click the link above to access your shared files! ⚡[/italic bright_yellow]",
+        border_style="bright_magenta",
+        padding=(1, 2),
+        expand=False
+    )
+    # Print with extra spacing and attention-grabbing elements
+    console.print(panel)
+
+
+def main(
+    path: Annotated[str, typer.Argument(help="Path to the file or directory to share")],
+    port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the share server on (default: 8080)")] = None,
+    username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for share access (default: current user)")] = None,
+    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for share access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None,
+    over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the share server over the internet using ngrok")] = False
+) -> None:
+    from machineconfig.utils.installer_utils.installer import install_if_missing
+    install_if_missing(which="easy-sharing")
+    if over_internet: install_if_missing(which="ngrok", )
+    if username is None:
+        import getpass
+        username = getpass.getuser()
+    if password is None:
+        pwd_path = Path.home().joinpath("dotfiles/creds/passwords/quick_password")
+        if pwd_path.exists():
+            password = pwd_path.read_text(encoding="utf-8").strip()
+        else:
+            # raise ValueError("Password not provided and default password file does not exist.")
+            typer.echo(f"⚠️  WARNING: Password not provided and default password file does not exist.\nPath: {pwd_path}\nUsing default password: 'quick_password' (insecure!)", err=True)
+            typer.Exit(code=1)
+
+    if port is None:
+        port = 8080  # Default port for ezshare
+
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8',80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+
+    # Display the flashy share announcement  
+    protocol = "http"
+    display_share_url(local_ip_v4, port, protocol)
+    import subprocess
+    import time
+    # Build ezshare command
+    ezshare_cmd = f"""easy-sharing --port {port} --username {username} --password "{password}" {path}"""
+    ezshare_process = subprocess.Popen(ezshare_cmd, shell=True)
+    processes = [ezshare_process]
+    
+    if over_internet:
+        ngrok_process = subprocess.Popen(f"ngrok http {port}", shell=True)
+        processes.append(ngrok_process)
+        time.sleep(3)
+        try:
+            import requests
+            response = requests.get("http://localhost:4040/api/tunnels")
+            data = response.json()
+            public_url = data['tunnels'][0]['public_url']
+            print(f"🌐 Ngrok tunnel ready: {public_url}")
+        except Exception as e:
+            print(f"Could not retrieve ngrok URL: {e}")
+    
+    try:
+        while True:
+            print("Share server is running. Press Ctrl+C to stop.")
+            time.sleep(2)
+    except KeyboardInterrupt:
+        print("\nTerminating processes...")
+        for p in processes:
+            p.terminate()
+            p.wait()
+
+
+def share_file_send(path: Annotated[str, typer.Argument(help="Path to the file or directory to send")],
+                    zip_folder: Annotated[bool, typer.Option("--zip", help="Zip folder before sending")] = False,
+                    code: Annotated[str | None, typer.Option("--code", "-c", help="Codephrase used to connect to relay")] = None,
+                    text: Annotated[str | None, typer.Option("--text", "-t", help="Send some text")] = None,
+                    qrcode: Annotated[bool, typer.Option("--qrcode", "--qr", help="Show receive code as a qrcode")] = False,
+                    ) -> None:
+    """Send a file using croc with relay server."""
+    from machineconfig.utils.installer_utils.installer import install_if_missing
+    install_if_missing(which="croc")
+    # Get relay server IP from environment or use default
+    import socket
+    import subprocess
+    import os
+    import platform
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8',80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+    relay_port = "443"
+    env = os.environ.copy()
+    is_windows = platform.system() == "Windows"
+    cmd = f"croc --relay {local_ip_v4}:{relay_port} --ip {local_ip_v4}:{relay_port} send"
+    if zip_folder:
+        cmd += " --zip"
+    if code:
+        if is_windows:
+            cmd += f" --code {code}"
+        else:
+            env["CROC_SECRET"] = code
+    if text:
+        cmd += f" --text '{text}'"
+    if qrcode:
+        cmd += " --qrcode"
+    if not text:
+        cmd += f" {path}"
+    typer.echo(f"🚀 Sending file: {path}. Use: devops network f")
+    subprocess.run(cmd, shell=True, env=env)
+
+
+def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or full relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 0782-paris-pencil-torso'")],) -> None:
+    """Receive a file using croc with relay server.
+Usage examples:
+    devops network receive 7121-donor-olympic-bicycle
+    devops network receive --relay 10.17.62.206:443 0782-paris-pencil-torso
+    devops network receive -- --relay 10.17.62.206:443 0782-paris-pencil-torso
+"""
+    from machineconfig.utils.installer_utils.installer import install_if_missing
+    install_if_missing(which="croc")
+    import subprocess
+    import os
+    import platform
+    import re
+    
+    env = os.environ.copy()
+    is_windows = platform.system() == "Windows"
+    
+    # Join all arguments back into a single string
+    code = " ".join(code_args)
+    
+    # Parse input to extract components
+    secret_code: str | None = None
+    relay_server: str | None = None
+    
+    # Check if it's Linux/macOS format with CROC_SECRET
+    linux_match = re.match(r'CROC_SECRET\s*=\s*["\']?([^"\']+)["\']?\s+croc\s+--relay\s+(\S+)(?:\s+--yes)?', code)
+    if linux_match:
+        secret_code = linux_match.group(1)
+        relay_server = linux_match.group(2)
+    else:
+        # Check if it's Windows format or partial command
+        windows_match = re.match(r'(?:croc\s+)?(?:--relay\s+(\S+)\s+)?([a-z0-9-]+(?:-[a-z0-9-]+){3})(?:\s+--yes)?', code, re.IGNORECASE)
+        if windows_match:
+            relay_server = windows_match.group(1)
+            secret_code = windows_match.group(2)
+        else:
+            # Fallback: treat entire code as secret if it looks like a code
+            code_pattern = r'^[a-z0-9-]+(?:-[a-z0-9-]+){3}$'
+            if re.match(code_pattern, code.strip(), re.IGNORECASE):
+                secret_code = code.strip()
+    
+    if not secret_code:
+        raise ValueError(f"Could not parse croc code from input: {code}")
+    
+    # Build the appropriate command for current OS
+    if is_windows:
+        # Windows format: croc --relay server:port secret-code --yes
+        cmd = "croc"
+        if relay_server:
+            cmd += f" --relay {relay_server}"
+        cmd += f" {secret_code} --yes"
+    else:
+        # Linux/macOS format: CROC_SECRET="secret-code" croc --relay server:port --yes
+        env["CROC_SECRET"] = secret_code
+        cmd = "croc"
+        if relay_server:
+            cmd += f" --relay {relay_server}"
+        cmd += " --yes"
+    
+    subprocess.run(cmd, shell=True, env=env)
+
+
+def get_share_file_app():
+    app = typer.Typer(name="share-file", help="Send or receive files using croc with relay server.")
+    app.command(name="send", no_args_is_help=True, hidden=False, help="[s] send files from here.")(share_file_send)
+    app.command(name="s", no_args_is_help=True, hidden=True, help="[s] send files from here.")(share_file_send)
+    app.command(name="receive", no_args_is_help=True, hidden=False, help="[r] receive files to here.")(share_file_receive)
+    app.command(name="r", no_args_is_help=True, hidden=True, help="[r] receive files to here.")(share_file_receive)
+    return app
+
+def main_with_parser():
+    typer.run(main)
+
+
+if __name__ == "__main__":
+    pass

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.91"]
+        uv_with = ["machineconfig>=6.93"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.91 → machineconfig-6.93}/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.91" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.92" 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.91 → machineconfig-6.93}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.91" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.93" 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.91 → machineconfig-6.93}/src/machineconfig/settings/marimo/marimo.toml

@@ -64,7 +64,7 @@ presets = []
 [experimental]
 
 [snippets]
-custom_paths = []
+custom_paths = ["/home/alex/code/machineconfig/src/machineconfig/settings/marimo/snippets"]
 include_default_snippets = true
 
 [save]

machineconfig-6.93/src/machineconfig/settings/marimo/snippets/globalize.py

@@ -0,0 +1,34 @@
+import marimo
+from typing import Any
+from types import FunctionType
+
+app = marimo.App(width="full")
+
+@app.cell(hide_code=True)
+def _(mo: Any):
+    mo.md(r"""# Globalize Lambda to Python Script""")
+    return
+
+
+@app.cell
+def _(func: FunctionType):
+    # Your snippet code
+    from machineconfig.utils.meta import lambda_to_python_script
+    exec(
+        lambda_to_python_script(
+            lambda: func(),
+            in_global=True,
+            import_module=False,
+        ),
+    )
+    return
+
+
+@app.cell
+def _():
+    import marimo as mo
+    return (mo,)
+
+
+if __name__ == "__main__":
+    app.run()

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/settings/shells/starship/starship.toml

@@ -56,3 +56,19 @@ nu_indicator = '󰟆'
 unknown_indicator = 'mystery shell'
 style = 'cyan bold'
 disabled = false
+
+
+[git_branch]
+disabled = true
+ 
+[git_commit]
+disabled = true
+ 
+[git_state]
+disabled = true
+ 
+[git_status]
+disabled = true
+ 
+[git_metrics]
+disabled = true

{machineconfig-6.91 → machineconfig-6.93}/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.91" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.93" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.91" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.93" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/utils/links.py

@@ -96,14 +96,14 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
 
 
 def symlink_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended,
-                 on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]
+                 on_conflict: Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]
                  ) -> OperationResult:
     """helper function. creates a symlink from `config_file_default_path` to `self_managed_config_file_path`.
 
     Returns a dict with 'action' and 'details' keys describing what was done.
 
     on_conflict strategies:
-    - throwError: Raise exception when files differ
+    - throw-error: Raise exception when files differ
     - overwriteSelfManaged: Delete self_managed_config_file_path (self-managed), move config_file_default_path to self_managed_config_file_path, create symlink
     - backupSelfManaged: Backup self_managed_config_file_path (self-managed), move config_file_default_path to self_managed_config_file_path, create symlink
     - overwriteDefaultPath: Delete config_file_default_path (default path), create symlink to self_managed_config_file_path
@@ -162,7 +162,14 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                     config_file_default_path.delete(sure=True)
                 else:
                     # Files are different, use on_conflict strategy
-                    if on_conflict == "throwError":
+                    if on_conflict == "throw-error":
+                        import subprocess
+                        command = f"""delta --side-by-side "{config_file_default_path}" "{self_managed_config_file_path}" """
+                        try:
+                            console.print(Panel(f"🆘 CONFLICT DETECTED | Showing diff between {config_file_default_path} and {self_managed_config_file_path}", title="Conflict Detected", expand=False))
+                            subprocess.run(command, shell=True, check=True)
+                        except Exception:
+                            console.print(Panel("⚠️ Could not show diff using 'delta'. Please install 'delta' for better diff visualization.", title="Delta Not Found", expand=False))
                         raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
                     elif on_conflict == "overwriteSelfManaged":
                         action_taken = "backing_up_target"
@@ -235,7 +242,7 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
         return {"action": action_taken, "details": details}
 
 
-def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> OperationResult:
+def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> OperationResult:
     config_file_default_path = PathExtended(config_file_default_path).expanduser().absolute()
     self_managed_config_file_path = PathExtended(self_managed_config_file_path).expanduser().absolute()
     
@@ -283,7 +290,7 @@ def copy_map(config_file_default_path: PathExtended, self_managed_config_file_pa
                 else:
                     # Files are different, use on_conflict strategy
                     match on_conflict:
-                        case "throwError":
+                        case "throw-error":
                             raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
                         case "overwriteSelfManaged":
                             action_taken = "backing_up_target"

{machineconfig-6.91 → machineconfig-6.93}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.91"
+MACHINECONFIG_VERSION = "machineconfig>=6.93"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH: