machineconfig 6.98__tar.gz → 7.2__tar.gz

{machineconfig-6.98/src/machineconfig.egg-info → machineconfig-7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.98
+Version: 7.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -59,15 +59,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.98 → machineconfig-7.2}/README.md

@@ -16,15 +16,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.98 → machineconfig-7.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.98"
+version = "7.2"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -70,7 +70,9 @@ croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg:main"
+machineconfig = "machineconfig.scripts.python.mcfg:main"
 terminal = "machineconfig.scripts.python.terminal:main"
+define = "machineconfig.scripts.python.define:main"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/scripts/linux/mcfgs

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 
-wrap_in_op_program() {
+wrap_in_shell_script() {
   # set -euo pipefail
 
   # ANSI color/style codes
@@ -43,6 +43,6 @@ wrap_in_op_program() {
 }
 
 if [[ $# -gt 0 ]]; then
-  wrap_in_op_program "$@"
+  wrap_in_shell_script "$@"
 fi
 

machineconfig-7.2/src/machineconfig/scripts/python/define.py

@@ -0,0 +1,26 @@
+
+"""
+Minimalist programs that only print scripts without frills so it can be sourced by by shell.
+"""
+
+
+import typer
+import platform
+
+
+def define_scripts():
+    if platform.system() != "Linux":
+        raise RuntimeError("This command is only supported on Linux systems.")
+    from machineconfig.setup_linux import INTERACTIVE as script_path
+    script = script_path.read_text(encoding="utf-8")
+    print(script)
+
+
+def main():
+    app = typer.Typer(add_completion=False, no_args_is_help=True)
+    app.command(name="scripts", help="define all scripts", no_args_is_help=False)(define_scripts)
+    app()
+
+
+# if __name__ == "__main__":
+#     main()

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -3,7 +3,7 @@
 from typing import Literal, Annotated, Optional
 from pathlib import Path
 import typer
-
+import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
 
 
 def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
@@ -22,15 +22,6 @@ def public(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--me
     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 dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
-    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
-    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
-    ):
-    """🔗 Manage dotfiles."""
-    import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
-    dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
-
-
 def shell():
     """🔗 Configure your shell profile."""
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
@@ -46,7 +37,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.98")
+        uv_with.append("machineconfig>=6.99")
     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])
@@ -104,8 +95,8 @@ def get_app():
     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("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile)
-    config_apps.command("d", no_args_is_help=True,  hidden=True)(dotfile)
+    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)
     config_apps.command("s", no_args_is_help=False, help="Configure your shell profile.", hidden=True)(shell)
     config_apps.command("path", no_args_is_help=False, help="📚  [p] NAVIGATE PATH variable with TUI")(path)

machineconfig-7.2/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -0,0 +1,80 @@
+"""Like yadm and dotter."""
+
+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", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], 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",
+    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":
+            backup_root = Path.home().joinpath("dotfiles/mapper")
+        case "public":
+            from machineconfig.utils.source_of_truth import CONFIG_ROOT
+            backup_root = Path(CONFIG_ROOT).joinpath("dotfiles/mapper")
+
+    console = Console()
+    orig_path = Path(file).expanduser().absolute()
+    if destination == "":
+        new_path = backup_root.joinpath(orig_path.relative_to(Path.home()))
+        new_path.parent.mkdir(parents=True, exist_ok=True)
+    else:
+        dest_path = Path(destination).expanduser().absolute()
+        dest_path.mkdir(parents=True, exist_ok=True)
+        new_path = dest_path.joinpath(orig_path.name)
+
+    from machineconfig.utils.path_extended import PathExtended
+    if method == "copy":
+        copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+    elif method == "symlink":
+        symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+    else:
+        raise ValueError(f"Unknown method: {method}")
+    console.print(
+        Panel(
+            "\n".join(
+                [
+                    "✅ Symbolic link created successfully!",
+                    "🔄 Add the following snippet to mapper.toml to persist this mapping:",
+                ]
+            ),
+            title="Symlink Created",
+            border_style="green",
+            padding=(1, 2),
+        )
+    )
+
+    # mapper_snippet = "\n".join(
+    #     [
+    #         f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
+    #         "",
+    #         f"[{new_path.parent.name}]",
+    #         f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",
+    #     ]
+    # )
+
+    # console.print(
+    #     Panel(
+    #         mapper_snippet,
+    #         title="Mapper Entry",
+    #         border_style="cyan",
+    #         padding=(1, 2),
+    #     )
+    # )
+
+
+def arg_parser() -> None:
+    typer.run(main)
+
+
+if __name__ == "__main__":
+    arg_parser()

{machineconfig-6.98 → machineconfig-7.2}/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.98" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.99" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.98" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.99" """)
     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.98,textual" """
+    else: executable = """--with "machineconfig>=6.99,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.98 → machineconfig-7.2}/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.98"]
+        uv_with = ["machineconfig>=6.99"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/scripts/windows/mcfgs.ps1

@@ -1,4 +1,4 @@
-function wrap_in_op_code {
+function wrap_in_shell_script {
     param(
         [Parameter(Mandatory=$true)]
         [string]$Command,
@@ -49,6 +49,6 @@ function wrap_in_op_code {
 
 # Call the function with any arguments passed to the script
 if ($args.Count -gt 0) {
-    wrap_in_op_code @args
+    wrap_in_shell_script @args
 }
 

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.98" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.99" 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.98 → machineconfig-7.2}/src/machineconfig/settings/shells/bash/init.sh

@@ -46,15 +46,15 @@ if [ -f "$HOME/dotfiles/machineconfig/init_linux.sh" ]; then
 fi
 
 alias l='lsd -la'
-alias d='wrap_in_op_program devops'
-alias c='wrap_in_op_program cloud'
-alias a='wrap_in_op_program agents'
-alias s='wrap_in_op_program sessions'
-alias ff='wrap_in_op_program ftpx'
-alias f='wrap_in_op_program fire'
-alias r='wrap_in_op_program croshell'
-alias u='wrap_in_op_program utils'
-alias t='wrap_in_op_program term'
+alias d='wrap_in_shell_script devops'
+alias c='wrap_in_shell_script cloud'
+alias a='wrap_in_shell_script agents'
+alias s='wrap_in_shell_script sessions'
+alias ff='wrap_in_shell_script ftpx'
+alias f='wrap_in_shell_script fire'
+alias r='wrap_in_shell_script croshell'
+alias u='wrap_in_shell_script utils'
+alias t='wrap_in_shell_script term'
 
 
 # alias gcs='gh copilot suggest -t shell'

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -32,15 +32,15 @@ if (Test-Path "$CONFIG_ROOT\scripts\windows\mcfgs.ps1") {
 
     function lsdla { lsd -la }
     Set-Alias -Name l -Value lsdla -Option AllScope
-    function d { wrap_in_op_code devops $args }
-    function c { wrap_in_op_code cloud $args }
-    function a { wrap_in_op_code agents $args }
-    function ss { wrap_in_op_code sessions $args }
-    function ff { wrap_in_op_code ftpx $args }
-    function f { wrap_in_op_code fire $args }
-    function rr { wrap_in_op_code croshell $args }
-    function u { wrap_in_op_code utils $args }
-    function t { wrap_in_op_code terminal $args }
+    function d { wrap_in_shell_script devops $args }
+    function c { wrap_in_shell_script cloud $args }
+    function a { wrap_in_shell_script agents $args }
+    function ss { wrap_in_shell_script sessions $args }
+    function ff { wrap_in_shell_script ftpx $args }
+    function f { wrap_in_shell_script fire $args }
+    function rr { wrap_in_shell_script croshell $args }
+    function u { wrap_in_shell_script utils $args }
+    function t { wrap_in_shell_script terminal $args }
 
 }
 else {

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/setup_linux/__init__.py

@@ -1,6 +1,7 @@
 
 from pathlib import Path
 
+INTERACTIVE = Path(__file__).parent.joinpath("web_shortcuts/interactive.sh")
 APPS = Path(__file__).parent.joinpath("apps.sh")
 UV = Path(__file__).parent.joinpath("uv.sh")
 

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,25 +1,25 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
-. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/mcfgs.sh")
+. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/mcfgs")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" terminal'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" terminal'
 
-alias d='wrap_in_op_code devops'
-alias c='wrap_in_op_code cloud'
-alias a='wrap_in_op_code agents'
-alias ss='wrap_in_op_code sessions'
-alias ff='wrap_in_op_code ftpx'
-alias f='wrap_in_op_code fire'
-alias rr='wrap_in_op_code croshell'
-alias u='wrap_in_op_code utils'
-alias t='wrap_in_op_code terminal'
+alias d='wrap_in_shell_script devops'
+alias c='wrap_in_shell_script cloud'
+alias a='wrap_in_shell_script agents'
+alias ss='wrap_in_shell_script sessions'
+alias ff='wrap_in_shell_script ftpx'
+alias f='wrap_in_shell_script fire'
+alias rr='wrap_in_shell_script croshell'
+alias u='wrap_in_shell_script utils'
+alias t='wrap_in_shell_script terminal'
 
 echo "mcfg command aliases are now defined in this shell session."

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -3,24 +3,24 @@
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/mcfgs.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" terminal $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" terminal $args }
 
-function d { wrap_in_op_code devops @args }
-function c { wrap_in_op_code cloud @args }
-function a { wrap_in_op_code agents @args }
-function ss { wrap_in_op_code sessions @args }
-function ff { wrap_in_op_code ftpx @args }
-function f { wrap_in_op_code fire @args }
-function rr { wrap_in_op_code croshell @args }
-function u { wrap_in_op_code utils @args }
-function t { wrap_in_op_code terminal @args }
+function d { wrap_in_shell_script devops @args }
+function c { wrap_in_shell_script cloud @args }
+function a { wrap_in_shell_script agents @args }
+function ss { wrap_in_shell_script sessions @args }
+function ff { wrap_in_shell_script ftpx @args }
+function f { wrap_in_shell_script fire @args }
+function rr { wrap_in_shell_script croshell @args }
+function u { wrap_in_shell_script utils @args }
+function t { wrap_in_shell_script terminal @args }
 
 Write-Host "mcfg command aliases are now defined in this PowerShell session."

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/utils/links.py

@@ -162,14 +162,15 @@ 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
+                    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))
+
                     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"
@@ -289,6 +290,14 @@ def copy_map(config_file_default_path: PathExtended, self_managed_config_file_pa
                     config_file_default_path.delete(sure=True)
                 else:
                     # Files are different, use on_conflict strategy
+                    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))
+
                     match on_conflict:
                         case "throw-error":
                             raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")

{machineconfig-6.98 → machineconfig-7.2}/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.98"
+MACHINECONFIG_VERSION = "machineconfig>=6.99"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig/utils/upgrade_packages.py

@@ -113,9 +113,11 @@ def upgrade_machine_config_version() -> None:
     major: int = int(version_parts[0])
     minor: int = int(version_parts[1])
     
-    # Bump minor version by 1
+    # Bump minor version by 1, preserving zero-padding
     new_minor: int = minor + 1
-    new_version: str = f"{major}.{new_minor}"
+    # Preserve the same number of digits as the original minor version
+    minor_width: int = len(version_parts[1])
+    new_version: str = f"{major}.{new_minor:0{minor_width}d}"
     
     old_version_constraint: str = f"machineconfig>={current_version_str}"
     new_version_constraint: str = f"machineconfig>={new_version}"

{machineconfig-6.98 → machineconfig-7.2/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.98
+Version: 7.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -59,15 +59,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ src/machineconfig/scripts/python/__init__.py
 src/machineconfig/scripts/python/agents.py
 src/machineconfig/scripts/python/cloud.py
 src/machineconfig/scripts/python/croshell.py
+src/machineconfig/scripts/python/define.py
 src/machineconfig/scripts/python/devops.py
 src/machineconfig/scripts/python/devops_navigator.py
 src/machineconfig/scripts/python/fire_jobs.py

{machineconfig-6.98 → machineconfig-7.2}/src/machineconfig.egg-info/entry_points.txt

@@ -2,9 +2,11 @@
 agents = machineconfig.scripts.python.agents:main
 cloud = machineconfig.scripts.python.cloud:main
 croshell = machineconfig.scripts.python.croshell:main
+define = machineconfig.scripts.python.define:main
 devops = machineconfig.scripts.python.devops:main
 fire = machineconfig.scripts.python.fire_jobs:main
 ftpx = machineconfig.scripts.python.ftpx:main
+machineconfig = machineconfig.scripts.python.mcfg:main
 mcfg = machineconfig.scripts.python.mcfg:main
 sessions = machineconfig.scripts.python.sessions:main
 terminal = machineconfig.scripts.python.terminal:main