machineconfig 7.51__py3-none-any.whl → 7.53__py3-none-any.whl

machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -9,7 +9,9 @@ def copy_both_assets():
     create_helper.copy_assets_to_machine(which="settings")
 
 
-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):
+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,
+           link_public_configs: Annotated[bool, typer.Option("--link-public-configs/--no-link-public-configs", "-b/-nb", help="Link public configs after update (overwrites your configs!)")] = False,
+           ):
     """🔄 UPDATE uv and machineconfig"""
     from pathlib import Path
     if Path.home().joinpath("code", "machineconfig").exists():
@@ -34,8 +36,12 @@ uv tool install --upgrade machineconfig
     else:
         from machineconfig.utils.code import run_shell_script
         run_shell_script(shell_script)
-    if copy_assets:
-        copy_both_assets()
+        if copy_assets:
+            copy_both_assets()
+        if link_public_configs:
+            import machineconfig.profile.create_links_export as create_links_export
+            create_links_export.main_public_from_parser(method="copy", on_conflict="overwrite-default-path", which="all", interactive=False)
+
 
 def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na", help="Copy (overwrite) assets to the machine after the update")] = False):
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
@@ -46,9 +52,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.51" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.53" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.51" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.53" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -73,7 +79,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.51,textual" """
+    else: executable = """--with "machineconfig>=7.53,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -1,7 +1,7 @@
 
 
 import typer
-from typing import Annotated, Literal, Optional, TypedDict
+from typing import Annotated, Optional
 from pathlib import Path
 
 def download(
@@ -165,82 +165,3 @@ def compress_pdf(
     uv_command, _py_file = get_uv_command_executing_python_script(python_script=code, uv_with=["pymupdf"], uv_project_dir=None)
     run_shell_script(uv_command)
 
-
-class MachineSpecs(TypedDict):
-    system: str
-    distro: str
-    home_dir: str
-def get_machine_specs() -> MachineSpecs:
-    """Write print and return the local machine specs."""
-    import platform
-    UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-    command = f"""{UV_RUN_CMD} --with distro python -c "import distro; print(distro.name(pretty=True))" """
-    import subprocess
-    distro = subprocess.run(command, shell=True, capture_output=True, text=True).stdout.strip()
-    specs: MachineSpecs = {
-        "system": platform.system(),
-        "distro": distro,
-        "home_dir": str(Path.home()),
-    }
-    print(specs)
-    from machineconfig.utils.source_of_truth import CONFIG_ROOT
-    path = CONFIG_ROOT.joinpath("machine_specs.json")
-    CONFIG_ROOT.mkdir(parents=True, exist_ok=True)
-    import json
-    path.write_text(json.dumps(specs, indent=4), encoding="utf-8")
-    return specs
-
-
-def init_project(python: Annotated[Literal["3.13", "3.14"], typer.Option("--python", "-p", help="Python version for the uv virtual environment.")]= "3.13") -> None:
-    _ = python
-    repo_root = Path.cwd()
-    if not (repo_root / "pyproject.toml").exists():
-        typer.echo("❌ Error: pyproject.toml not found.", err=True)
-        raise typer.Exit(code=1)
-    print("Adding group `plot` with common data science and plotting packages...")
-    script = """
-uv add --group plot \
-    # Data & computation
-    numpy pandas polars duckdb-engine python-magic \
-    # Plotting / visualization
-    matplotlib plotly kaleido \
-    # Notebooks / interactive
-    ipython ipykernel jupyterlab nbformat marimo \
-    # Code analysis / type checking / linting
-    mypy pyright ruff pylint pyrefly \
-    # Packaging / build / dev
-    cleanpy \
-    # CLI / debugging / utilities
-    ipdb pudb \
-    # Type hints for packages
-    types-python-dateutil types-pyyaml types-requests types-tqdm \
-    types-mysqlclient types-paramiko types-pytz types-sqlalchemy types-toml types-urllib3 \
-
-"""
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(script)
-
-
-def edit(path: Annotated[Optional[str], typer.Argument(..., help="The root directory of the project to edit, or a file path.")] = None) -> None:
-    if path is None:
-        root_path = Path.cwd()
-        print(f"No path provided. Using current working directory: {root_path}")
-    else:
-        root_path = Path(path).expanduser().resolve()
-        print(f"Using provided path: {root_path}")
-    from machineconfig.utils.accessories import get_repo_root
-    repo_root = get_repo_root(root_path)
-    if repo_root is not None and repo_root.joinpath("pyproject.toml").exists():
-        code = f"""
-cd {repo_root}
-uv add --dev pylsp-mypy python-lsp-server[all] pyright ruff-lsp  # for helix editor.
-source ./.venv/bin/activate
-"""
-    else:
-        code = ""
-    if root_path.is_file():
-        code += f"hx {root_path}"
-    else:
-        code += "hx"
-    from machineconfig.utils.code import exit_then_run_shell_script
-    exit_then_run_shell_script(code)

machineconfig/scripts/python/helpers_fire_command/file_wrangler.py

@@ -4,23 +4,6 @@ from machineconfig.utils.path_extended import PathExtended
 import platform
 
 
-def search_for_files_of_interest(path_obj: PathExtended):
-    if path_obj.joinpath(".venv").exists():
-        path_objects = path_obj.search("*", not_in=[".venv"])
-        files: list[PathExtended] = []
-        for a_path_obj in path_objects:
-            files += search_for_files_of_interest(path_obj=a_path_obj)
-        return files
-    if path_obj.is_file():
-        return [path_obj]
-    py_files = path_obj.search(pattern="*.py", not_in=["__init__.py"], r=True)
-    ps_files = path_obj.search(pattern="*.ps1", r=True)
-    sh_files = path_obj.search(pattern="*.sh", r=True)
-    files = py_files + ps_files + sh_files
-    return files
-
-
-
 def parse_pyfile(file_path: str):
     print(f"🔍 Loading {file_path} ...")
     from typing import NamedTuple

machineconfig/scripts/python/helpers_msearch/scripts_linux/fzfg

@@ -19,5 +19,5 @@ IFS=: read -ra selected < <(
       --preview 'bat --color=always {1} --highlight-line {2}' \
       --preview-window 'up,60%,border-bottom,+{2}+3/3,~3'
 )
-[ -n "${selected[0]}" ] && hx "${selected[0]}" "+${selected[1]}
+[ -n "${selected[0]}" ] && hx "${selected[0]}:${selected[1]}:${selected[2]}"
 "

machineconfig/scripts/python/helpers_repos/clone.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 from pathlib import Path
 from typing import Literal, Optional, cast

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -99,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.51"]
+        uv_with = ["machineconfig>=7.53"]
         uv_project_dir = None
 
     import tempfile

machineconfig/scripts/python/helpers_repos/count_lines_frontend.py

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

machineconfig/scripts/python/helpers_sessions/sessions_multiprocess.py

@@ -21,9 +21,9 @@ def create_from_function(
         suffixes = {".py"}
         choice_file = match_file_name(sub_string=path, search_root=PathExtended.cwd(), suffixes=suffixes)
     elif path_obj.is_dir():
-        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import search_for_files_of_interest
+        from machineconfig.utils.path_helper import search_for_files_of_interest
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
-        files = search_for_files_of_interest(path_obj)
+        files = search_for_files_of_interest(path_obj, suffixes={".py", ".sh", ".ps1"})
         print(f"🔍 Got #{len(files)} results.")
         choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
         choice_file = PathExtended(choice_file)

machineconfig/scripts/python/helpers_utils/path.py

@@ -0,0 +1,106 @@
+
+
+
+import typer
+
+from typing import Optional
+from pathlib import Path
+from typing import Annotated, Literal, TypedDict
+
+
+def path():
+    """📚 NAVIGATE PATH variable with TUI"""
+    from machineconfig.scripts.python import env_manager as navigator
+    from pathlib import Path
+    path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
+    from machineconfig.utils.code import run_shell_script, get_uv_command_executing_python_script
+    uv_with = ["textual"]
+    uv_project_dir = None
+    if not Path.home().joinpath("code/machineconfig").exists():
+        uv_with.append("machineconfig>=7.53")
+    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])
+
+
+def init_project(python: Annotated[Literal["3.13", "3.14"], typer.Option("--python", "-p", help="Python version for the uv virtual environment.")]= "3.13") -> None:
+    _ = python
+    repo_root = Path.cwd()
+    if not (repo_root / "pyproject.toml").exists():
+        typer.echo("❌ Error: pyproject.toml not found.", err=True)
+        raise typer.Exit(code=1)
+    print("Adding group `plot` with common data science and plotting packages...")
+    script = """
+uv add --group plot \
+    # Data & computation
+    numpy pandas polars duckdb-engine python-magic \
+    # Plotting / visualization
+    matplotlib plotly kaleido \
+    # Notebooks / interactive
+    ipython ipykernel jupyterlab nbformat marimo \
+    # Code analysis / type checking / linting
+    mypy pyright ruff pylint pyrefly \
+    # Packaging / build / dev
+    cleanpy \
+    # CLI / debugging / utilities
+    ipdb pudb \
+    # Type hints for packages
+    types-python-dateutil types-pyyaml types-requests types-tqdm \
+    types-mysqlclient types-paramiko types-pytz types-sqlalchemy types-toml types-urllib3 \
+
+"""
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script)
+
+
+def edit_file_with_hx(path: Annotated[Optional[str], typer.Argument(..., help="The root directory of the project to edit, or a file path.")] = None) -> None:
+    if path is None:
+        root_path = Path.cwd()
+        print(f"No path provided. Using current working directory: {root_path}")
+    else:
+        root_path = Path(path).expanduser().resolve()
+        print(f"Using provided path: {root_path}")
+    from machineconfig.utils.accessories import get_repo_root
+    repo_root = get_repo_root(root_path)
+    if repo_root is not None and repo_root.joinpath("pyproject.toml").exists():
+        code = f"""
+cd {repo_root}
+uv add --dev pylsp-mypy python-lsp-server[all] pyright ruff-lsp  # for helix editor.
+source ./.venv/bin/activate
+"""
+    else:
+        code = ""
+    if root_path.is_file():
+        code += f"hx {root_path}"
+    else:
+        code += "hx"
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(code)
+
+
+class MachineSpecs(TypedDict):
+    system: str
+    distro: str
+    home_dir: str
+
+
+def get_machine_specs() -> MachineSpecs:
+    """Write print and return the local machine specs."""
+    import platform
+    UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
+    command = f"""{UV_RUN_CMD} --with distro python -c "import distro; print(distro.name(pretty=True))" """
+    import subprocess
+    distro = subprocess.run(command, shell=True, capture_output=True, text=True).stdout.strip()
+    specs: MachineSpecs = {
+        "system": platform.system(),
+        "distro": distro,
+        "home_dir": str(Path.home()),
+    }
+    print(specs)
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    path = CONFIG_ROOT.joinpath("machine_specs.json")
+    CONFIG_ROOT.mkdir(parents=True, exist_ok=True)
+    import json
+    path.write_text(json.dumps(specs, indent=4), encoding="utf-8")
+    return specs
+

machineconfig/scripts/python/interactive.py

@@ -97,25 +97,20 @@ def get_installation_choices() -> list[str]:
     """Get user choices for installation options."""
     choices = [
         Choice(value="install_machineconfig", title="🐍 Install machineconfig.", checked=False),
-        Choice(value="ESSENTIAL_SYSTEM", title="📥 Install Essential System Packages.", checked=False),
-        Choice(value="ESSENTIAL", title="⚡ Install CLI apps essentials", checked=False),
-        Choice(value="DEV_SYSTEM", title="🛠️  Install CLI apps development.", checked=False),
-        Choice(value="TerminalEyeCandy", title="🎨 Install CLI apps terminal eye candy.", checked=False),
-        Choice(value="install_ssh_server", title="🔒 Install SSH Server", checked=False),
+        Choice(value="sysabc", title="📥 Install Essential System Packages.", checked=False),
+        Choice(value="termabc", title="⚡ Install Terminal CLI apps essentials", checked=False),
         Choice(value="install_shell_profile", title="🐚 Configure Shell Profile.", checked=False),
+        Choice(value="install_ssh_server", title="🔒 Install SSH Server", checked=False),
         Choice(value="retrieve_repositories", title="📚 Retrieve Repositories", checked=False),
         Choice(value="retrieve_data", title="💾 Retrieve Data.", checked=False),
     ]
-    # Add Windows-specific options
-    if platform.system() == "Windows":
-        choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Install nerd fonts and set WT config.", checked=False))
     selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
     return selected or []
 
 
 def execute_installations(selected_options: list[str]) -> None:
     for maybe_a_group in selected_options:
-        if maybe_a_group in ("ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM", "TerminalEyeCandy"):
+        if maybe_a_group in ("termabc", "sysabc"):
             console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
             console.print("🔧 Installing CLI applications", style="bold cyan")
             try:
@@ -152,6 +147,11 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
             from machineconfig.profile.create_shell_profile import create_default_shell_profile
             create_default_shell_profile()
             console.print("✅ Shell profile configured successfully", style="bold green")
+            if platform.system() == "Windows":
+                from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+                install_nerd_fonts()
+                from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
+                set_wt_settings_main()
         except Exception as e:
             console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
@@ -170,12 +170,6 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
 
-    if "install_windows_desktop" in selected_options:
-        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
-        install_nerd_fonts()
-        from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
-        set_wt_settings_main()
-
 
 def main() -> None:
     display_header()

machineconfig/scripts/python/sessions.py

@@ -51,7 +51,7 @@ def select_layout(layouts_json_file: Path, selected_layouts_names: Optional[list
 
 def find_layout_file(layout_path: str, ) -> Path:
     from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.scripts.python.helpers_fire_command.file_wrangler import search_for_files_of_interest
+    from machineconfig.utils.path_helper import search_for_files_of_interest
     from machineconfig.utils.options import choose_from_options
     from machineconfig.utils.path_helper import match_file_name, sanitize_path
     path_obj = sanitize_path(layout_path)
@@ -59,7 +59,7 @@ def find_layout_file(layout_path: str, ) -> Path:
         choice_file = match_file_name(sub_string=layout_path, search_root=PathExtended.cwd(), suffixes={".json"})
     elif path_obj.is_dir():
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
-        files = search_for_files_of_interest(path_obj)
+        files = search_for_files_of_interest(path_obj, suffixes={".py", ".sh", ".ps1"})
         print(f"🔍 Got #{len(files)} results.")
         choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
         choice_file = PathExtended(choice_file)

machineconfig/scripts/python/utils.py

@@ -1,6 +1,7 @@
 
 
-from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, get_machine_specs, init_project, compress_pdf, edit
+from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, compress_pdf
+from machineconfig.scripts.python.helpers_utils.path import edit_file_with_hx, get_machine_specs, init_project, path
 import typer
 from typing import Annotated
 
@@ -30,6 +31,9 @@ def get_app() -> typer.Typer:
     app.command(name="kill-process", no_args_is_help=False, help="[k] Choose a process to kill")(kill_process)
     app.command(name="k", no_args_is_help=False, help="Choose a process to kill", hidden=True)(kill_process)
 
+    app.command("path", no_args_is_help=False, help="📚  [p] NAVIGATE PATH variable with TUI")(path)
+    app.command("p", no_args_is_help=False, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
+
     app.command(name="upgrade-packages", no_args_is_help=False, help="[up] Upgrade project dependencies.")(upgrade_packages)
     app.command(name="up", no_args_is_help=False, hidden=True)(upgrade_packages)
 
@@ -39,8 +43,8 @@ def get_app() -> typer.Typer:
     app.command(name="g", no_args_is_help=False, hidden=True)(get_machine_specs)
     app.command(name="init-project", no_args_is_help=False, help="[i] Initialize a project with a uv virtual environment and install dev packages.")(init_project)
     app.command(name="i", no_args_is_help=False, hidden=True)(init_project)
-    app.command(name="edit", no_args_is_help=False, help="[e] Open a file in the default editor.")(edit)
-    app.command(name="e", no_args_is_help=False, hidden=True)(edit)
+    app.command(name="edit", no_args_is_help=False, help="[e] Open a file in the default editor.")(edit_file_with_hx)
+    app.command(name="e", no_args_is_help=False, hidden=True)(edit_file_with_hx)
 
     app.command(name="pdf-merge", no_args_is_help=True, help="[pm] Merge two PDF files into one.")(merge_pdfs)
     app.command(name="pm", no_args_is_help=True, hidden=True)(merge_pdfs)

machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=7.51" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=7.53" 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/settings/yazi/init.lua

@@ -1,36 +1,57 @@
+-- https://yazi-rs.github.io/docs/tips#symlink-in-status
+-- https://yazi-rs.github.io/docs/tips#user-group-in-status
+-- https://yazi-rs.github.io/docs/tips#username-hostname-in-header
 
+-- Load Status component
+function Status:render(area)
+	self.area = area
 
--- https://yazi-rs.github.io/docs/tips#symlink-in-status
-Status:children_add(function(self)
+	local left = ui.Line(self:mode())
+	local right = ui.Line {}
+	local center = ui.Line {}
+
+	-- Add symlink target
 	local h = self._current.hovered
 	if h and h.link_to then
-		return " -> " .. tostring(h.link_to)
-	else
-		return ""
+		center = center .. ui.Span(" -> " .. tostring(h.link_to)):fg("cyan")
 	end
-end, 3300, Status.LEFT)
-
 
---  https://yazi-rs.github.io/docs/tips#user-group-in-status
-Status:children_add(function()
-	local h = cx.active.current.hovered
-	if not h or ya.target_family() ~= "unix" then
-		return ""
+	-- Add user:group on Unix
+	if h and ya.target_family() == "unix" then
+		right = right .. ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta")
+		right = right .. ui.Span(":"):fg("magenta")
+		right = right .. ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta")
+		right = right .. ui.Span(" ")
 	end
 
-	return ui.Line {
-		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
-		":",
-		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
-		" ",
+	-- Add default status elements
+	left = left .. self:size()
+	right = self:name() .. right .. self:percentage()
+
+	return {
+		ui.Paragraph(area, { left, center }),
+		ui.Paragraph(area, { right }):align(ui.Paragraph.RIGHT),
 	}
-end, 500, Status.RIGHT)
+end
 
+-- Load Header component  
+function Header:render(area)
+	self.area = area
+	
+	local left = ui.Line {}
+	local right = ui.Line {}
 
--- https://yazi-rs.github.io/docs/tips#username-hostname-in-header
-Header:children_add(function()
-	if ya.target_family() ~= "unix" then
-		return ""
+	-- Add username@hostname on Unix
+	if ya.target_family() == "unix" then
+		left = left .. ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
 	end
-	return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
-end, 500, Header.LEFT)
+
+	-- Add default header elements
+	left = left .. self:cwd()
+	right = self:tabs()
+
+	return {
+		ui.Paragraph(area, { left }),
+		ui.Paragraph(area, { right }):align(ui.Paragraph.RIGHT),
+	}
+end

machineconfig/setup_linux/__init__.py

@@ -2,7 +2,6 @@
 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")
 
 APPS_DESKTOP = Path(__file__).parent.joinpath("apps_desktop.sh")

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -2,16 +2,16 @@
 . <( 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/wrap_mcfg")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" terminal'
-alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.51" msearch'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" terminal'
+alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.53" msearch'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'
@@ -24,4 +24,5 @@ alias u='wrap_in_shell_script utils'
 alias t='wrap_in_shell_script terminal'
 alias ms='wrap_in_shell_script msearch'
 
+devops self
 echo "mcfg command aliases are now defined in this shell session."

machineconfig/setup_mac/__init__.py

@@ -7,11 +7,10 @@ pointing at common scripts (so other code can import these paths).
 
 from pathlib import Path
 
-# Path to main installer script for macOS
-APPS = Path(__file__).parent.joinpath("apps.sh")
+
 # Optional helper scripts (may or may not exist)
 UV = Path(__file__).parent.joinpath("uv.sh")
 # Path to macOS SSH helper
 SSH_SETUP = Path(__file__).parent.joinpath("ssh/openssh_setup.sh")
 
-__all__ = ["APPS", "UV", "SSH_SETUP"]
+__all__ = ["UV", "SSH_SETUP"]

machineconfig/setup_windows/__init__.py

@@ -1,11 +1,8 @@
 
 from pathlib import Path
 
-APPS = Path(__file__).parent.joinpath("apps.ps1")
 UV = Path(__file__).parent.joinpath("uv.ps1")
-
 DOCKER = Path(__file__).parent.joinpath("others/docker.ps1")
 OBS = Path(__file__).parent.joinpath("others/obs.ps1")
 POWER_OPTIONS = Path(__file__).parent.joinpath("others/power_options.ps1")
-
 SSH_SERVER = Path(__file__).parent.joinpath("ssh/openssh_server.ps1")

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -3,16 +3,16 @@
 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/wrap_mcfg.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" terminal $args }
-function msearch    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.51" msearch $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" terminal $args }
+function msearch  { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.53" msearch $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }
@@ -25,4 +25,5 @@ function u { wrap_in_shell_script utils @args }
 function t { wrap_in_shell_script terminal @args }
 function ms { wrap_in_shell_script msearch @args }
 
+devops self
 Write-Host "mcfg command aliases are now defined in this PowerShell session."

machineconfig/setup_windows/web_shortcuts/quick_init.ps1

@@ -0,0 +1,15 @@
+
+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/wrap_mcfg.ps1").Content
+uv tool install --upgrade  --python 3.14 machineconfig both
+
+devops install --group sysabc
+
+# configs
+devops config copy-assets both
+devops config public --method copy --on-conflict overwrite-default-path --which all
+devops config shell
+devops config shell --which nushell
+
+wt  # start Windows Terminal to pick up config changes
+devops install --group termabc