machineconfig 8.45__py3-none-any.whl → 8.50__py3-none-any.whl

machineconfig/jobs/installer/python_scripts/sysabc.py

@@ -37,7 +37,7 @@ else {
 
 winget install --no-upgrade --name "Powershell"                   --Id "Microsoft.PowerShell"       --source winget --scope user --accept-package-agreements --accept-source-agreements  # powershell require admin
 winget install --no-upgrade --name "Windows Terminal"             --Id "Microsoft.WindowsTerminal"  --source winget --scope user --accept-package-agreements --accept-source-agreements  # Terminal is is installed by default on W 11
-winget isntall --no-upgrade --name "Git"                          --Id "Git.Git"                    --source winget --scope user --accept-package-agreements --accept-source-agreements
+winget install --no-upgrade --name "Git"                          --Id "Git.Git"                    --source winget --scope user --accept-package-agreements --accept-source-agreements
 powershell -c "irm bun.sh/install.ps1|iex"
 
 # --GROUP:gui:Brave+VSCode+Git+WezTerm

machineconfig/jobs/scripts/powershell_scripts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=8.45" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=8.50" 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/profile/create_links_export.py

@@ -11,9 +11,7 @@ ON_CONFLICT_LOOSE: TypeAlias = Literal[
     "backup-default-path", "bd"
     ]
 ON_CONFLICT_STRICT: TypeAlias = Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"]
-SENSITIVITY_LOOSE: TypeAlias = Literal["private", "p", "public", "b", "all", "a"]
-REPO_LOOSE: TypeAlias = Literal["library", "l", "user", "u", "all", "a"]
-ON_CONFLICT_MAPPER: dict[str, ON_CONFLICT_STRICT] = {
+ON_CONFLICT_MAPPER: dict[ON_CONFLICT_LOOSE, ON_CONFLICT_STRICT] = {
     "t": "throw-error",
     "os": "overwrite-self-managed",
     "bs": "backup-self-managed",
@@ -26,10 +24,42 @@ ON_CONFLICT_MAPPER: dict[str, ON_CONFLICT_STRICT] = {
     "backup-default-path": "backup-default-path",
     }
 
+SENSITIVITY_LOOSE: TypeAlias = Literal["private", "p", "public", "b", "all", "a"]
+SENSITIVITY_STRICT: TypeAlias = Literal["private", "public", "all"]
+SENSITIVITY_MAP: dict[SENSITIVITY_LOOSE, SENSITIVITY_STRICT] = {
+    "private": "private",
+    "p": "private",
+    "public": "public",
+    "b": "public",
+    "all": "all",
+    "a": "all",
+}
+
+REPO_STRICT: TypeAlias = Literal["library", "user", "all"]
+REPO_LOOSE: TypeAlias = Literal["library", "l", "user", "u", "all", "a"]
+REPO_MAP: dict[REPO_LOOSE, REPO_STRICT] = {
+    "library": "library",
+    "l": "library",
+    "user": "user",
+    "u": "user",
+    "a": "all",
+    "all": "all",
+}
+
+METHOD_STRICT: TypeAlias = Literal["symlink", "copy"]
+METHOD_LOOSE: TypeAlias = Literal["symlink", "s", "copy", "c"]
+METHOD_MAP: dict[METHOD_LOOSE, METHOD_STRICT] = {
+    "symlink": "symlink",
+    "s": "symlink",
+    "copy": "copy",
+    "c": "copy",
+}
+
+
 
 def main_from_parser(
     sensitivity: Annotated[SENSITIVITY_LOOSE, typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the configuration files to manage.")],
-    method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
+    method: Annotated[METHOD_LOOSE, typer.Option(..., "--method", "-m", help="Method to use for linking files")],
     repo: Annotated[REPO_LOOSE, typer.Option(..., "--repo", "-r", help="Mapper source to use for config files.")] = "library",
     on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
     which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process ('all' for all items) (default is None, selection is interactive)")] = None,
@@ -39,15 +69,7 @@ def main_from_parser(
     TARGET = Config-File-Default-Path
     For public config files in the library repo, the source always exists."""
     from machineconfig.profile.create_links import ConfigMapper, read_mapper
-    repo_map: dict[REPO_LOOSE, Literal["library", "user", "all"]] = {
-        "library": "library",
-        "l": "library",
-        "user": "user",
-        "u": "user",
-        "a": "all",
-        "all": "all",
-    }
-    repo_key = repo_map[repo]
+    repo_key = REPO_MAP[repo]
     mapper_full_obj = read_mapper(repo=repo_key)
     match sensitivity:
         case "private" | "p":
@@ -78,12 +100,6 @@ def main_from_parser(
         from machineconfig.profile.create_helper import copy_assets_to_machine
         copy_assets_to_machine(which="settings")  # config files live here and will be linked to.
 
-    method_map: dict[str, Literal["symlink", "copy"]] = {
-        "s": "symlink",
-        "symlink": "symlink",
-        "c": "copy",
-        "copy": "copy",
-    }
-    method = method_map[method]
+    method = METHOD_MAP[method]
     from machineconfig.profile.create_links import apply_mapper
     apply_mapper(mapper_data=items_objections, on_conflict=ON_CONFLICT_MAPPER[on_conflict], method=method)

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,7 +207,7 @@ 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'}
+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' }
 #layouts = { original = '~/.config/zellij/layouts', self_managed = 'CONFIG_ROOT/settings/zellij/layouts' }
 
@@ -215,22 +215,22 @@ config = { original = '~/.config/zellij', self_managed = 'CONFIG_ROOT/settings/z
 # ===================== 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'}
@@ -247,7 +247,7 @@ notepadpp = {original = '~/AppData/Local/Microsoft/WindowsApps/notepad++.exe', s
 # 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/scripts/python/devops_navigator.py

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

machineconfig/scripts/python/helper_env/path_manager_tui.py

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

machineconfig/scripts/python/helpers/helper_env/env_manager_tui.py

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

machineconfig/scripts/python/helpers/helper_env/path_manager_tui.py

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

machineconfig/scripts/python/helpers/helpers_croshell/croshell_impl.py

@@ -188,7 +188,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.45" """
+            requirements = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "marimo,sqlglot,cowsay,machineconfig[plot]>=8.50" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run {uv_python_line} --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -198,7 +198,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.45" """
+            requirements = f"""{user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.50" """
         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 +206,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.45"
+uv add "cowsay,machineconfig[plot]>=8.50"
 uv add {user_uv_add}
 # code serve-web
 code --new-window {str(pyfile)}
@@ -219,7 +219,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.45" """
+            ve_line = f"""{uv_python_line} {user_uv_with_line} {uv_project_line} --with "cowsay,machineconfig[plot]>=8.50" """
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     return fire_line

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

machineconfig/scripts/python/helpers/helpers_devops/cli_backup_retrieve.py

@@ -11,13 +11,13 @@ from rich.panel import Panel
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 from machineconfig.utils.code import print_code
-from machineconfig.utils.options import choose_cloud_interactively, choose_from_options
+from machineconfig.utils.options import choose_cloud_interactively
 from machineconfig.scripts.python.helpers.helpers_cloud.helpers2 import ES
 from machineconfig.scripts.python.helpers.helpers_devops.backup_config import (
     BackupConfig, BackupGroup, VALID_OS, USER_BACKUP_PATH, DEFAULT_BACKUP_HEADER,
     normalize_os_name, os_applies, read_backup_config,
 )
-
+from machineconfig.profile.create_links_export import REPO_LOOSE
 
 DIRECTION = Literal["BACKUP", "RETRIEVE"]
 
@@ -146,7 +146,7 @@ def register_backup_entry(
     return USER_BACKUP_PATH, entry_name, replaced
 
 
-def main_backup_retrieve(direction: DIRECTION, which: Optional[str], cloud: Optional[str], repo: Literal["library", "l", "user", "u", "all", "a"]) -> None:
+def main_backup_retrieve(direction: DIRECTION, which: Optional[str], cloud: Optional[str], repo: REPO_LOOSE) -> None:
     console = Console()
     if cloud is None or not cloud.strip():
         try:

machineconfig/scripts/python/helpers/helpers_devops/cli_config_dotfile.py

@@ -2,11 +2,16 @@
 """Like yadm and dotter."""
 
 from git import Optional
-from machineconfig.profile.create_links_export import ON_CONFLICT_LOOSE, ON_CONFLICT_MAPPER
+from machineconfig.profile.create_links_export import ON_CONFLICT_LOOSE, ON_CONFLICT_MAPPER, METHOD_LOOSE, METHOD_MAP
 from typing import Annotated, Literal
 from pathlib import Path
 import typer
 
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
+BACKUP_ROOT_PRIVATE = Path.home().joinpath("dotfiles/machineconfig/mapper/files")
+BACKUP_ROOT_PUBLIC = Path(CONFIG_ROOT).joinpath("dotfiles/mapper")
+
+
 
 def _write_to_user_mapper(section: str, entry_name: str, original_path: Path, self_managed_path: Path, method: Literal["symlink", "copy"], is_contents: bool, os_filter: str) -> Path:
     from machineconfig.profile.create_links import USER_MAPPER_PATH
@@ -51,9 +56,9 @@ def _write_to_user_mapper(section: str, entry_name: str, original_path: Path, se
     mapper_path.write_text(content, encoding="utf-8")
     return mapper_path
 
-def record_mapping(orig_path: Path, new_path: Path, method: Literal["symlink", "s", "copy", "c"], section: str, os_filter: str) -> None:
+def record_mapping(orig_path: Path, new_path: Path, method: METHOD_LOOSE, section: str, os_filter: str) -> None:
     entry_name = orig_path.stem.replace(".", "_").replace("-", "_")
-    method_resolved: Literal["symlink", "copy"] = "symlink" if method in ("symlink", "s") else "copy"
+    method_resolved = METHOD_MAP[method]
     mapper_file = _write_to_user_mapper(section=section, entry_name=entry_name, original_path=orig_path, self_managed_path=new_path, method=method_resolved, is_contents=False, os_filter=os_filter)
     home = Path.home()
     orig_display = f"~/{orig_path.relative_to(home)}" if orig_path.is_relative_to(home) else orig_path.as_posix()
@@ -64,17 +69,12 @@ def record_mapping(orig_path: Path, new_path: Path, method: Literal["symlink", "
     console.print(Panel(f"📝 Mapping recorded in: [cyan]{mapper_file}[/cyan]\n[{section}]\n{entry_name} = {{ original = '{orig_display}', self_managed = '{new_display}', os = '{os_filter}' }}", title="Mapper Entry Saved", border_style="cyan", padding=(1, 2),))
 
 
-backup_root_private = Path.home().joinpath("dotfiles/machineconfig/mapper/files")
-from machineconfig.utils.source_of_truth import CONFIG_ROOT
-backup_root_public = Path(CONFIG_ROOT).joinpath("dotfiles/mapper")
-
-
 def get_backup_path(orig_path: Path, sensitivity: Literal["private", "v", "public", "b"], destination: Optional[str], shared: bool) -> Path:
     match sensitivity:
         case "private" | "v":
-            backup_root = backup_root_private
+            backup_root = BACKUP_ROOT_PRIVATE
         case "public" | "b":
-            backup_root = backup_root_public
+            backup_root = BACKUP_ROOT_PUBLIC
     if destination is None:
         if shared:
             new_path = backup_root.joinpath("shared").joinpath(orig_path.name)
@@ -93,9 +93,9 @@ def get_backup_path(orig_path: Path, sensitivity: Literal["private", "v", "publi
 def get_original_path_from_backup_path(backup_path: Path, sensitivity: Literal["private", "v", "public", "b"], destination: Optional[str], shared: bool) -> Path:
     match sensitivity:
         case "private" | "v":
-            backup_root = backup_root_private
+            backup_root = BACKUP_ROOT_PRIVATE
         case "public" | "b":
-            backup_root = backup_root_public
+            backup_root = BACKUP_ROOT_PUBLIC
     if destination is None:
         if shared:
             relative_part = backup_path.relative_to(backup_root.joinpath("shared"))
@@ -114,7 +114,7 @@ def get_original_path_from_backup_path(backup_path: Path, sensitivity: Literal["
 
 def register_dotfile(
     file: Annotated[str, typer.Argument(help="file/folder path.")],
-    method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
+    method: Annotated[METHOD_LOOSE, typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
     on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
     sensitivity: Annotated[Literal["private", "v", "public", "b"], typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the config file.")] = "private",
     destination: Annotated[Optional[str], typer.Option("--destination", "-d", help="destination folder (override the default, use at your own risk)")] = None,

machineconfig/scripts/python/helpers/helpers_devops/cli_repos.py

@@ -63,16 +63,16 @@ def clone(directory: Annotated[str, typer.Argument(help="📁 Directory containi
             ) -> None:
     """📥 Clone repositories described by a repos.json specification."""
     if interactive:
-        from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import backup_root_private, backup_root_public, get_original_path_from_backup_path
-        results_public = list(backup_root_public.rglob("repos.json"))
-        results_private = list(backup_root_private.rglob("repos.json"))
+        from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import BACKUP_ROOT_PRIVATE, BACKUP_ROOT_PUBLIC, get_original_path_from_backup_path
+        results_public = list(BACKUP_ROOT_PUBLIC.rglob("repos.json"))
+        results_private = list(BACKUP_ROOT_PRIVATE.rglob("repos.json"))
         if len(results_public) + len(results_private) == 0:
             print("❌ No repos.json specifications found in backup directories.")
             return
         from machineconfig.utils.options import choose_from_options
         chosen_files = choose_from_options(options=[str(p) for p in results_public + results_private], msg="Select a repos.json specification to clone from:", multi=True, tv=True)
         for file in chosen_files:
-            if str(file).startswith(str(backup_root_private)):
+            if str(file).startswith(str(BACKUP_ROOT_PRIVATE)):
                 original_path = get_original_path_from_backup_path(Path(file), sensitivity="private", destination=None, shared=False)
             else:
                 original_path = get_original_path_from_backup_path(Path(file), sensitivity="public", destination=None, shared=False)
@@ -121,27 +121,36 @@ def checkout_to_branch_command(directory: Annotated[Optional[str], typer.Argumen
 
 
 def count_lines_in_repo(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
-    def func(repo_path: str):
-        from machineconfig.scripts.python.helpers.helpers_repos import repo_analyzer_1
+    # def func(repo_path: str):
+        # from machineconfig.scripts.python.helpers.helpers_repos import repo_analyzer_1
+        # repo_analyzer_1.count_historical_line_edits(repo_path=repo_path)
+    # from machineconfig.utils.code import run_lambda_function
+    # run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig>=8.50"])
+    from machineconfig.scripts.python.helpers.helpers_repos import repo_analyzer_1
+    try:
         repo_analyzer_1.count_historical_line_edits(repo_path=repo_path)
-    from machineconfig.utils.code import run_lambda_function
-    run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig>=8.45"])
+    except Exception as e:
+        typer.echo(f"❌ Error counting lines in repo {repo_path}: {e}")
 
 
 def print_python_files_by_size(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
-    def func(repo_path: str):
-        from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import print_python_files_by_size_impl
-        print_python_files_by_size_impl(repo_path=repo_path)
-    from machineconfig.utils.code import run_lambda_function
-    run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig[plot]>=8.45"])
+    # def func(repo_path: str):
+    #     from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import print_python_files_by_size_impl
+    #     print_python_files_by_size_impl(repo_path=repo_path)
+    # from machineconfig.utils.code import run_lambda_function
+    # run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig[plot]>=8.50"])
+    from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import print_python_files_by_size_impl
+    print_python_files_by_size_impl(repo_path=repo_path)
 
 
 def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
-    def func(repo_path: str):
-        from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import analyze_over_time
-        analyze_over_time(repo_path=repo_path)
-    from machineconfig.utils.code import run_lambda_function
-    run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig[plot]>=8.45"])
+    # def func(repo_path: str):
+    #     from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import analyze_over_time
+    #     analyze_over_time(repo_path=repo_path)
+    # from machineconfig.utils.code import run_lambda_function
+    # run_lambda_function(lambda: func(repo_path=repo_path), uv_project_dir=None, uv_with=["machineconfig[plot]>=8.50"])
+    from machineconfig.scripts.python.helpers.helpers_repos.repo_analyzer_2 import analyze_over_time
+    analyze_over_time(repo_path=repo_path)
 
 
 def gource_viz(

machineconfig/scripts/python/helpers/helpers_devops/cli_self.py

@@ -1,6 +1,7 @@
 
 import typer
 from typing import Annotated, Literal
+from machineconfig.utils.ssh_utils.abc import MACHINECONFIG_VERSION
 
 
 def copy_both_assets():
@@ -129,7 +130,7 @@ cd {str(mcfg_path)}
 """)
     else:
         exit_then_run_shell_script(rf"""
-{uv_command} tool install --upgrade "machineconfig>=8.45"
+{uv_command} tool install --upgrade "{MACHINECONFIG_VERSION}"
 {uv_command2}
 """)
 
@@ -153,7 +154,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import exit_then_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>=8.45,textual" """
+    else: executable = f"""--with "{MACHINECONFIG_VERSION},textual" """
     exit_then_run_shell_script(f"""uv run {executable} {path}""")
 
 def readme():

machineconfig/scripts/python/helpers/helpers_repos/cloud_repo_sync.py

@@ -2,6 +2,7 @@
 
 from typing import Optional, Literal, Annotated
 import typer
+from machineconfig.utils.ssh_utils.abc import MACHINECONFIG_VERSION
 
 
 def get_tmp_file():
@@ -165,7 +166,7 @@ exit $LASTEXITCODE
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=8.45"]
+        uv_with = [MACHINECONFIG_VERSION]
         uv_project_dir = None
 
     shell_path = get_tmp_file()

machineconfig/scripts/python/helpers/helpers_sessions/sessions_impl.py

@@ -40,7 +40,16 @@ def select_layout(layouts_json_file: str, selected_layouts_names: Optional[list[
         json_str = json_str.replace("""Command": "f """, """Command": "~/.config/machineconfig/scripts/wrap_mcfg fire """)
         json_str = json_str.replace("""Command": "s """, """Command": "~/.config/machineconfig/scripts/wrap_mcfg sessions """)
 
-    layout_file: LayoutsFile = json.loads(json_str)
+    try:
+        # src/machineconfig/utils/io.py
+        layout_file: LayoutsFile = json.loads(json_str)
+    except Exception:
+        print(f"Failed to parse the json file {layouts_json_file}, trying to clean the comments and giving it another shot ... ")
+        from machineconfig.utils.io import remove_c_style_comments
+        json_str = remove_c_style_comments(json_str)
+        # print(json_str)
+        layout_file: LayoutsFile = json.loads(json_str)
+
     if len(layout_file["layouts"]) == 0:
         raise ValueError(f"No layouts found in {layouts_json_file}")
     if selected_layouts_names is None: