machineconfig 6.57__tar.gz → 6.58__tar.gz

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

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

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

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

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

@@ -48,9 +48,14 @@ def create_default_shell_profile() -> None:
     if system == "Windows":
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
         source_line = f""". {str(init_script.collapseuser(placeholder="$HOME"))}"""
-    else:
+    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:

{machineconfig-6.57 → machineconfig-6.58}/src/machineconfig/scripts/python/entry.py

@@ -4,6 +4,7 @@ from machineconfig.scripts.python.cloud import get_app as get_cloud_app
 from machineconfig.scripts.python.agents import get_app as get_agents_app
 from machineconfig.scripts.python.fire_jobs import get_app as get_fire_jobs_app
 from machineconfig.scripts.python.sessions import get_app as get_sessions_app
+from machineconfig.scripts.python.utils import get_app as get_utils_app
 
 from machineconfig.scripts.python.ftpx import ftpx as ftpx_func
 from machineconfig.scripts.python.croshell import croshell as croshell_func
@@ -37,8 +38,13 @@ def get_app():
     app.command("croshell", no_args_is_help=False, help="[r] Cross-shell command execution")(croshell_func)
     app.command("r", no_args_is_help=False, hidden=True)(croshell_func)  # short alias
 
+    utils_app = get_utils_app()
+    app.add_typer(utils_app, name="utils", help="[u] Utility commands", no_args_is_help=True)
+    app.add_typer(utils_app, name="u", hidden=True)  # short alias
+
     return app
 
+
 def main():
     app = get_app()
     app()

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

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

{machineconfig-6.57 → machineconfig-6.58}/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.57")
+        uv_with.append("machineconfig>=6.58")
     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])
@@ -59,6 +59,34 @@ def pwsh_theme():
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
 
+def starship_theme():
+    """🔗 Select starship prompt theme."""
+    import subprocess
+    from machineconfig.utils.code import run_shell_script
+    
+    presets: list[str] = ["catppuccin-powerline", "pastel-powerline", "tokyo-night", "gruvbox-rainbow", "jetpack"]
+    config_path: Path = Path.home() / ".config" / "starship.toml"
+    
+    typer.echo("\n🚀 Starship Theme Selector\n")
+    for idx, preset in enumerate(presets, start=1):
+        typer.echo(f"{idx}. {preset}")
+    
+    choice: str = typer.prompt("Select a preset")
+    
+    try:
+        choice_idx: int = int(choice)
+        if 1 <= choice_idx <= len(presets):
+            selected_preset: str = presets[choice_idx - 1]
+            typer.echo(f"\n✨ Applying {selected_preset}...")
+            run_shell_script(f"""starship preset {selected_preset} -o {config_path}""")
+            typer.echo("\n📋 Preview:")
+            subprocess.run(["starship", "module", "all"], check=False)
+            typer.echo(f"\n✅ {selected_preset} applied!")
+        else:
+            typer.echo("❌ Invalid selection")
+    except ValueError:
+        typer.echo("❌ Please enter a valid number")
+
 def copy_assets(which: Annotated[Literal["scripts", "settings", "both"], typer.Argument(..., help="Which assets to copy")]):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper
@@ -82,8 +110,11 @@ def get_app():
     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)
     config_apps.command("p", no_args_is_help=False, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
-    config_apps.command("pwsh-theme", no_args_is_help=False, help="🔗  [t] Select powershell prompt theme.")(pwsh_theme)
-    config_apps.command("t", no_args_is_help=False, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
+    config_apps.command("starship-theme", no_args_is_help=False, help="🔗  [t] Select starship prompt theme.")(starship_theme)
+    config_apps.command("t", no_args_is_help=False, help="Select starship prompt theme.", hidden=True)(starship_theme)
+    config_apps.command("pwsh-theme", no_args_is_help=False, help="🔗  [T] Select powershell prompt theme.")(pwsh_theme)
+    config_apps.command("T", no_args_is_help=False, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
+
     config_apps.command("copy-assets", no_args_is_help=True, help="🔗  [c] Copy asset files from library to machine.", hidden=False)(copy_assets)
     config_apps.command("c", no_args_is_help=True, help="Copy asset files from library to machine.", hidden=True)(copy_assets)
     return config_apps

{machineconfig-6.57 → machineconfig-6.58}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -10,20 +10,21 @@ def update(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na
     from pathlib import Path
     if Path.home().joinpath("code", "machineconfig").exists():
         code = """
-    uv self update
-    cd ~/code/machineconfig
-    git pull
-    uv tool install --upgrade --editable $HOME/code/machineconfig
+uv self update
+cd ~/code/machineconfig
+git pull
+uv tool install --upgrade --editable $HOME/code/machineconfig
     """
     else:
         code = """
-    uv self update
-    uv tool install --upgrade machineconfig
+uv self update
+uv tool install --upgrade machineconfig
     """
     import platform
     if platform.system() == "Windows":
-        from machineconfig.utils.code import run_shell_script_after_exit
-        run_shell_script_after_exit(code)
+        # from machineconfig.utils.code import run_shell_script_after_exit
+        # run_shell_script_after_exit(code)
+        print(f'please run {code} in powershell to update machineconfig')
     else:
         from machineconfig.utils.code import run_shell_script
         run_shell_script(code)
@@ -40,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.57" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.58" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.57" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.58" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -67,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.57,textual" """
+    else: executable = """--with "machineconfig>=6.58,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

machineconfig-6.58/src/machineconfig/scripts/python/helpers_devops/themes/choose_starship_theme.bash

@@ -0,0 +1,3 @@
+
+
+

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

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

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

@@ -1,4 +1,15 @@
 #!/bin/bash
+# Record script start time for runtime measurement
+# _START_TIME_NS=$(date +%s%N)
+# _show_elapsed() {
+#     local _end_ns _elapsed_ns _secs _ms
+#     _end_ns=$(date +%s%N)
+#     _elapsed_ns=$((_end_ns - _START_TIME_NS))
+#     _secs=$((_elapsed_ns / 1000000000))
+#     _ms=$((_elapsed_ns / 1000000 % 1000))
+#     printf "Script runtime: %d.%03d seconds\n" "$_secs" "$_ms"
+# }
+
 # 🛠️ Bash Shell Configuration and Initialization
 
 add_to_path_if_not_already() {
@@ -75,3 +86,6 @@ eval "$(starship init bash)"
 # from https://github.com/cantino/mcfly
 eval "$(mcfly init bash)"
 
+# Show elapsed runtime
+# _show_elapsed
+

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

@@ -40,18 +40,18 @@ function f { fire @args }
 function r { croshell @args }
 function u { utils @args }
 
-try {
-    Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
-    Set-Alias -Name gcg -Value {gh copilot suggest -t git}
-    Set-Alias -Name gce -Value {gh copilot explain}
-    # Check for conflicts
-    # Get-Command gcs -ErrorAction SilentlyContinue
-    # Get-Command gcg -ErrorAction SilentlyContinue
-    # Get-Command gce -ErrorAction SilentlyContinue
-}
-catch {
-    # Do nothing
-}
+# try {
+#     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
+#     Set-Alias -Name gcg -Value {gh copilot suggest -t git}
+#     Set-Alias -Name gce -Value {gh copilot explain}
+#     # Check for conflicts
+#     # Get-Command gcs -ErrorAction SilentlyContinue
+#     # Get-Command gcg -ErrorAction SilentlyContinue
+#     # Get-Command gce -ErrorAction SilentlyContinue
+# }
+# catch {
+#     # Do nothing
+# }
 
 
 # patches ===========================================================
@@ -66,3 +66,11 @@ try {
 catch {
     # Do nothing
 }
+
+try {
+    # Initialize Starship prompt
+    Invoke-Expression (&starship init powershell)
+}
+catch {
+    # Do nothing
+}

machineconfig-6.58/src/machineconfig/settings/shells/zsh/init.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+# Record script start time for runtime measurement
+# _START_TIME_NS=$(date +%s%N)
+# _show_elapsed() {
+#     local _end_ns _elapsed_ns _secs _ms
+#     _end_ns=$(date +%s%N)
+#     _elapsed_ns=$((_end_ns - _START_TIME_NS))
+#     _secs=$((_elapsed_ns / 1000000000))
+#     _ms=$((_elapsed_ns / 1000000 % 1000))
+#     printf "Script runtime: %d.%03d seconds\n" "$_secs" "$_ms"
+# }
+
+# 🛠️ Bash Shell Configuration and Initialization
+
+add_to_path_if_not_already() {
+    for dir in "$@"; do
+        if [[ ! $PATH =~ (^|:)"${dir}"(:|$) ]]; then
+            export PATH="$PATH:${dir}"
+        fi
+    done
+}
+CONFIG_ROOT="$HOME/.config/machineconfig"
+
+# 📂 Add directories to PATH
+add_to_path_if_not_already \
+    "$CONFIG_ROOT/scripts/linux" \
+    "$HOME/dotfiles/scripts/linux" \
+    "$HOME/.local/bin" \
+    "$HOME/.cargo/bin" \
+    "/usr/games"
+# this way, if the script was run multiple times, e.g. due to nested shells in zellij, there will be no duplicates in the path
+# export DISPLAY=localhost:0.0  # xming server
+    # "$HOME/.nix-profile/bin" \
+    # "/home/linuxbrew/.linuxbrew/bin" \
+
+# echo "Sourcing scripts ..."
+. $CONFIG_ROOT/settings/broot/br.sh
+. $CONFIG_ROOT/settings/lf/linux/exe/lfcd.sh
+. $CONFIG_ROOT/settings/tere/terecd.sh
+# check if file in ~/dotfiles/machineconfig/init_linux.sh exists and source it
+if [ -f "$HOME/dotfiles/machineconfig/init_linux.sh" ]; then
+    # echo "Sourcing $HOME/dotfiles/machineconfig/init_linux.sh"
+    source "$HOME/dotfiles/machineconfig/init_linux.sh"
+fi
+
+# set alias l to lsd -la
+alias l='lsd -la'
+alias d=devops
+alias c=cloud
+alias a=agents
+alias s=sessions
+alias ff=ftpx
+alias f=fire
+alias r=croshell
+alias u=utils
+
+# alias gcs='gh copilot suggest -t shell'
+# alias gcg='gh copilot suggest -t git'
+# alias gce='gh copilot explain'
+# Check uniqueness of aliases
+# type gcs
+# type gcg
+# type gce
+# gcd() {
+#   x=$(history -p '!!')
+#   y=$(eval "$x" 2>&1)
+#   gh copilot explain "Input command is: $x The output is this: $y"
+# }
+
+# 📦 Node Version Manager
+# export NVM_DIR="$HOME/.nvm"
+# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+
+# https://github.com/atuinsh/atuin
+# eval "$(atuin init bash)"
+
+# source /home/alex/.config/broot/launcher/bash/br
+# eval "$(thefuck --alias)"
+# from https://github.com/ajeetdsouza/zoxide
+eval "$(zoxide init zsh)"
+# from https://github.com/starship/starship
+eval "$(starship init zsh)"
+# LEVE THIS IN THE END TO AVOID EXECUTION FAILURE OF THE REST OF THE SCRIPT
+# from https://github.com/cantino/mcfly
+eval "$(mcfly init zsh)"
+
+# Show elapsed runtime
+# _show_elapsed
+

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.57" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.58" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

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

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

{machineconfig-6.57 → machineconfig-6.58}/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.57"
+MACHINECONFIG_VERSION = "machineconfig>=6.58"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 

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

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

{machineconfig-6.57 → machineconfig-6.58}/src/machineconfig.egg-info/SOURCES.txt

@@ -202,6 +202,8 @@ src/machineconfig/scripts/python/helpers_devops/devops_status.py
 src/machineconfig/scripts/python/helpers_devops/devops_update_repos.py
 src/machineconfig/scripts/python/helpers_devops/themes/__init__.py
 src/machineconfig/scripts/python/helpers_devops/themes/choose_pwsh_theme.ps1
+src/machineconfig/scripts/python/helpers_devops/themes/choose_starship_theme.bash
+src/machineconfig/scripts/python/helpers_devops/themes/choose_starship_theme.ps1
 src/machineconfig/scripts/python/helpers_devops/themes/choose_wezterm_theme.py
 src/machineconfig/scripts/python/helpers_fire/__init__.py
 src/machineconfig/scripts/python/helpers_fire/fire_agents_help_launch.py
@@ -350,6 +352,7 @@ src/machineconfig/settings/shells/starship/starship.toml
 src/machineconfig/settings/shells/vtm/settings.xml
 src/machineconfig/settings/shells/wezterm/wezterm.lua
 src/machineconfig/settings/shells/wt/settings.json
+src/machineconfig/settings/shells/zsh/init.sh
 src/machineconfig/settings/streamlit/config.toml
 src/machineconfig/settings/svim/linux/init.toml
 src/machineconfig/settings/svim/windows/init.toml