machineconfig 1.97__py3-none-any.whl → 2.1__py3-none-any.whl

machineconfig/jobs/python_windows_installers/dev/config.json

@@ -1,3 +1,3 @@
 {
-    
+
 }

machineconfig/jobs/windows/archive/archive_pygraphviz.ps1

@@ -5,7 +5,7 @@
 # winget install Microsoft.VC++2015-2022Redist-x86
 
 
-~/scritps/activate_ve.ps1
+. "$env:USERPROFILE\code\machineconfig\.venv\Scripts\Activate.ps1"
 Set-Location C:
 python -m pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
 # not including the options as above (from https://pygraphviz.github.io/documentation/stable/install.html)

machineconfig/jobs/windows/start_terminal.ps1

@@ -1,5 +1,5 @@
 
- wt  --profile croshell -d . --title "MyTerminal" --tabColor "red"`; split-pane --vertical --size 0.55 pwsh machineconfig-workingdirectory ~/code/crocodile -Command "pwd" `; split-pane -V PowerShell -NoExit -Command  "cd code/machineconfig" `; split-pane -H wsl.exe cmatrix`; split-pane -V wsl.exe sl
+ wt  --profile croshell -d . --title "MyTerminal" --tabColor "red"`; split-pane --vertical --size 0.55 pwsh machineconfig-workingdirectory ~/code/machineconfig -Command "pwd" `; split-pane -V PowerShell -NoExit -Command  "cd code/machineconfig" `; split-pane -H wsl.exe cmatrix`; split-pane -V wsl.exe sl
 # wt -p "Command Prompt" `; split-pane -p "Windows PowerShell" `; split-pane -H wsl.exe
 
 # See more settings here: https://docs.microsoft.com/en-us/windows/terminal/

machineconfig/logger.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+import logging
+import os
+import sys
+from typing import Optional
+
+
+def _configure_root_logger() -> logging.Logger:
+    """Create and configure the root logger for the machineconfig package.
+
+    The logger writes to stdout, honors MC_LOG_LEVEL env var, and avoids
+    duplicate handlers on repeated imports.
+    """
+    root = logging.getLogger("machineconfig")
+    if root.handlers:
+        return root
+
+    level_name = os.getenv("MC_LOG_LEVEL", "INFO").upper()
+    level = getattr(logging, level_name, logging.INFO)
+    root.setLevel(level)
+
+    handler = logging.StreamHandler(stream=sys.stdout)
+    fmt = "%(asctime)s | %(levelname)s | %(name)s | %(message)s"
+    datefmt = "%H:%M:%S"
+    handler.setFormatter(logging.Formatter(fmt=fmt, datefmt=datefmt))
+    root.addHandler(handler)
+    root.propagate = False
+    return root
+
+
+_ROOT_LOGGER = _configure_root_logger()
+
+
+def get_logger(name: Optional[str] = None) -> logging.Logger:
+    """Return a child logger of the package root.
+
+    Inputs:
+    - name: Optional dotted logger name; when None, returns the package root.
+
+    Returns:
+    - logging.Logger configured under the 'machineconfig' hierarchy.
+    """
+    if name is None:
+        return _ROOT_LOGGER
+    return _ROOT_LOGGER.getChild(name)
+
+
+# Convenience alias for simple imports: `from machineconfig.logger import logger`
+logger: logging.Logger = get_logger()

machineconfig/profile/create.py

@@ -4,13 +4,15 @@ This script Takes away all config files from the computer, place them in one dir
 
 """
 
-
-from crocodile.meta import Terminal
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.utils import symlink_func, symlink_copy, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.utils.utils2 import read_toml
 from machineconfig.profile.shell import create_default_shell_profile
+
 # import os
 import platform
+import os
+import ctypes
 import subprocess
 from rich.console import Console
 from typing import Optional, Any, TypedDict
@@ -29,10 +31,7 @@ class SymlinkMapper(TypedDict):
 
 
 def main_symlinks(choice: Optional[str] = None):
-    symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
-    # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
-    # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
-
+    symlink_mapper: dict[str, dict[str, SymlinkMapper]] = read_toml(LIBRARY_ROOT.joinpath("profile/mapper.toml"))
     overwrite = True
     exclude: list[str] = []  # "wsl_linux", "wsl_windows"
 
@@ -41,56 +40,71 @@ def main_symlinks(choice: Optional[str] = None):
     for program_key in program_keys_raw:
         if program_key in exclude or OTHER_SYSTEM in program_key:
             continue
-        else: program_keys.append(program_key)
+        else:
+            program_keys.append(program_key)
 
     program_keys.sort()
     if choice is None:
         choice_selected = display_options(msg="Which symlink to create?", options=program_keys + ["all", "none(EXIT)"], default="none(EXIT)", fzf=True, multi=True)
         assert isinstance(choice_selected, list)
-        if len(choice_selected) == 1 and choice_selected[0] == "none(EXIT)": return  # terminate function.
-        elif len(choice_selected) == 1 and choice_selected[0] == "all": choice_selected = "all"  # i.e. program_keys = program_keys
+        if len(choice_selected) == 1 and choice_selected[0] == "none(EXIT)":
+            return  # terminate function.
+        elif len(choice_selected) == 1 and choice_selected[0] == "all":
+            choice_selected = "all"  # i.e. program_keys = program_keys
         # overwrite = display_options(msg="Overwrite existing source file?", options=["yes", "no"], default="yes") == "yes"
         from rich.prompt import Confirm
+
         overwrite = Confirm.ask("Overwrite existing source file?", default=True)
-    else: choice_selected = choice
+    else:
+        choice_selected = choice
 
     if isinstance(choice_selected, str):
-        if str(choice_selected) == "all" and system == "Windows" and not Terminal.is_user_admin():
-            print(f"""
-{'*' * 80}
+        if str(choice_selected) == "all" and system == "Windows":
+            if os.name == "nt":
+                try:
+                    is_admin = ctypes.windll.shell32.IsUserAnAdmin()
+                except Exception:
+                    is_admin = False
+            else:
+                is_admin = False
+            if not is_admin:
+                print(f"""
+{"*" * 80}
 ⚠️  WARNING: Administrator privileges required
-{'*' * 80}
+{"*" * 80}
 """)
-            raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
+                raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
         elif choice_selected == "all":
             print(f"""
-🔍 Processing all program keys: 
+🔍 Processing all program keys:
 {program_keys}
 """)
             pass  # i.e. program_keys = program_keys
-        else: program_keys = [choice_selected]
-    else: program_keys = choice_selected
+        else:
+            program_keys = [choice_selected]
+    else:
+        program_keys = choice_selected
 
     for program_key in program_keys:
         print(f"\n🔄 Processing {program_key} symlinks...")
         for file_key, file_map in symlink_mapper[program_key].items():
-            this = PathExtended(file_map['this'])
-            to_this = PathExtended(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            this = PathExtended(file_map["this"])
+            to_this = PathExtended(file_map["to_this"].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             if "contents" in file_map:
                 try:
                     for a_target in to_this.expanduser().search("*"):
                         symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
             if "copy" in file_map:
                 try:
                     symlink_copy(this=this, to_this=to_this, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | {ex}")
             else:
-                try: 
+                try:
                     symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
@@ -106,22 +120,22 @@ def main_symlinks(choice: Optional[str] = None):
 
     if system == "Linux":
         print("\n📜 Setting executable permissions for scripts...")
-        Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+        subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
         print("✅ Script permissions updated")
-        
+
     if len(ERROR_LIST) > 0:
         print(f"""
-{'*' * 80}
+{"*" * 80}
 ❗ ERRORS ENCOUNTERED DURING PROCESSING
-{'*' * 80}
+{"*" * 80}
 {ERROR_LIST}
-{'*' * 80}
+{"*" * 80}
 """)
     else:
         print(f"""
-{'*' * 80}
+{"*" * 80}
 ✅ All symlinks created successfully!
-{'*' * 80}
+{"*" * 80}
 """)
 
 
@@ -134,13 +148,13 @@ def main(choice: Optional[str] = None):
     print("\n")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-    
+
     print(f"""
-{'=' * 80}
+{"=" * 80}
 ✨ Configuration setup complete! ✨
-{'=' * 80}
+{"=" * 80}
 """)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/profile/create_hardlinks.py

@@ -4,12 +4,12 @@ This script Takes away all config files from the computer, place them in one dir
 
 """
 
-
 import platform
-from crocodile.meta import Terminal
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.utils import symlink_copy as symlink_func, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.utils.utils2 import read_toml
 from machineconfig.profile.shell import create_default_shell_profile
+
 # import os
 import subprocess
 from rich.console import Console
@@ -23,7 +23,7 @@ SYSTEM = system.lower()
 
 
 def main_symlinks(choice: Optional[str] = None):
-    symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
+    symlink_mapper = read_toml(LIBRARY_ROOT.joinpath("profile/mapper.toml"))
     # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
     # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
 
@@ -36,46 +36,53 @@ def main_symlinks(choice: Optional[str] = None):
         if program_key in exclude or OTHER_SYSTEM in program_key:
             # print(f"🚫 Skipping {program_key} for {system}")
             continue
-        else: program_keys.append(program_key)
+        else:
+            program_keys.append(program_key)
 
     program_keys.sort()
     if choice is None:
         choice_selected = display_options(msg="Which symlink to create?", options=program_keys + ["all", "none(EXIT)"], default="none(EXIT)", fzf=True, multi=True)
         assert isinstance(choice_selected, list)
-        if len(choice_selected) == 1 and choice_selected[0] == "none(EXIT)": return  # terminate function.
-        elif len(choice_selected) == 1 and choice_selected[0] == "all": choice_selected = "all"  # i.e. program_keys = program_keys
+        if len(choice_selected) == 1 and choice_selected[0] == "none(EXIT)":
+            return  # terminate function.
+        elif len(choice_selected) == 1 and choice_selected[0] == "all":
+            choice_selected = "all"  # i.e. program_keys = program_keys
         # overwrite = display_options(msg="Overwrite existing source file?", options=["yes", "no"], default="yes") == "yes"
         from rich.prompt import Confirm
+
         overwrite = Confirm.ask("Overwrite existing source file?", default=True)
 
-    else: choice_selected = choice
+    else:
+        choice_selected = choice
 
     if isinstance(choice_selected, str):
         if choice_selected == "all":
             print(f"""
-🔍 Processing all program keys: 
+🔍 Processing all program keys:
 {program_keys}
 """)
             pass  # i.e. program_keys = program_keys
-        else: program_keys = [choice_selected]
-    else: program_keys = choice_selected
+        else:
+            program_keys = [choice_selected]
+    else:
+        program_keys = choice_selected
 
     for program_key in program_keys:
         print(f"\n🔄 Creating hardlinks for {program_key}...")
         for file_key, file_map in symlink_mapper[program_key].items():
-            this = PathExtended(file_map['this'])
-            to_this = PathExtended(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            this = PathExtended(file_map["this"])
+            to_this = PathExtended(file_map["to_this"].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             if "contents" in file_map:
                 try:
                     for a_target in to_this.expanduser().search("*"):
                         symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
             else:
-                try: 
+                try:
                     symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
                     print(f"  ✅ Created hardlink from {this} to {to_this}")
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
@@ -91,22 +98,22 @@ def main_symlinks(choice: Optional[str] = None):
 
     if system == "Linux":
         print("\n📜 Setting executable permissions for scripts...")
-        Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+        subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
         print("✅ Script permissions updated")
 
     if len(ERROR_LIST) > 0:
         print(f"""
-{'=' * 80}
+{"=" * 80}
 ❗ ERRORS ENCOUNTERED DURING PROCESSING
-{'=' * 80}
+{"=" * 80}
 {ERROR_LIST}
-{'=' * 80}
+{"=" * 80}
 """)
     else:
         print(f"""
-{'=' * 80}
+{"=" * 80}
 ✅ All hardlinks created successfully!
-{'=' * 80}
+{"=" * 80}
 """)
 
 
@@ -119,13 +126,13 @@ def main(choice: Optional[str] = None):
     print("\n")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-    
+
     print(f"""
-{'=' * 80}
+{"=" * 80}
 ✨ Configuration setup complete! ✨
-{'=' * 80}
+{"=" * 80}
 """)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/profile/shell.py

@@ -1,9 +1,8 @@
-"""shell
-"""
+"""shell"""
 
 from machineconfig.utils.utils2 import randstr
-from machineconfig.utils.path_reduced import P as PathExtended, modify_text
-from crocodile.meta import Terminal
+from machineconfig.utils.path_reduced import PathExtended as PathExtended, modify_text
+from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.utils import LIBRARY_ROOT, REPO_ROOT, display_options
 import platform
 import os
@@ -24,13 +23,15 @@ BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 # for windows it won't change the profile, if the profile was modified already e.g. due to syncing
 
 
-def create_default_shell_profile():
+def create_default_shell_profile() -> None:
     profile_path = get_shell_profile_path()
-    profile = profile_path.read_text()
-    if system == "Windows": source = f". {str(LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser()).replace('~', '$HOME')}"
-    else: source = f"source {str(LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser()).replace('~', '$HOME')}"
+    profile = profile_path.read_text(encoding="utf-8")
+    if system == "Windows":
+        source = f""". {str(LIBRARY_ROOT.joinpath("settings/shells/pwsh/init.ps1").collapseuser()).replace("~", "$HOME")}"""
+    else:
+        source = f"""source {str(LIBRARY_ROOT.joinpath("settings/shells/bash/init.sh").collapseuser()).replace("~", "$HOME")}"""
 
-    if source in profile: 
+    if source in profile:
         console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
     else:
         console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
@@ -38,28 +39,31 @@ def create_default_shell_profile():
         if system == "Linux":
             res = Terminal().run("cat /proc/version").op
             if "microsoft" in res.lower() or "wsl" in res.lower():
-                profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
+                profile += "\ncd ~"
                 console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
         profile_path.parent.mkdir(parents=True, exist_ok=True)
-        profile_path.write_text(profile)
+        profile_path.write_text(profile, encoding="utf-8")
         console.print(Panel("✅ Profile updated successfully", title="[bold blue]Profile[/bold blue]", border_style="blue"))
 
 
-def get_shell_profile_path():
+def get_shell_profile_path() -> PathExtended:
     if system == "Windows":
         obj = Terminal().run("$PROFILE", shell="pwsh")
         res = obj.op2path()
-        if isinstance(res, PathExtended): profile_path = res
+        if isinstance(res, PathExtended):
+            profile_path = res
         else:
             obj.print(capture=False)
-            raise ValueError(f"Could not get profile path for Windows. Got {res}")
-    elif system == "Linux": profile_path = PathExtended("~/.bashrc").expanduser()
-    else: raise ValueError(f"Not implemented for this system {system}")
-    console.print(Panel(f"🐚 SHELL PROFILE | Working with path: `{profile_path}`", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
+            raise ValueError(f"""Could not get profile path for Windows. Got {res}""")
+    elif system == "Linux":
+        profile_path = PathExtended("~/.bashrc").expanduser()
+    else:
+        raise ValueError(f"""Not implemented for this system {system}""")
+    console.print(Panel(f"""🐚 SHELL PROFILE | Working with path: `{profile_path}`""", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
     return profile_path
 
 
-def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'replace'] = "append"):
+def append_temporarily(dirs: list[str], kind: Literal["append", "prefix", "replace"]) -> str:
     dirs_ = []
     for path in dirs:
         path_rel = PathExtended(path).collapseuser(strict=False)
@@ -68,22 +72,33 @@ def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'repla
         else:
             dirs_.append(path_rel.as_posix() if system == "Linux" else str(path_rel))
     dirs = dirs_
-    if len(dirs) == 0: return ""
+    if len(dirs) == 0:
+        return ""
 
     if system == "Windows":
         """Source: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_environment_variables?view=powershell-7.2"""
-        if kind == "append": command = fr'$env:Path += ";{sep.join(dirs)}"'  # Append to the Path variable in the current window:
-        elif kind == "prefix": command = fr'$env:Path = "{sep.join(dirs)};" + $env:Path'  # Prefix the Path variable in the current window:
-        elif kind == "replace": command = fr'$env:Path = "{sep.join(dirs)}"'  # Replace the Path variable in the current window (use with caution!):
-        else: raise KeyError
+        if kind == "append":
+            command = rf'$env:Path += ";{sep.join(dirs)}"'  # Append to the Path variable in the current window:
+        elif kind == "prefix":
+            command = rf'$env:Path = "{sep.join(dirs)};" + $env:Path'  # Prefix the Path variable in the current window:
+        elif kind == "replace":
+            command = rf'$env:Path = "{sep.join(dirs)}"'  # Replace the Path variable in the current window (use with caution!):
+        else:
+            raise KeyError
         return command  # if run is False else tm.run(command, shell="powershell")
-    elif system in ["Linux", "Darwin"]: result = f'export PATH="{sep.join(dirs)}:$PATH"'
-    else: raise ValueError
+    elif system in ["Linux", "Darwin"]:
+        result = f'export PATH="{sep.join(dirs)}:$PATH"'
+    else:
+        raise ValueError
     return result
 
-def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = None):
-    env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
-    dirs = env_path[f'path_{system.lower()}']['extension']
+
+def main_env_path(choice: Optional[str], profile_path: Optional[str]) -> None:
+    from machineconfig.utils.utils2 import read_toml
+
+    env_path = read_toml(LIBRARY_ROOT.joinpath("profile/env_path.toml"))
+    # env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
+    dirs = env_path[f"path_{system.lower()}"]["extension"]
 
     console.print(Panel("🔍 ENVIRONMENT | Current PATH variables:", title="[bold blue]Environment[/bold blue]", border_style="blue"))
 
@@ -91,85 +106,97 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
         tmp = display_options(msg="Which directory to add?", options=dirs + ["all", "none(EXIT)"], default="none(EXIT)")
         assert isinstance(tmp, str), f"Choice must be a string or a list of strings, not {type(choice)}"
         choice = tmp
-        if str(choice) != "all": dirs = [choice]
-    if choice == "none(EXIT)": return
+        if str(choice) != "all":
+            dirs = [choice]
+    if choice == "none(EXIT)":
+        return
 
     console.print(f"\n📌 Adding directories to PATH: {dirs}")
-    addition = append_temporarily(dirs=dirs)
+    addition = append_temporarily(dirs=dirs, kind="append")
     profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
     profile_path_obj.copy(name=profile_path_obj.name + ".orig_" + randstr())
     console.print(f"💾 Created backup of profile: {profile_path_obj.name}.orig_*")
     # Inline deprecated P.modify_text: if file missing, seed with search text before modification
-    current = profile_path_obj.read_text() if profile_path_obj.exists() else addition
+    current = profile_path_obj.read_text(encoding="utf-8") if profile_path_obj.exists() else addition
     updated = modify_text(current, addition, addition, replace_line=False, notfound_append=True)
-    profile_path_obj.write_text(updated)
+    profile_path_obj.write_text(updated, encoding="utf-8")
     console.print(Panel("✅ PATH variables added to profile successfully", title="[bold blue]Environment[/bold blue]", border_style="blue"))
 
 
-def main_add_sources_to_shell_profile(profile_path: Optional[str] = None, choice: Optional[str] = None):
-    sources: list[str] = LIBRARY_ROOT.joinpath("profile/sources.toml").readit()[system.lower()]['files']
+def main_add_sources_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
+    # sources: list[str] = LIBRARY_ROOT.joinpath("profile/sources.toml").readit()[system.lower()]['files']
+    from machineconfig.utils.utils2 import read_toml
+
+    sources: list[str] = read_toml(LIBRARY_ROOT.joinpath("profile/sources.toml"))[system.lower()]["files"]
 
     console.print(Panel("🔄 Adding sources to shell profile", title="[bold blue]Sources[/bold blue]", border_style="blue"))
 
     if choice is None:
         choice_obj = display_options(msg="Which patch to add?", options=sources + ["all", "none(EXIT)"], default="none(EXIT)", multi=True)
         if isinstance(choice_obj, str):
-            if choice_obj == "all": choice = choice_obj
-            elif choice_obj == "none(EXIT)": return
-            else: sources = [choice_obj]
+            if choice_obj == "all":
+                choice = choice_obj
+            elif choice_obj == "none(EXIT)":
+                return
+            else:
+                sources = [choice_obj]
         else:  # isinstance(choice_obj, list):
             sources = choice_obj
-    elif choice == "none(EXIT)": return
+    elif choice == "none(EXIT)":
+        return
 
     if isinstance(profile_path, str):
         profile_path_obj = PathExtended(profile_path)
-    else: profile_path_obj = get_shell_profile_path()
-    profile = profile_path_obj.read_text()
+    else:
+        profile_path_obj = get_shell_profile_path()
+    profile = profile_path_obj.read_text(encoding="utf-8")
 
     for a_file in sources:
         tmp = a_file.replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix())
         file = PathExtended(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
         file = file.as_posix() if system == "Linux" else str(file)
         if file not in profile:
-            if system == "Windows": 
+            if system == "Windows":
                 profile += f"\n. {file}"
                 console.print(f"➕ Added PowerShell source: {file}")
-            elif system == "Linux": 
+            elif system == "Linux":
                 profile += f"\nsource {file}"
                 console.print(f"➕ Added Bash source: {file}")
-            else: raise ValueError(f"Not implemented for this system {system}")
-        else: 
+            else:
+                raise ValueError(f"Not implemented for this system {system}")
+        else:
             console.print(f"⏭️  Source already present: {file}")
-    
-    profile_path_obj.write_text(profile)
+
+    profile_path_obj.write_text(profile, encoding="utf-8")
     console.print(Panel("✅ Shell profile updated with sources", title="[bold blue]Sources[/bold blue]", border_style="blue"))
 
 
-def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice: Optional[str] = None):
-    patches: list[str] = list(LIBRARY_ROOT.joinpath(f"profile/patches/{system.lower()}").search().apply(lambda x: x.as_posix()))
-    
+def main_add_patches_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
+    patches: list[str] = [item.as_posix() for item in LIBRARY_ROOT.joinpath(f"profile/patches/{system.lower()}").search()]
+
     console.print(Panel("🩹 Adding patches to shell profile", title="[bold blue]Patches[/bold blue]", border_style="blue"))
-    
+
     if choice is None:
         choice_chosen = display_options(msg="Which patch to add?", options=list(patches) + ["all", "none(EXIT)"], default="none(EXIT)", multi=False)
         assert isinstance(choice_chosen, str), f"Choice must be a string or a list of strings, not {type(choice)}"
         choice = choice_chosen
-    if choice == "none(EXIT)": return None
-    elif str(choice) == "all": 
+    if choice == "none(EXIT)":
+        return None
+    elif str(choice) == "all":
         console.print("📌 Adding all patches to profile")
-    else: 
+    else:
         patches = [choice]
         console.print(f"📌 Adding selected patch: {choice}")
 
     profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
-    profile = profile_path_obj.read_text()
+    profile = profile_path_obj.read_text(encoding="utf-8")
 
     for patch_path in patches:
         patch_path_obj = PathExtended(patch_path)
-        patch = patch_path_obj.read_text()
-        if patch in profile: 
+        patch = patch_path_obj.read_text(encoding="utf-8")
+        if patch in profile:
             console.print(f"⏭️  Patch already present: {patch_path_obj.name}")
-        else: 
+        else:
             profile += "\n" + patch
             console.print(f"➕ Added patch: {patch_path_obj.name}")
 
@@ -179,9 +206,9 @@ def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice
             profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
             console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
 
-    profile_path_obj.write_text(profile)
+    profile_path_obj.write_text(profile, encoding="utf-8")
     console.print(Panel("✅ Shell profile updated with patches", title="[bold blue]Patches[/bold blue]", border_style="blue"))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass