machineconfig 6.58__tar.gz → 6.61__tar.gz

{machineconfig-6.58/src/machineconfig.egg-info → machineconfig-6.61}/PKG-INFO

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

{machineconfig-6.58 → machineconfig-6.61}/pyproject.toml

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

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/jobs/installer/installer_data.json

@@ -1,6 +1,23 @@
 {
   "version": "1",
   "installers": [
+    {
+      "appName": "fx",
+      "repoURL": "https://github.com/antonmedv/fx",
+      "doc": "🧙‍♂️ Command-line JSON viewer",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "fx_linux_amd64",
+          "windows": "fx_windows_amd64.exe",
+          "macos": "fx_darwin_amd64"
+        },
+        "arm64": {
+          "linux": "fx_linux_arm64",
+          "windows": "fx_windows_arm64.exe",
+          "macos": "fx_darwin_arm64"
+        }
+      }
+    },    
     {
       "appName": "jq",
       "repoURL": "https://github.com/jqlang/jq",
@@ -2042,14 +2059,14 @@
       }
     },
     {
-      "appName": "nushell",
+      "appName": "nu",
       "repoURL": "https://github.com/nushell/nushell",
-      "doc": "🐚 A cross-platform shell in Rust.",
+      "doc": "🐚 Nushell, a cross-platform shell in Rust.",
       "fileNamePattern": {
         "amd64": {
-          "linux": null,
-          "macos": null,
-          "windows": null
+          "linux": "nu-0.108.0-x86_64-unknown-linux-gnu.tar.gz",
+          "macos": "nu-0.108.0-x86_64-apple-darwin.tar.gz",
+          "windows": "nu-{version}-x86_64-pc-windows-msvc.zip"
         },
         "arm64": {
           "linux": null,

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/profile/create_shell_profile.py

@@ -2,7 +2,7 @@
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import CONFIG_ROOT
-
+from pathlib import Path
 import platform
 import os
 import subprocess
@@ -17,18 +17,20 @@ console = Console()
 BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 
 
-def get_shell_profile_path() -> PathExtended:
+def get_shell_profile_path() -> Path:
     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 = PathExtended(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 = PathExtended("~/.bashrc").expanduser()
+        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"))

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/scripts/python/croshell.py

@@ -65,8 +65,8 @@ def croshell(
         text = f"📄 Reading data from: {file_obj.name}"
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
     else:  # if nothing is specified, then run in interactive mode.
-        text = "⌨️  Entering interactive mode"
-        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+        # text = "⌨️  Entering interactive mode"
+        # console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         # from machineconfig.scripts.python.croshell import InteractiveShell
         # InteractiveShell().run()
         # return None
@@ -124,7 +124,10 @@ def croshell(
             # if writing fails, fall back to the default nb_target already set
             pass
     if visidata:
-        fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
+        if file_obj.suffix == ".json":
+            fire_line = f"uv run --with visidata vd {str(file_obj)}"
+        else:
+            fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
         else: requirements = """--with "marimo,machineconfig[plot]>=6.57" """

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -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.58")
+        uv_with.append("machineconfig>=6.61")
     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.58 → machineconfig-6.61}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

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

{machineconfig-6.58 → machineconfig-6.61}/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.58"]
+        uv_with = ["machineconfig>=6.61"]
         uv_project_dir = None
 
     import tempfile

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

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.58" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.61" 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.58 → machineconfig-6.61}/src/machineconfig/settings/shells/nushell/config.nu

@@ -1,18 +1,16 @@
 
 
 
-
-def gcd [] {
-    let last_command = (history | last 1 | get command.0)
-    let command_output = (do -i { nu -c $last_command } | complete)
-    gh copilot explain $"Input command is: ($last_command) The output is this: ($command_output.stdout)($command_output.stderr)"
-}
-
-
 alias l = lsd -la
-alias gcs = gh copilot suggest -t shell
-alias gcg = gh copilot suggest -t git
-alias gce = gh copilot explain
+alias d = devops
+alias c = cloud
+alias a = agents
+alias s = sessions
+alias ff = ftpx
+alias f = fire
+alias r = croshell
+alias u = utils
+
 
 # as per https://github.com/starship/starship?tab=readme-ov-file#step-1-install-starship
 # $nu.config-path
@@ -33,4 +31,3 @@ use ~/.cache/starship/init.nu
 # as per https://github.com/ajeetdsouza/zoxide?tab=readme-ov-file#installation
 source ~/.zoxide.nu
 
-use '/home/alex/.config/broot/launcher/nushell/br' *

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -34,10 +34,10 @@ Set-Alias -Name l -Value lsdla -Option AllScope
 function d { devops @args }
 function c { cloud @args }
 function a { agents @args }
-function s { sessions @args }
+function ss { sessions @args }
 function ff { ftpx @args }
 function f { fire @args }
-function r { croshell @args }
+function rr { croshell @args }
 function u { utils @args }
 
 # try {

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,14 +1,14 @@
 #!/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.58" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.61" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"
 alias a="mcfg agents"
-alias s="mcfg sessions"
+alias ss="mcfg sessions"
 alias ff="mcfg ftpx"
 alias f="mcfg fire"
-alias r="mcfg croshell"
+alias rr="mcfg croshell"
 alias u="mcfg utils"
 echo "mcfg command is now defined in this shell session."

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,14 +2,14 @@
 
 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.58" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.61" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
 function a { mcfg agents @args }
-function s { mcfg sessions @args }
+function ss { mcfg sessions @args }
 function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
-function r { mcfg croshell @args }
+function rr { mcfg croshell @args }
 function u { mcfg utils @args }
 Write-Host "mcfg command aliases are now defined in this PowerShell session."

{machineconfig-6.58 → machineconfig-6.61}/src/machineconfig/utils/ssh.py

@@ -7,7 +7,7 @@ from machineconfig.utils.terminal import Response, MACHINE
 from machineconfig.utils.accessories import pprint
 
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.58"
+MACHINECONFIG_VERSION = "machineconfig>=6.61"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 
@@ -206,7 +206,7 @@ class SSH:
 
     def run_py_func(self, func: Callable[..., Any], uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Response:
         from machineconfig.utils.meta import lambda_to_python_script
-        command = lambda_to_python_script(lmb=lambda: func, in_global=True)
+        command = lambda_to_python_script(lmb=func, in_global=True)
         return self.run_py(python_code=command, uv_with=uv_with, uv_project_dir=uv_project_dir,
                            description=f"run_py_func {func.__name__} on {self.get_remote_repr(add_machine=False)}",
                            verbose_output=True, strict_stderr=True, strict_return_code=True)

{machineconfig-6.58 → machineconfig-6.61/src/machineconfig.egg-info}/PKG-INFO

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