machineconfig 7.38__tar.gz → 7.39__tar.gz

{machineconfig-7.38/src/machineconfig.egg-info → machineconfig-7.39}/PKG-INFO

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

{machineconfig-7.38 → machineconfig-7.39}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.38"
+version = "7.39"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/profile/create_links.py

@@ -13,6 +13,7 @@ from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_map, copy_map
+from machineconfig.profile.create_links_export import ON_CONFLICT_STRICT
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 
 import platform
@@ -79,7 +80,7 @@ def read_mapper() -> MapperFileData:
 
 
 def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
-                 on_conflict: Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"],
+                 on_conflict: ON_CONFLICT_STRICT,
                  method: Literal["symlink", "copy"]
                  ):
     operation_records: list[OperationRecord] = []

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/profile/create_links_export.py

@@ -1,10 +1,26 @@
 
 import typer
-from typing import Optional, Literal, Annotated
+from typing import Optional, Literal, Annotated, TypeAlias
 
+ON_CONFLICT_LOOSE: TypeAlias = Literal[
+    "throw-error", "t",
+    "overwrite-self-managed", "os",
+    "backup-self-managed", "bs",
+    "overwrite-default-path", "od",
+    "backup-default-path", "bd"
+    ]
+ON_CONFLICT_STRICT: TypeAlias = Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"]
+ON_CONFLICT_MAPPER: dict[str, ON_CONFLICT_STRICT] = {
+    "t": "throw-error",
+    "os": "overwrite-self-managed",
+    "bs": "backup-self-managed",
+    "od": "overwrite-default-path",
+    "bd": "backup-default-path"
+    }
 
-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["throw-error", "overwrite-default-path", "backup-default-path"], typer.Option(..., help="Action to take on conflict")],
+
+def main_public_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., help="Method to use for setting up the config file.")],
+                            on_conflict: Annotated[ON_CONFLICT_LOOSE, 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:
@@ -28,15 +44,21 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.
     from machineconfig.profile.create_links import apply_mapper
     from machineconfig.profile.create_helper import copy_assets_to_machine
     copy_assets_to_machine(which="settings")  # config files live here and will be linked to.
-    apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
+    method_map: dict[str, Literal["symlink", "copy"]] = {
+        "s": "symlink",
+        "symlink": "symlink",
+        "c": "copy",
+        "copy": "copy",
+    }
+    method = method_map[method]
+    apply_mapper(mapper_data=items_objections, on_conflict=ON_CONFLICT_MAPPER[on_conflict], method=method)
 
 
-def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], typer.Option(..., help="Action to take on conflict")] = "throw-error",
+def main_private_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., help="Method to use for linking files")],
+                             on_conflict: Annotated[ON_CONFLICT_LOOSE, 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
-
     mapper_full = read_mapper()["private"]
     if which is None:
         assert interactive is True
@@ -51,4 +73,11 @@ def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
 
     from machineconfig.profile.create_links import apply_mapper
-    apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
+    method_map: dict[str, Literal["symlink", "copy"]] = {
+        "s": "symlink",
+        "symlink": "symlink",
+        "c": "copy",
+        "copy": "copy",
+    }
+    method = method_map[method]
+    apply_mapper(mapper_data=items_objections, on_conflict=ON_CONFLICT_MAPPER[on_conflict], method=method)

machineconfig-7.39/src/machineconfig/profile/create_shell_profile.py

@@ -0,0 +1,136 @@
+"""shell"""
+
+from pathlib import Path
+
+
+
+def get_shell_profile_path() -> Path:
+    import platform
+    import subprocess
+    from rich.console import Console
+    from rich.panel import Panel
+    system = platform.system()
+    console = Console()
+    if system == "Windows":
+        result = subprocess.run(["pwsh", "-Command", "$PROFILE"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
+        if result.returncode == 0 and result.stdout.strip():
+            profile_path = Path(result.stdout.strip())
+        else:
+            print(f"Command failed with return code {result.returncode}")
+            print(f"stdout: {result.stdout}")
+            print(f"stderr: {result.stderr}")
+            raise ValueError(f"""Could not get profile path for Windows. Got stdout: {result.stdout}, stderr: {result.stderr}""")
+    elif system == "Linux":
+        profile_path = Path.home().joinpath(".bashrc")
+    elif system == "Darwin":
+        profile_path = Path.home().joinpath(".zshrc")
+    else:
+        raise ValueError(f"""Not implemented for this system {system}""")
+    console.print(Panel(f"""🐚 SHELL PROFILE | Working with path: `{profile_path}`""", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
+    return profile_path
+
+
+def get_nu_shell_profile_path() -> Path:
+    import platform
+    from rich.console import Console
+    from rich.panel import Panel
+    system = platform.system()
+    console = Console()
+    if system == "Windows":
+        profile_path = Path.home().joinpath(r"AppData\Roaming\nushell")
+    elif system == "Linux":
+        profile_path = Path.home().joinpath(".config/nushell")
+    elif system == "Darwin":
+        profile_path = Path.home().joinpath("Library/Application Support/nushell")
+    else:
+        raise ValueError(f"""Not implemented for this system {system}""")
+    console.print(Panel(f"""🐚 NU SHELL PROFILE | Working with path: `{profile_path}`""", title="[bold cyan]Nu Shell Profile[/bold cyan]", border_style="cyan"))
+    return profile_path
+
+
+def create_default_shell_profile() -> None:
+    shell_profile_path = get_shell_profile_path()
+    import platform
+    import subprocess
+    from rich.console import Console
+    from rich.panel import Panel
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    from machineconfig.utils.path_extended import PathExtended
+    system = platform.system()
+    console = Console()
+    if not shell_profile_path.exists():
+        console.print(Panel(f"""🆕 PROFILE | Profile does not exist at `{shell_profile_path}`. Creating a new one.""", title="[bold blue]Profile[/bold blue]", border_style="blue"))
+        shell_profile_path.parent.mkdir(parents=True, exist_ok=True)
+        shell_profile_path.write_text("", encoding="utf-8")
+    shell_profile = shell_profile_path.read_text(encoding="utf-8")
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine("settings")  # init.ps1 or init.sh live here
+    copy_assets_to_machine("scripts")  # init scripts are going to reference those scripts.
+    if system == "Windows":
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
+        source_line = f""". {str(init_script.collapseuser(placeholder="$HOME"))}"""
+    elif system == "Linux":
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
+        source_line = f"""source {str(init_script.collapseuser(placeholder="$HOME"))}"""
+    elif system == "Darwin":
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/zsh/init.sh")
+        source_line = f"""source {str(init_script.collapseuser(placeholder="$HOME"))}"""
+    else:
+        raise ValueError(f"""Not implemented for this system {system}""")
+
+    was_shell_updated = False
+    if source_line in shell_profile:
+        console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))        
+    else:
+        console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
+        shell_profile += "\n" + source_line + "\n"
+        if system == "Linux":
+            result = subprocess.run(["cat", "/proc/version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
+            if result.returncode == 0 and result.stdout:
+                version_info = result.stdout.lower()
+                if "microsoft" in version_info or "wsl" in version_info:
+                    shell_profile += "\ncd $HOME"
+                    console.print("📌 WSL detected - adding 'cd $HOME' to profile to avoid Windows filesystem")
+        was_shell_updated = True
+    if was_shell_updated:
+        shell_profile_path.parent.mkdir(parents=True, exist_ok=True)
+        shell_profile_path.write_text(shell_profile, encoding="utf-8")
+        console.print(Panel("✅ Profile updated successfully", title="[bold blue]Profile[/bold blue]", border_style="blue"))
+
+
+def create_nu_shell_profile() -> None:
+    from rich.console import Console
+    from rich.panel import Panel
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    from machineconfig.utils.path_extended import PathExtended
+    console = Console()
+    nu_profile_path = get_nu_shell_profile_path()
+    config_dir = nu_profile_path
+    config_file = config_dir.joinpath("config.nu")
+    if not config_dir.exists():
+        console.print(Panel(f"""🆕 NU SHELL CONFIG | Config directory does not exist at `{config_dir}`. Creating a new one.""", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_dir.mkdir(parents=True, exist_ok=True)
+    if not config_file.exists():
+        console.print(Panel(f"""🆕 NU SHELL CONFIG | config.nu file does not exist at `{config_file}`. Creating a new one.""", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_file.write_text("", encoding="utf-8")
+    config_content = config_file.read_text(encoding="utf-8")
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine("settings")
+    copy_assets_to_machine("scripts")
+    init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/nushell/init.nu")
+    source_line = f"""use {str(init_script)}"""
+    was_config_updated = False
+    if source_line in config_content:
+        console.print(Panel("🔄 NU SHELL CONFIG | Skipping init script sourcing - already present in config.nu", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+    else:
+        console.print(Panel("📝 NU SHELL CONFIG | Adding init script sourcing to config.nu", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_content += "\n" + source_line + "\n"
+        was_config_updated = True
+    if was_config_updated:
+        config_dir.mkdir(parents=True, exist_ok=True)
+        config_file.write_text(config_content, encoding="utf-8")
+        console.print(Panel("✅ Nu shell config updated successfully", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+
+
+if __name__ == "__main__":
+    pass

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/linux/wrap_mcfg

@@ -27,7 +27,7 @@ wrap_in_shell_script() {
 
   if [[ -f "$OP_PROGRAM_PATH" ]]; then
     printf "%b\n" "${GREEN}🚀 Taking over from python script @ ${OP_PROGRAM_PATH}${RESET}"
-    bat --style=plain --paging=never "$OP_PROGRAM_PATH"
+    bat --style=full --theme=OneHalfDark --paging=never "$OP_PROGRAM_PATH"
     printf "%b\n" "${GREEN}▶ Running...${RESET}"
     . "$OP_PROGRAM_PATH"
     status=$?

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/croshell.py

@@ -130,7 +130,7 @@ def croshell(
             fire_line = f"uv run --python 3.14 --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 = """--python 3.14 --with "marimo,machineconfig[plot]>=7.38" """
+        else: requirements = """--python 3.14 --with "marimo,machineconfig[plot]>=7.39" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --python 3.14 --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -138,14 +138,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]>=7.38" """
+        else: requirements = """--with "machineconfig[plot]>=7.39" """
         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]>=7.38"
+uv add "machineconfig[plot]>=7.39"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -153,7 +153,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 = """--python 3.14 --with "machineconfig[plot]>=7.38" """
+        else: ve_line = """--python 3.14 --with "machineconfig[plot]>=7.39" """
         # 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-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/define.py

@@ -5,10 +5,10 @@ Minimalist programs that only print scripts without frills so it can be sourced
 
 
 import typer
-import platform
 
 
 def define_scripts():
+    import platform
     if platform.system() != "Linux":
         raise RuntimeError("This command is only supported on Linux systems.")
     from machineconfig.setup_linux import INTERACTIVE as script_path

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -1,33 +1,22 @@
 
 
-from typing import Literal, Annotated, Optional
+from typing import Literal, Annotated
 from pathlib import Path
 import typer
 import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
+import machineconfig.profile.create_links_export as create_links_export
 
-
-def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], 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."""
-    import machineconfig.profile.create_links_export as create_links_export
-    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["throw-error", "overwrite-default-path", "backup-default-path"], 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."""
-    import machineconfig.profile.create_links_export as create_links_export
-    create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
-
-
-def shell():
+def shell(which: Annotated[Literal["default", "d", "nushell", "n"], typer.Option(..., "--which", "-w", help="Which shell profile to create/configure")]="default"):
     """🔗 Configure your shell profile."""
-    from machineconfig.profile.create_shell_profile import create_default_shell_profile
-    create_default_shell_profile()
+    from machineconfig.profile.create_shell_profile import create_default_shell_profile,  create_nu_shell_profile
+    match which:
+        case "nushell" | "n":
+            create_nu_shell_profile()
+            return
+        case "default" | "d":
+            create_default_shell_profile()
+            return
+    typer.echo(f"[red]Error:[/] Unknown shell profile type: {which}")
 
 
 def path():
@@ -39,7 +28,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=7.38")
+        uv_with.append("machineconfig>=7.39")
     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])
@@ -82,23 +71,29 @@ def starship_theme():
         typer.echo("❌ Please enter a valid number")
 
 
-def copy_assets(which: Annotated[Literal["scripts", "settings", "both"], typer.Argument(..., help="Which assets to copy")]):
+def copy_assets(which: Annotated[Literal["scripts", "s", "settings", "t", "both", "b"], typer.Argument(..., help="Which assets to copy")]):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper
     match which:
-        case "both":
+        case "both" | "b":
+            create_helper.copy_assets_to_machine(which="scripts")
+            create_helper.copy_assets_to_machine(which="settings")
+            return
+        case "scripts" | "s":
             create_helper.copy_assets_to_machine(which="scripts")
+            return
+        case "settings" | "t":
             create_helper.copy_assets_to_machine(which="settings")
-        case _:
-            create_helper.copy_assets_to_machine(which=which)
+            return
+    typer.echo(f"[red]Error:[/] Unknown asset type: {which}")
 
 
 def get_app():
     config_apps = typer.Typer(help="⚙️ [c] configuration subcommands", no_args_is_help=True, add_help_option=False, add_completion=False)
-    config_apps.command("private", no_args_is_help=True, help="🔗  [v] Manage private configuration files.")(private)
-    config_apps.command("v", no_args_is_help=True, hidden=True)(private)
-    config_apps.command("public", no_args_is_help=True, help="🔗  [b] Manage public configuration files.")(public)
-    config_apps.command("b", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(public)
+    config_apps.command("private", no_args_is_help=True, help="🔗  [v] Manage private configuration files.")(create_links_export.main_private_from_parser)
+    config_apps.command("v", no_args_is_help=True, hidden=True)(create_links_export.main_private_from_parser)
+    config_apps.command("public", no_args_is_help=True, help="🔗  [b] Manage public configuration files.")(create_links_export.main_public_from_parser)
+    config_apps.command("b", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(create_links_export.main_public_from_parser)
     config_apps.command("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile_module.main)
     config_apps.command("d", no_args_is_help=True,  hidden=True)(dotfile_module.main)
     config_apps.command("shell", no_args_is_help=False, help="🔗  [s] Configure your shell profile.")(shell)

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -1,24 +1,26 @@
 
 """Like yadm and dotter."""
 
+from machineconfig.profile.create_links_export import ON_CONFLICT_LOOSE, ON_CONFLICT_MAPPER
 from typing import Annotated, Literal
 import typer
 
 
+
 def main(
     file: Annotated[str, typer.Argument(help="file/folder path.")],
-    method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
-    on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
-    sensitivity: Annotated[Literal["private", "public"], typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the config file.")] = "private",
+    method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
+    on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+    sensitivity: Annotated[Literal["private", "v", "public", "b"], typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the config file.")] = "private",
     destination: Annotated[str, typer.Option("--destination", "-d", help="destination folder (override the default, use at your own risk)")] = "",) -> None:
     from rich.console import Console
     from rich.panel import Panel
     from machineconfig.utils.links import symlink_map, copy_map
     from pathlib import Path
     match sensitivity:
-        case "private":
+        case "private" | "v":
             backup_root = Path.home().joinpath("dotfiles/mapper")
-        case "public":
+        case "public" | "b":
             from machineconfig.utils.source_of_truth import CONFIG_ROOT
             backup_root = Path(CONFIG_ROOT).joinpath("dotfiles/mapper")
 
@@ -32,18 +34,19 @@ def main(
         dest_path.mkdir(parents=True, exist_ok=True)
         new_path = dest_path.joinpath(orig_path.name)
 
+
     from machineconfig.utils.path_extended import PathExtended
     match method:
-        case "copy":
+        case "copy" | "c":
             try:
-                copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+                copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=ON_CONFLICT_MAPPER[on_conflict])
             except Exception as e:
                 typer.echo(f"[red]Error:[/] {e}")
                 typer.Exit(code=1)
                 return
-        case "symlink":
+        case "symlink" | "s":
             try:
-                symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+                symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=ON_CONFLICT_MAPPER[on_conflict])
             except Exception as e:
                 typer.echo(f"[red]Error:[/] {e}")
                 typer.Exit(code=1)

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/helpers_devops/cli_repos.py

@@ -8,38 +8,38 @@ in the event that username@github.com is not mentioned in the remote url.
 from pathlib import Path
 from typing import Annotated, Optional
 import typer
-from machineconfig.scripts.python.helpers_repos.secure_repo import main as secure_repo_main
+from machineconfig.scripts.python.helpers_repos.cloud_repo_sync import main as secure_repo_main
 
 
 DirectoryArgument = Annotated[Optional[str], typer.Argument(help="📁 Directory containing repo(s).")]
 RecursiveOption = Annotated[bool, typer.Option("--recursive", "-r", help="🔍 Recurse into nested repositories.")]
-NO_UVsyncOption = Annotated[bool, typer.Option("--no-uv-sync", "-ns", help="🚫 Disable automatic uv sync after pulls.")]
+UVsyncOption = Annotated[bool, typer.Option("--uv-sync/--no-uv-sync", "-u/-ns", help="Automatic uv sync after pulls.")]
 CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️ Upload to or download from this cloud remote.")]
 
 
-def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
+def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, auto_uv_sync: UVsyncOption = False) -> None:
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
-    git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, auto_uv_sync=not no_uv_sync)
+    git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, auto_uv_sync=auto_uv_sync)
 
 
-def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
+def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, auto_uv_sync: UVsyncOption = False) -> None:
     """⬇️ Pull changes across repositories."""
     from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
 
-    git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, auto_uv_sync=not no_uv_sync)
+    git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, auto_uv_sync=auto_uv_sync)
 
 
-def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
+def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, auto_uv_sync: UVsyncOption = False) -> None:
     """💾 Commit changes across repositories."""
     from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
-    git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, auto_uv_sync=not no_uv_sync)
+    git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, auto_uv_sync=auto_uv_sync)
 
 
-def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
+def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, auto_uv_sync: UVsyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
     from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
-    git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, auto_uv_sync=not no_uv_sync)
+    git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, auto_uv_sync=auto_uv_sync)
 
 
 def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
@@ -179,3 +179,4 @@ def get_app():
     mirror_app.command(name="ctb", help="Check out to the main branch defined in the specification", hidden=True)(checkout_to_branch_command)
 
     return repos_apps
+

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -9,10 +9,8 @@ def copy_both_assets():
     create_helper.copy_assets_to_machine(which="settings")
 
 
-def update(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na", help="Copy (overwrite) assets to the machine after the update")] = False):
+def update(copy_assets: Annotated[bool, typer.Option("--assets-copy/--no-assets-copy", "-a/-na", help="Copy (overwrite) assets to the machine after the update")] = True):
     """🔄 UPDATE uv and machineconfig"""
-    # from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-    # repo_root = LIBRARY_ROOT.parent.parent
     from pathlib import Path
     if Path.home().joinpath("code", "machineconfig").exists():
         shell_script = """
@@ -36,7 +34,7 @@ uv tool install --upgrade machineconfig
     else:
         from machineconfig.utils.code import run_shell_script
         run_shell_script(shell_script)
-    if not no_copy_assets:
+    if copy_assets:
         copy_both_assets()
 
 def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na", help="Copy (overwrite) assets to the machine after the update")] = False):
@@ -48,9 +46,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>=7.38" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.39" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.38" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.39" """)
     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 +73,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>=7.38,textual" """
+    else: executable = """--with "machineconfig>=7.39,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-7.38 → machineconfig-7.39}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -1,28 +1,47 @@
-import git
-from rich.console import Console
-from rich.panel import Panel
-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_uv_command_executing_python_script
-from pathlib import Path
-import platform
-import subprocess
 from typing import Optional, Literal, Annotated
 
-
-console = Console()
+import typer
 
 
 def main(
     cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
     repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to current working directory.")] = None,
     message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
-    on_conflict: Annotated[Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    on_conflict: Annotated[Literal["ask", "a",
+                                   "push-local-merge", "p",
+                                   "overwrite-local", "o",
+                                   "stop-on-conflict", "s",
+                                   "remove-rclone-conflict", "r"
+                                   ], typer.Option(..., "--on-conflict", "-o", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
     pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
 ):
+    on_conflict_mapper: dict[str, Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"]] = {
+        "a": "ask",
+        "ask": "ask",
+        "p": "push-local-merge",
+        "push-local-merge": "push-local-merge",
+        "o": "overwrite-local",
+        "overwrite-local": "overwrite-local",
+        "s": "stop-on-conflict",
+        "stop-on-conflict": "stop-on-conflict",
+        "r": "remove-rclone-conflict",
+        "remove-rclone-conflict": "remove-rclone-conflict",
+    }
+    on_conflict = on_conflict_mapper[on_conflict]
+    import git
+    from rich.console import Console
+    from rich.panel import Panel
+
+    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_uv_command_executing_python_script
+    from pathlib import Path
+    import platform
+    import subprocess
+    console = Console()
+
     if cloud is None:
         try:
             from machineconfig.utils.io import read_ini
@@ -80,7 +99,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=7.38"]
+        uv_with = ["machineconfig>=7.39"]
         uv_project_dir = None
 
     import tempfile