machineconfig 8.47__tar.gz → 8.57__tar.gz

{machineconfig-8.47/src/machineconfig.egg-info → machineconfig-8.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 8.47
+Version: 8.57
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -15,6 +15,7 @@ Requires-Dist: cryptography>=46.0.3
 Requires-Dist: fire>=0.7.1
 Requires-Dist: gitpython>=3.1.45
 Requires-Dist: joblib>=1.5.2
+Requires-Dist: numpy>=2.4.1
 Requires-Dist: paramiko>=4.0.0
 Requires-Dist: psutil>=7.1.3
 Requires-Dist: questionary>=2.1.1
@@ -60,7 +61,7 @@ Entering,  **Machineconfig**, a cli-based cross-platform **Stack Manager** — I
 What is your stack? Say you have a new computer/ VM, how do you go about setting it up with your stack?
 Surely, you have:
 * A bunch of CLI tools.
-* [Optional] A bunch of softwares (GUIs for desktop environment)
+* [Optional] A bunch of softwares (GUIs for desktop environment).
 * [Public] A bunch of configuration files for your tools.
 * [Private] A bunch of secrets, passowords, tokens, credentials etc, etc.
 * Data (Both highly sensitive and encrypted less serious unencrypted data)

{machineconfig-8.47 → machineconfig-8.57}/README.md

@@ -18,7 +18,7 @@ Entering,  **Machineconfig**, a cli-based cross-platform **Stack Manager** — I
 What is your stack? Say you have a new computer/ VM, how do you go about setting it up with your stack?
 Surely, you have:
 * A bunch of CLI tools.
-* [Optional] A bunch of softwares (GUIs for desktop environment)
+* [Optional] A bunch of softwares (GUIs for desktop environment).
 * [Public] A bunch of configuration files for your tools.
 * [Private] A bunch of secrets, passowords, tokens, credentials etc, etc.
 * Data (Both highly sensitive and encrypted less serious unencrypted data)

{machineconfig-8.47 → machineconfig-8.57}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "8.47"
+version = "8.57"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -24,6 +24,7 @@ dependencies = [
     "fire>=0.7.1",
     "gitpython>=3.1.45",
     "joblib>=1.5.2",
+    "numpy>=2.4.1",
     "paramiko>=4.0.0",
     "psutil>=7.1.3",
     "questionary>=2.1.1",
@@ -70,7 +71,6 @@ ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg_entry:main"
 machineconfig = "machineconfig.scripts.python.mcfg_entry:main"
-terminal = "machineconfig.scripts.python.terminal:main"
 msearch = "machineconfig.scripts.python.msearch:main"
 
 [tool.setuptools]

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/installer_data.json

@@ -654,12 +654,12 @@
       "fileNamePattern": {
         "amd64": {
           "linux": null,
-          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --accept-package-agreements --accept-source-agreements",
           "macos": null
         },
         "arm64": {
           "linux": null,
-          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --accept-package-agreements --accept-source-agreements",
           "macos": null
         }
       }
@@ -1454,12 +1454,12 @@
         "amd64": {
           "linux": "atuin-x86_64-unknown-linux-gnu.tar.gz",
           "macos": null,
-          "windows": null
+          "windows": "atuin-x86_64-pc-windows-msvc.zip"
         },
         "arm64": {
           "linux": "atuin-aarch64-unknown-linux-gnu.tar.gz",
-          "macos": null,
-          "windows": null
+          "macos": "atuin-aarch64-apple-darwin.tar.gz",
+          "windows": "atuin-aarch64-pc-windows-msvc.zip"
         }
       }
     },
@@ -3562,12 +3562,12 @@
       "fileNamePattern": {
         "amd64": {
           "linux": null,
-          "windows": "winget install --no-upgrade --name \"Mozilla Thunderbird (en-US)\" --Id \"Mozilla.Thunderbird\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "windows": "winget install --no-upgrade --name \"Mozilla Thunderbird (en-US)\" --Id \"Mozilla.Thunderbird\" --source winget --accept-package-agreements --accept-source-agreements",
           "macos": null
         },
         "arm64": {
           "linux": null,
-          "windows": "winget install --no-upgrade --name \"Mozilla Thunderbird (en-US)\" --Id \"Mozilla.Thunderbird\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "windows": "winget install --no-upgrade --name \"Mozilla Thunderbird (en-US)\" --Id \"Mozilla.Thunderbird\" --source winget --accept-package-agreements --accept-source-agreements",
           "macos": null
         }
       }

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/package_groups.py

@@ -225,7 +225,7 @@ PACKAGES_FILE = [
 PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
-    # "mcfly",
+    "mcfly",
     "atuin",
     "starship",
     "gotty",

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/python_scripts/brave.py

@@ -73,7 +73,7 @@ winget install --no-upgrade --name "Brave"                        --Id "Brave.Br
     from machineconfig.utils.code import print_code, run_shell_script
     try:
         print_code(code=program, lexer="shell", desc="Installation Script Preview")
-        run_shell_script(program)
+        run_shell_script(program, display_script=True, clean_env=False)
         console.print("✅ Installation completed successfully!", style="bold green")
     except subprocess.CalledProcessError as e:
         console.print(f"❌ Installation failed with exit code {e.returncode}", style="bold red")

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/python_scripts/code.py

@@ -58,7 +58,7 @@ winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsof
     #     console.print(f"❌ Installation failed with exit code {e.returncode}", style="bold red")
     #     raise
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(install_script,)
+    run_shell_script(install_script, display_script=True, clean_env=False)
 
 
 if __name__ == "__main__":

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/python_scripts/sysabc.py

@@ -56,52 +56,31 @@ echo "🔄 Updating Homebrew..."
 brew update || true
 
 curl -fsSL https://bun.com/install | bash
-
-# Note: git and nano are pre-installed on macOS, but we install via Homebrew to ensure latest versions
-# brew install git || true
-# brew install nano || true
-# brew install curl || true
-# nvm install node || true
-# brew install make
-# brew install ffmpeg
-# brew install openssl
-
-
+# brew install openssl ffmpeg make curl nano git
 echo "✅ Essential tools installation complete."
 """
 
 bash = r"""
+
 sudo apt update -y || true
 sudo apt install nala -y || true
-sudo nala install curl wget gpg lsb-release apt-transport-https -y || true
-sudo nala install git net-tools htop nano -y || true
-sudo nala install build-essential python3-dev -y || true  # C build toolchain: Where build-essential brings gcc, make, etc., and python3-dev ensures headers for your Python version.
-# sudo nala install libssl-dev -y
-# sudo nala install libaa-bin -y
+sudo nala install curl wget gpg lsb-release apt-transport-https \
+  samba fuse3 nfs-common \
+  git net-tools htop nano \
+  build-essential \  # Where it brings gcc, make, etc.,
+  python3-dev \  # ensures headers for your Python version.
+  unzip \
+  pkg-config \  
+  libssl-dev \  # essential for SSL/TLS support in many applications, compiling rust binaries will need them.
+    -y || true
 
-# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
-# source ~/.bashrc || true
-# nvm install node || true
-
-sudo nala install unzip -y  # required by bun installer
 curl -fsSL https://bun.com/install | bash
 . ~/.bashrc || true
-# sudo ln -s $(which bun) /usr/local/bin/node  # trick programs that expect node to use bun runtime.
-sudo ln -s ~/.bun/bin/bun /usr/local/bin/node
-
-
-sudo nala install samba -y || true
-sudo nala install fuse3 -y || true
-sudo nala install nfs-common -y || true
+sudo ln -s ~/.bun/bin/bun /usr/local/bin/node  # trick programs that expect node to use bun runtime.
 
 # echo 'keyboard-configuration keyboard-configuration/layout select US English' | sudo debconf-set-selections
 # echo 'keyboard-configuration keyboard-configuration/layoutcode string us' | sudo debconf-set-selections
-# sudo DEBIAN_FRONTEND=noninteractive nala install -y cmatrix
-# sudo nala install hollywood -y || true
-
-# sudo nala install ffmpeg -y || true  # Required by some dev tools
-# sudo nala install make -y || true  # Required by LunarVim and SpaceVim
-# (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
+# sudo DEBIAN_FRONTEND=noninteractive nala install cmatrix hollywood ffmpeg -y  make || true
 
 """
 
@@ -142,4 +121,4 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
         raise NotImplementedError(error_msg)
     from machineconfig.utils.code import print_code, run_shell_script
     print_code(code=program, lexer="shell", desc="Installation Script Preview")
-    run_shell_script(program)
+    run_shell_script(program, display_script=True, clean_env=False)

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/jobs/installer/python_scripts/yazi.py

@@ -83,21 +83,23 @@ def main(installer_data: InstallerData, version: Optional[str]):
     from machineconfig.utils.installer_utils.installer_cli import install_if_missing
     install_if_missing("glow")
     install_if_missing("duckdb")
+
     if platform.system() == "Linux":
         script = r"""
 sudo nala install poppler-utils -y || true  # For PDF preview, needed by yazi.
 """
         from machineconfig.utils.code import run_shell_script
-        run_shell_script(script)
+        run_shell_script(script, display_script=True, clean_env=False)
     elif platform.system() == "Darwin":
         script = r"""
 brew install --upgrade poppler || true  # For PDF preview, needed by yazi.
 """
         from machineconfig.utils.code import run_shell_script
-        run_shell_script(script)
+        run_shell_script(script, display_script=True, clean_env=False)
     elif platform.system() == "Windows":
-        install_if_missing("git")
-        install_if_missing("7zip")
+        install_if_missing(which="git")
+        install_if_missing(which="7zip")
+        install_if_missing(which="file")
         popler_installer: InstallerData = {
             "appName": "poppler",
             "repoURL": "https://github.com/oschwartz10612/poppler-windows",
@@ -130,7 +132,7 @@ ya pkg add 'wylie102/duckdb'
 
 """
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(script)
+    run_shell_script(script, display_script=True, clean_env=False)
 
 
 if __name__ == "__main__":

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/logger.py

@@ -46,4 +46,4 @@ def get_logger(name: Optional[str] = None) -> logging.Logger:
 
 
 # Convenience alias for simple imports: `from machineconfig.logger import logger`
-logger: logging.Logger = get_logger()
+# logger: logging.Logger = get_logger()

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/profile/create_shell_profile.py

@@ -30,6 +30,20 @@ def get_shell_profile_path() -> Path:
     return profile_path
 
 
+def reload_shell_profile_and_exit() -> None:
+    import platform
+    if platform.system() == "Windows":
+        reload_init_script = "pwsh $PROFILE"
+    elif platform.system() == "Darwin":
+        reload_init_script = "source $HOME/.zshrc"
+    elif platform.system() == "Linux":
+        reload_init_script = "source $HOME/.bashrc"
+    else:
+        reload_init_script = ""
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(reload_init_script)
+
+
 def get_nu_shell_profile_path() -> Path:
     import platform
     from rich.console import Console

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/profile/mapper_data.toml

@@ -4,6 +4,7 @@
 
 [thunderbird]
 windows_files = {path_local = '~/AppData/Roaming/Thunderbird/Profiles', path_cloud = '^', encrypt = true, zip = true, rel2home = true, os = 'windows'}
+windows_ini = {path_local = '~/AppData/Roaming/Thunderbird/profiles.ini', path_cloud = '^', encrypt = false, zip = false, rel2home = true, os = 'windows'}
 linux_files = {path_local = '~/.thunderbird', path_cloud = '^', encrypt = true, zip = true, rel2home = true, os = 'linux'}
 
 
@@ -12,10 +13,24 @@ windows_db = {path_local = '~/AppData/Local/zoxide/db.zo', path_cloud = '^', enc
 linux_db = {path_local = '~/.local/share/zoxide/db.zo', path_cloud = '^', encrypt = false, zip = false, rel2home = true, os = 'linux'}
 
 
+# Atuin shell history tool
+# Docs: https://docs.atuin.sh/cli/configuration/config/#db_path
+# Default db_path: ~/.local/share/atuin/history.db (same on all platforms, uses XDG_DATA_HOME if set)
 [atuin]
 history = {path_local = '~/.local/share/atuin/history.db', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'any'}
 
 
+# McFly shell history search tool
+# Docs: https://github.com/cantino/mcfly#database-location
+# macOS: ~/Library/Application Support/McFly/history.db
+# Linux: ~/.local/share/mcfly/history.db (via $XDG_DATA_DIR)
+# Windows: %LOCALAPPDATA%\McFly\data\history.db
+[mcfly]
+macos_history = {path_local = '~/Library/Application Support/McFly/history.db', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'darwin'}
+linux_history = {path_local = '~/.local/share/mcfly/history.db', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'linux'}
+windows_history = {path_local = '~/AppData/Local/McFly/data/history.db', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'windows'}
+
+
 [shell_history]
 bash_history = {path_local = '~/.bash_history', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'linux'}
 zsh_history = {path_local = '~/.zsh_history', path_cloud = '^', encrypt = true, zip = false, rel2home = true, os = 'darwin'}

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/profile/mapper_dotfiles.toml

@@ -1,7 +1,7 @@
 
 
 # =================== PRIVATE ================================
-# os can be 'windows', 'linux,macos', 'macos' or 'any'
+# os can be 'windows', 'linux,darwin', 'darwin' or 'any'
 
 [git]
 gitconfig = {original = '~/.gitconfig', self_managed = '~/dotfiles/creds/git/.gitconfig', os = 'any'}
@@ -17,14 +17,14 @@ keys = {original = '~/.gnupg', self_managed = '~/dotfiles/creds/.gnupg', content
 creds = {original = '~/.pypirc', self_managed = '~/dotfiles/creds/msc/.pypirc', os = 'any'}
 
 [rclone]
-config_xdg = {original = '~/.config/rclone/rclone.conf', self_managed = '~/dotfiles/creds/rclone/rclone.conf', os = 'linux,macos'}
+config_xdg = {original = '~/.config/rclone/rclone.conf', self_managed = '~/dotfiles/creds/rclone/rclone.conf', os = 'linux,darwin'}
 config_windows = {original = '~/AppData/Roaming/rclone/rclone.conf', self_managed = '~/dotfiles/creds/rclone/rclone.conf', os = 'windows'}
 
 [cloudflare]
 config = {original = '~/.cloudflared', self_managed = '~/dotfiles/creds/cloudflare/.cloudflared', os = 'any'}
 
 [ngrok]
-config_linux = {original = '~/.config/ngrok/ngrok.yml', self_managed = '~/dotfiles/creds/tokens/ngrok.yml', os = 'linux,macos'}
+config_linux = {original = '~/.config/ngrok/ngrok.yml', self_managed = '~/dotfiles/creds/tokens/ngrok.yml', os = 'linux,darwin'}
 config_windows = {original = '~/AppData/Local/ngrok/ngrok.yml', self_managed = '~/dotfiles/creds/tokens/ngrok.yml', os = 'windows'}
 
 [m365]
@@ -37,7 +37,7 @@ config3 = {original = '~/.cli-m365-connection.json',      self_managed = '~/dotf
 data = {original = '~/.var/app/org.remmina.Remmina/data/remmina', self_managed = '~/dotfiles/creds/RDP/remmina/data/remmina', os = 'any'}
 
 [webapp_linux]
-brave = {original = '~/.local/share/applications', self_managed = '~/dotfiles/config/webapps/linux/brave', contents = true, os = 'linux,macos'}
+brave = {original = '~/.local/share/applications', self_managed = '~/dotfiles/config/webapps/linux/brave', contents = true, os = 'linux,darwin'}
 
 # [startup_windows]
 # startup = {original = '~/AppData/Roaming/Microsoft/Windows/Start Menu/Programs/Startup', self_managed = '~/dotfiles/scripts/windows_startup', contents = true}
@@ -90,26 +90,26 @@ config = {original = '~/.procs.toml', self_managed = 'CONFIG_ROOT/settings/procs
 config_again = {original = '~/.config/procs/config.toml', self_managed = 'CONFIG_ROOT/settings/procs/.procs.toml', os = 'any'}
 
 [rofi_linux]
-config = {original = '~/.config/rofi/config.rasi', self_managed = 'CONFIG_ROOT/settings/rofi/config.rasi', os = 'linux,macos'}
+config = {original = '~/.config/rofi/config.rasi', self_managed = 'CONFIG_ROOT/settings/rofi/config.rasi', os = 'linux,darwin'}
 
 [yazi]
 yazi_windows = {original = '~/AppData/Roaming/yazi/config/yazi.toml', self_managed = 'CONFIG_ROOT/settings/yazi/yazi_windows.toml', os = 'windows'}
 keymap_windows = {original = '~/AppData/Roaming/yazi/config/keymap.toml', self_managed = 'CONFIG_ROOT/settings/yazi/keymap_windows.toml', os = 'windows'}
 theme_windows = {original = '~/AppData/Roaming/yazi/config/theme.toml', self_managed = 'CONFIG_ROOT/settings/yazi/theme.toml', os = 'windows'}
 init_windows = {original = '~/AppData/Roaming/yazi/config/init.lua', self_managed = 'CONFIG_ROOT/settings/yazi/init.lua', os = 'windows'}
-yazi_linux = {original = '~/.config/yazi/yazi.toml', self_managed = 'CONFIG_ROOT/settings/yazi/yazi_linux.toml', os = 'linux,macos'}
-keymap_linux = {original = '~/.config/yazi/keymap.toml', self_managed = 'CONFIG_ROOT/settings/yazi/keymap_linux.toml', os = 'linux,macos'}
-theme_linux = {original = '~/.config/yazi/theme.toml', self_managed = 'CONFIG_ROOT/settings/yazi/theme.toml', os = 'linux,macos'}
-init_linux = {original = '~/.config/yazi/init.lua', self_managed = 'CONFIG_ROOT/settings/yazi/init.lua', os = 'linux,macos'}
-yazi_picker_linux = { original = '~/.config/helix/yazi-picker.sh', self_managed = 'CONFIG_ROOT/settings/helix/yazi-picker.sh' , os = 'linux,macos'}
+yazi_linux = {original = '~/.config/yazi/yazi.toml', self_managed = 'CONFIG_ROOT/settings/yazi/yazi_linux.toml', os = 'linux,darwin'}
+keymap_linux = {original = '~/.config/yazi/keymap.toml', self_managed = 'CONFIG_ROOT/settings/yazi/keymap_linux.toml', os = 'linux,darwin'}
+theme_linux = {original = '~/.config/yazi/theme.toml', self_managed = 'CONFIG_ROOT/settings/yazi/theme.toml', os = 'linux,darwin'}
+init_linux = {original = '~/.config/yazi/init.lua', self_managed = 'CONFIG_ROOT/settings/yazi/init.lua', os = 'linux,darwin'}
+yazi_picker_linux = { original = '~/.config/helix/yazi-picker.sh', self_managed = 'CONFIG_ROOT/settings/helix/yazi-picker.sh' , os = 'linux,darwin'}
 
 [television]
-cable_linux = {original = '~/.config/television/cable', self_managed = 'CONFIG_ROOT/settings/television/cable_unix', contents = true, os = 'linux,macos'}
+cable_linux = {original = '~/.config/television/cable', self_managed = 'CONFIG_ROOT/settings/television/cable_unix', contents = true, os = 'linux,darwin'}
 cable_windows = {original = '~/AppData/Local/television/config/cable', self_managed = 'CONFIG_ROOT/settings/television/cable_windows', contents = true, os = 'windows'}
 
 [tv]
-config_linux = {original = '~/.config/television/config.toml', self_managed = 'CONFIG_ROOT/settings/tv/config.toml', os = 'linux,macos'}
-themes_linux = {original = '~/.config/television/themes', self_managed = 'CONFIG_ROOT/settings/tv/themes', contents = true, os = 'linux,macos'}
+config_linux = {original = '~/.config/television/config.toml', self_managed = 'CONFIG_ROOT/settings/tv/config.toml', os = 'linux,darwin'}
+themes_linux = {original = '~/.config/television/themes', self_managed = 'CONFIG_ROOT/settings/tv/themes', contents = true, os = 'linux,darwin'}
 config_windows = {original = '~/AppData/Local/television/config.toml', self_managed = 'CONFIG_ROOT/settings/tv/config.toml', os = 'windows'}
 themes_windows = {original = '~/AppData/Local/television/themes', self_managed = 'CONFIG_ROOT/settings/tv/themes', contents = true, os = 'windows'}
 
@@ -117,21 +117,21 @@ themes_windows = {original = '~/AppData/Local/television/themes', self_managed =
 config_windows = {original = '~/AppData/Local/lf/lfrc', self_managed = 'CONFIG_ROOT/settings/lf/windows/lfrc', os = 'windows'}
 colors_windows = {original = '~/AppData/Local/lf/colors', self_managed = 'CONFIG_ROOT/settings/lf/windows/colors', os = 'windows'}
 icons_windows = {original = '~/AppData/Local/lf/icons', self_managed = 'CONFIG_ROOT/settings/lf/windows/icons', os = 'windows'}
-config_linux = {original = '~/.config/lf/lfrc', self_managed = 'CONFIG_ROOT/settings/lf/linux/lfrc', os = 'linux,macos'}
-colors_linux = {original = '~/.config/lf/colors', self_managed = 'CONFIG_ROOT/settings/lf/linux/colors', os = 'linux,macos'}
-icons_linux = {original = '~/.config/lf/icons', self_managed = 'CONFIG_ROOT/settings/lf/linux/icons', os = 'linux,macos'}
+config_linux = {original = '~/.config/lf/lfrc', self_managed = 'CONFIG_ROOT/settings/lf/linux/lfrc', os = 'linux,darwin'}
+colors_linux = {original = '~/.config/lf/colors', self_managed = 'CONFIG_ROOT/settings/lf/linux/colors', os = 'linux,darwin'}
+icons_linux = {original = '~/.config/lf/icons', self_managed = 'CONFIG_ROOT/settings/lf/linux/icons', os = 'linux,darwin'}
 
 [broot]
 config = {original = '~/.config/broot/conf.toml', self_managed = 'CONFIG_ROOT/settings/broot/conf.toml', os = 'any'}
 
 [pistol_linux]
-config = {original = '~/.config/pistol/pistol.conf', self_managed = 'CONFIG_ROOT/settings/pistol/pistol.conf', os = 'linux,macos'}
+config = {original = '~/.config/pistol/pistol.conf', self_managed = 'CONFIG_ROOT/settings/pistol/pistol.conf', os = 'linux,darwin'}
 
 [glow]
 config = {original = '~/.config/glow/glow.yml', self_managed = 'CONFIG_ROOT/settings/glow/glow.yml', os = 'any'}
 
 [gromit_linux]
-config = {original = '~/.var/app/net.christianbeier.Gromit-MPX/config/gromit-mpx.cfg', self_managed = 'CONFIG_ROOT/settings/gromit-mpx/gromit-mpx.cfg', copy = true, os = 'linux,macos'}
+config = {original = '~/.var/app/net.christianbeier.Gromit-MPX/config/gromit-mpx.cfg', self_managed = 'CONFIG_ROOT/settings/gromit-mpx/gromit-mpx.cfg', copy = true, os = 'linux,darwin'}
 
 
 #[broot_windows]
@@ -171,15 +171,15 @@ config = {original = '~/.config/pudb/pudb.cfg', self_managed = 'CONFIG_ROOT/sett
 [nushell]
 config_windows = {original = '~/AppData/Roaming/nushell/config.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/config.nu', os = 'windows'}
 env_windows = {original = '~/AppData/Roaming/nushell/env.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/env.nu', os = 'windows'}
-config_linux = {original = '~/.config/nushell/config.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/config.nu', os = 'linux,macos'}
-env_linux = {original = '~/.config/nushell/env.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/env.nu', os = 'linux,macos'}
+config_linux = {original = '~/.config/nushell/config.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/config.nu', os = 'linux,darwin'}
+env_linux = {original = '~/.config/nushell/env.nu', self_managed = 'CONFIG_ROOT/settings/shells/nushell/env.nu', os = 'linux,darwin'}
 
 [kitty_linux]
-config = {original = '~/.config/kitty/kitty.conf', self_managed = 'CONFIG_ROOT/settings/shells/kitty/kitty.conf', os = 'linux,macos'}
+config = {original = '~/.config/kitty/kitty.conf', self_managed = 'CONFIG_ROOT/settings/shells/kitty/kitty.conf', os = 'linux,darwin'}
 
 [alacritty]
-config_linux = {original = '~/.config/alacritty/alacritty.toml', self_managed = 'CONFIG_ROOT/settings/shells/alacritty/alacritty.toml', os = 'linux,macos'}
-config_yaml_linux = {original = '~/.config/alacritty/alacritty.yml', self_managed = 'CONFIG_ROOT/settings/shells/alacritty/alacritty.yml', os = 'linux,macos'}
+config_linux = {original = '~/.config/alacritty/alacritty.toml', self_managed = 'CONFIG_ROOT/settings/shells/alacritty/alacritty.toml', os = 'linux,darwin'}
+config_yaml_linux = {original = '~/.config/alacritty/alacritty.yml', self_managed = 'CONFIG_ROOT/settings/shells/alacritty/alacritty.yml', os = 'linux,darwin'}
 config_windows = {original = '~/AppData/Roaming/alacritty/alacritty.toml', self_managed = 'CONFIG_ROOT/settings/shells/alacritty/alacritty.toml', os = 'windows'}
 
 [hyper_terminal]
@@ -207,30 +207,30 @@ config = {original = '~/mprocs.yaml', self_managed = 'CONFIG_ROOT/settings/mproc
 
 
 [zellij_linux]
-config = { original = '~/.config/zellij', self_managed = 'CONFIG_ROOT/settings/zellij' , os = 'linux,macos'}
-#themes = { original = '~/.config/zellij/themes', self_managed = 'CONFIG_ROOT/settings/zellij/themes' }
-#layouts = { original = '~/.config/zellij/layouts', self_managed = 'CONFIG_ROOT/settings/zellij/layouts' }
+config = { original = '~/.config/zellij', self_managed = 'CONFIG_ROOT/settings/zellij', os = 'linux,darwin'}
+themes = { original = '~/.config/zellij/themes', self_managed = 'CONFIG_ROOT/settings/zellij/themes', os = 'linux,darwin' }
+layouts = { original = '~/.config/zellij/layouts', self_managed = 'CONFIG_ROOT/settings/zellij/layouts', os = 'linux,darwin' }
 
 
 # ===================== IDEs ============================
 
 [zed_linux]
-settings = {original = '~/.config/zed/settings.json', self_managed = 'CONFIG_ROOT/settings/zed/settings.json', os = 'linux,macos'}
+settings = {original = '~/.config/zed/settings.json', self_managed = 'CONFIG_ROOT/settings/zed/settings.json', os = 'linux,darwin'}
 
 [helix]
 languages_windows = { original = '~/AppData/Roaming/helix/languages.toml', self_managed = 'CONFIG_ROOT/settings/helix/languages.toml' , os = 'windows'}
 config_windows = { original = '~/AppData/Roaming/helix/config.toml', self_managed = 'CONFIG_ROOT/settings/helix/config.toml' , os = 'windows'}
-languages_linux = { original = '~/.config/helix/languages.toml', self_managed = 'CONFIG_ROOT/settings/helix/languages.toml' , os = 'linux,macos'}
-config_linux = { original = '~/.config/helix/config.toml', self_managed = 'CONFIG_ROOT/settings/helix/config.toml' , os = 'linux,macos'}
+languages_linux = { original = '~/.config/helix/languages.toml', self_managed = 'CONFIG_ROOT/settings/helix/languages.toml' , os = 'linux,darwin'}
+config_linux = { original = '~/.config/helix/config.toml', self_managed = 'CONFIG_ROOT/settings/helix/config.toml' , os = 'linux,darwin'}
 
 [lvim]
 config_windows = { original = '~/AppData/Local/lvim/config.lua', self_managed = 'CONFIG_ROOT/settings/lvim/windows/config.lua' , os = 'windows'}
-config_linux = { original = '~/.config/lvim/config.lua', self_managed = 'CONFIG_ROOT/settings/lvim/linux/config.lua' , os = 'linux,macos'}
+config_linux = { original = '~/.config/lvim/config.lua', self_managed = 'CONFIG_ROOT/settings/lvim/linux/config.lua' , os = 'linux,darwin'}
 
 
 [svim]
 init_windows = { original = '~/.SpaceVim.d/init.toml', self_managed = 'CONFIG_ROOT/settings/svim/windows/init.toml' , os = 'windows'}
-init_linux = { original = '~/.SpaceVim.d/init.toml', self_managed = 'CONFIG_ROOT/settings/svim/linux/init.toml' , os = 'linux,macos'}
+init_linux = { original = '~/.SpaceVim.d/init.toml', self_managed = 'CONFIG_ROOT/settings/svim/linux/init.toml' , os = 'linux,darwin'}
 
 [linters]
 flake8 = {original = '~/.flake8', self_managed = 'CONFIG_ROOT/settings/linters/.flake8', os = 'any'}
@@ -240,14 +240,10 @@ mypy2 = {original = '~/.config/mypy/config', self_managed = 'CONFIG_ROOT/setting
 ruff = {original = '~/.ruff.toml', self_managed = 'CONFIG_ROOT/settings/linters/.ruff.toml', os = 'any'}
 pylint = {original = '~/.pylintrc', self_managed = 'CONFIG_ROOT/settings/linters/.pylintrc', os = 'any'}
 
-# ======================= OS ===============================
-
-[apps_windows]
-notepadpp = {original = '~/AppData/Local/Microsoft/WindowsApps/notepad++.exe', self_managed = 'C:/Program Files/Notepad++/notepad++.exe', os = 'windows'}
-# tesseract = {original = '~/AppData/Local/Microsoft/WindowsApps/tesseract.exe', self_managed = '~/AppData/Local/Tesseract-OCR/tesseract.exe'}  # doesn't work without whole installation dir is on PATH.
 
 [atuin]
-config_linux = {original = '~/.config/atuin/config.toml', self_managed = 'CONFIG_ROOT/settings/atuin/config.toml', os = 'linux,macos'}
-themes_linux = {original = '~/.config/atuin/themes', self_managed = 'CONFIG_ROOT/settings/atuin/themes', contents = true, os = 'linux,macos'}
+config_linux = {original = '~/.config/atuin/config.toml', self_managed = 'CONFIG_ROOT/settings/atuin/config.toml', os = 'linux,darwin'}
+themes_linux = {original = '~/.config/atuin/themes', self_managed = 'CONFIG_ROOT/settings/atuin/themes', contents = true, os = 'linux,darwin'}
 config_windows = {original = '~/AppData/Roaming/atuin/config.toml', self_managed = 'CONFIG_ROOT/settings/atuin/config.toml', os = 'windows'}
 themes_windows = {original = '~/AppData/Roaming/atuin/themes', self_managed = 'CONFIG_ROOT/settings/atuin/themes', contents = true, os = 'windows'}
+

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/scripts/python/devops_navigator.py

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

{machineconfig-8.47/src/machineconfig/scripts/python/helpers → machineconfig-8.57/src/machineconfig/scripts/python}/helper_env/path_manager_tui.py

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

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/scripts/python/helpers/helper_env/env_manager_tui.py

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

{machineconfig-8.47/src/machineconfig/scripts/python → machineconfig-8.57/src/machineconfig/scripts/python/helpers}/helper_env/path_manager_tui.py

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

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/scripts/python/helpers/helpers_cloud/cloud_sync.py

@@ -77,5 +77,5 @@ def main(
     # import subprocess
     # subprocess.run(txt, shell=True, check=True)
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(txt)
+    run_shell_script(txt, display_script=True, clean_env=False)
 

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/scripts/python/helpers/helpers_croshell/croshell_impl.py

@@ -24,12 +24,16 @@ def croshell(
                 user_uv_with_line = f"--with {uv_with},ipython"
             case "python":
                 user_uv_with_line = f"--with {uv_with}"
+            case _:
+                raise ValueError(f"Unknown interpreter: {interpreter}")
     else:
         match interpreter:
             case "ipython":
                 user_uv_with_line = "--with ipython"
             case "python":
                 user_uv_with_line = ""
+            case _:
+                raise ValueError(f"Unknown interpreter: {interpreter}")
 
     if project_path is not None:
         uv_project_line = f'--project {project_path}'
@@ -188,7 +192,7 @@ def _build_fire_line(
         if Path.home().joinpath("code/machineconfig").exists():
             requirements = f"""{user_uv_with_line} {uv_project_line} --with marimo,sqlglot  """
         else:
-            requirements = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "marimo,sqlglot,cowsay,machineconfig[plot]>=8.47" """
+            requirements = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "marimo,sqlglot,cowsay,machineconfig[plot]>=8.57" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run {uv_python_line} --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -198,7 +202,7 @@ uv run {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
         if Path.home().joinpath("code/machineconfig").exists():
             requirements = f"""{user_uv_with_line}  {uv_project_line}  --with jupyterlab """
         else:
-            requirements = f"""{user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.47" """
+            requirements = f"""{user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.57" """
         fire_line = f"uv run {requirements} {uv_project_line}  jupyter-lab {str(nb_target)}"
     elif vscode:
         user_uv_add = f"uv add {uv_with}" if uv_with is not None else ""
@@ -206,7 +210,7 @@ uv run {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 cd {str(pyfile.parent)}
 uv init {uv_python_line}
 uv venv
-uv add "cowsay,machineconfig[plot]>=8.47"
+uv add "cowsay,machineconfig[plot]>=8.57"
 uv add {user_uv_add}
 # code serve-web
 code --new-window {str(pyfile)}
@@ -219,7 +223,7 @@ code --new-window {str(pyfile)}
         if Path.home().joinpath("code/machineconfig").exists():
             ve_line = f"""{user_uv_with_line}  {uv_project_line} """
         else:
-            ve_line = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.47" """
+            ve_line = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.57" """
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     return fire_line

{machineconfig-8.47 → machineconfig-8.57}/src/machineconfig/scripts/python/helpers/helpers_devops/backup_config.py

@@ -1,14 +1,14 @@
 """Backup configuration types, parsing, and reading utilities."""
 
 from collections.abc import Mapping
-from typing import Literal, TypedDict
+from typing import TypedDict
 from pathlib import Path
 from rich.console import Console
 from rich.panel import Panel
 import tomllib
 
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-
+from machineconfig.profile.create_links_export import REPO_LOOSE
 
 LIBRARY_BACKUP_PATH = LIBRARY_ROOT.joinpath("profile/mapper_data.toml")
 USER_BACKUP_PATH = Path.home().joinpath("dotfiles/machineconfig/mapper_data.toml")
@@ -125,7 +125,7 @@ def _parse_backup_config(raw: Mapping[str, object]) -> BackupConfig:
     return config
 
 
-def read_backup_config(repo: Literal["library", "l", "user", "u", "all", "a"]) -> BackupConfig:
+def read_backup_config(repo: REPO_LOOSE) -> BackupConfig:
     match repo:
         case "library" | "l":
             path = LIBRARY_BACKUP_PATH