machineconfig 2.6__py3-none-any.whl → 2.7__py3-none-any.whl

machineconfig/scripts/windows/wifi_conn.ps1

@@ -1,3 +1,2 @@
 
-$pyparser=Resolve-Path("$PSScriptRoot/../python/wifi_conn.py")
-uv run --python 3.13 --with machineconfig python $pyparser $args
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig wifi_conn $args

machineconfig/settings/shells/pwsh/init.ps1

@@ -1,9 +1,5 @@
 
 
-
-# PATH extension =====================================================
-# $env:Path += ";$HOME\code\machineconfig\src\machineconfig\scripts\windows;$HOME\dotfiles\scripts\windows;C:\Program Files (x86)\GnuWin32\bin;C:\Program Files\CodeBlocks\MinGW\bin;C:\Program Files\nu\bin;C:\Program Files\Graphviz\bin"
-
 function Add-ToPathIfNotAlready {
     param (
         [Parameter(Mandatory=$true)]

machineconfig/setup_linux/web_shortcuts/croshell.sh

@@ -7,5 +7,5 @@ cd $HOME/code/machineconfig
 $HOME/.local/bin/uv sync --no-dev
 $HOME/.local/bin/uv pip install -e ../crocodile
 
-source $HOME/code/machineconfig/src/machineconfig/setup_linux/symlinks.sh
+uv run --no-dev --project $HOME/code/machineconfig -m fire machineconfig.profile.create main --choice=all
 . ~/.bashrc

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -37,8 +37,7 @@ echo """#=======================================================================
 🐍 PYTHON ENVIRONMENT | Virtual environment setup
 #=======================================================================
 """
-read -p "🐍 Install Python virtual environment '.venv' [y]/n? " choice
-export ve_name=".venv"
+read -p "🐍 Install UV and repos [y]/n? " choice
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔧 Setting up Python environment...
     """
@@ -102,8 +101,7 @@ choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔧 Creating symlinks and setting permissions...
     """
-    source $HOME/code/machineconfig/.venv/bin/activate
-    python -m fire machineconfig.profile.create main --choice=all
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main --choice=all
     sudo chmod 600 $HOME/.ssh/*
     sudo chmod 700 $HOME/.ssh
 else
@@ -120,8 +118,7 @@ choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔧 Installing CLI applications...
     """
-    . $HOME/code/machineconfig/.venv/bin/activate
-    python -m fire machineconfig.scripts.python.devops_devapps_install main --which=AllEssentials
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=AllEssentials
     . $HOME/.bashrc
 else
     echo """    ⏭️  Skipping CLI apps installation
@@ -132,16 +129,14 @@ echo """#=======================================================================
 🛠️  DEVELOPMENT TOOLS | Software development packages
 #=======================================================================
 """
-read -p "🛠️  Install Development Tools [y]/n? " choice
+read -p "🛠️  Install Development Tools (rust, libssql-dev, ffmpeg, wezterm, brave, code) [y]/n? " choice
 choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Installing development tools...
-    """
+    echo """    🔧 Installing development tools... """
     (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
     sudo nala install libssl-dev -y
     sudo nala install ffmpeg -y
-    . $HOME/code/machineconfig/.venv/bin/activate
-    python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code
 else
     echo """    ⏭️  Skipping development tools installation
     """
@@ -171,8 +166,7 @@ choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔄 Retrieving data...
     """
-    . $HOME/code/machineconfig/.venv/bin/activate
-    python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
 else
     echo """    ⏭️  Skipping data retrieval
     """

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -7,16 +7,16 @@ Write-Host "ℹ️  If you have execution policy issues, run:
 Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
 Write-Host "💡 To accept all prompts automatically, run: `$yesAll = `$true`n"
 
-# Set environment variable and execute scripts
-$ve_name = ".venv"
 
 Write-Host "🔄 Setting up Python environment..."
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1" -OutFile "ve.ps1"
 .\ve.ps1
+rm ve.ps1
 
 Write-Host "`n🔄 Setting up repositories..."
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/repos.ps1" -OutFile "repos.ps1"
 .\repos.ps1
+rm repos.ps1
 
 Write-Host "`n📂 ============================================
 🔄 DOTFILES MIGRATION OPTIONS
@@ -97,7 +97,8 @@ if ($createLinksChoice -eq "y" -or $createLinksChoice -eq "Y") {
     if ($linkTypeChoice -eq "s" -or $linkTypeChoice -eq "S") {
         python -m fire machineconfig.profile.create main --choice=all
     } elseif ($linkTypeChoice -eq "h" -or $linkTypeChoice -eq "H") {
-        python -m fire machineconfig.profile.create_hardlinks main --choice=all
+        # python -m fire machineconfig.profile.create_hardlinks main --choice=all
+        python -m fire machineconfig.profile.create main --choice=all
     } else {
         Write-Host "Invalid choice for link type. Installation aborted."
     }
@@ -119,9 +120,7 @@ if (-not $yesAll) {
     }
     
 } else {
-    . $HOME\code\machineconfig\.venv\Scripts\activate.ps1
-    python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=AllEssentials
-    deactivate    
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=AllEssentials
 }
 
 
@@ -146,8 +145,7 @@ if (-not $yesAll) {
 }
 if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
 if ($choice -eq "y" -or $choice -eq "Y") {
-    . ~\code\machineconfig\.venv\Scripts\Activate.ps1
-    python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
 } else {
     Write-Host "Installation aborted."
 }
@@ -161,19 +159,12 @@ if (-not $yesAll) {
 }
 if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
 if ($choice -eq "y" -or $choice -eq "Y") {
-    # python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm
-    # python -m fire machineconfig.scripts.python.devops_devapps_install main --which=brave
-    # python -m fire machineconfig.scripts.python.devops_devapps_install main --which=code
     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 install --no-upgrade --name "Powershell"                   --Id "Microsoft.PowerShell"       --source winget --scope user --accept-package-agreements --accept-source-agreements  # powershell require admin
-    python -m fire machineconfig.setup_windows.wt_and_pwsh.set_pwsh_theme install_nerd_fonts
-    python -m fire machineconfig.setup_windows.wt_and_pwsh.set_wt_settings main
     winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
     winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
-    . $HOME\code\machineconfig\.venv\Scripts\Activate.ps1
-    python -m fire machineconfig.setup_windows.wt_and_pwsh.set_pwsh_theme install_nerd_fonts
-    python -m fire machineconfig.setup_windows.wt_and_pwsh.set_wt_settings main
-
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.install_nerd_fonts main
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.set_wt_settings main
 } else {
     Write-Host "Installation aborted."
 }
@@ -181,7 +172,7 @@ if ($choice -eq "y" -or $choice -eq "Y") {
 
 # Install Apps
 if (-not $yesAll) {
-    $choice = Read-Host "Install Apps [y]/n ? "
+    $choice = Read-Host "Install Windows Apps [y]/n ? "
 } else {
     $choice = "y"
 }

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -4,8 +4,7 @@ from machineconfig.utils.utils2 import randstr, read_json
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.io_save import save_json
 import platform
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from uuid import uuid4
+# from uuid import uuid4
 import os
 from typing import Any
 from rich.console import Console
@@ -100,65 +99,6 @@ class TerminalSettings(object):
         else:
             console.print(Panel("❌ PowerShell profile was not found in the list of profiles and therefore was not made the default.", title="[bold red]Terminal Settings[/bold red]", border_style="red"))
 
-    def add_croshell(self):
-        print("\n🐊 Adding croshell profile...")
-        croshell = dict(
-            name="croshell",
-            guid="{" + str(uuid4()) + "}",
-            commandline=f'powershell.exe -Command "{LIBRARY_ROOT.as_posix()}/scripts/windows/croshell.ps1"',
-            startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
-        )
-        # startingDirectory = None means: inheret from parent process, which will is the default, which point to /System32
-        # Launching a new profile with ctr+shift+2 is equivalent to: wt --profile croshell -d . --new-tab
-        for profile in self.profs:
-            if profile["name"] == "croshell":
-                profile.update(croshell)
-                console.print(Panel("✅ Updated existing croshell profile", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
-                break
-        else:
-            self.profs.append(croshell)
-            console.print(Panel("✅ Added new croshell profile", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
-
-    def add_ubuntu(self):
-        print("\n🐧 Adding Ubuntu WSL profile...")
-        # Add Ubunto if it is not there.
-        ubuntu = dict(
-            name="Ubuntu",
-            commandline="wsl -d Ubuntu -- cd ~",
-            hidden=False,
-            guid="{" + str(uuid4()) + "}",
-            startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
-        )
-        if not any(x.get("name") == "Ubuntu" for x in self.profs):
-            self.profs.append(ubuntu)
-            console.print(Panel("✅ Added Ubuntu WSL profile", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
-        else:
-            console.print(Panel("ℹ️ Ubuntu profile already exists", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
-
-    def standardize_profiles_order(self):
-        print("\n🔄 Standardizing profile order...")
-        # Changing order of profiles:
-        others = []
-        pwsh = croshell = ubuntu = wpwsh = cmd = azure = None
-        for profile in self.profs:
-            name = profile["name"]
-            if name == "PowerShell":
-                pwsh = profile
-            elif name == "croshell":
-                croshell = profile
-            elif name == "Ubuntu":
-                ubuntu = profile
-            elif name == "Windows PowerShell":
-                wpwsh = profile
-            elif name == "Command Prompt":
-                cmd = profile
-            elif name == "Azure Cloud Shell":
-                azure = profile
-            else:
-                others.append(profile)
-        self.profs = [item for item in [pwsh, croshell, ubuntu, wpwsh, cmd, azure] + others if item is not None]
-        console.print(Panel("✅ Profile order standardized", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
-
 
 def main():
     print(f"\n{'=' * 80}\n🖥️  WINDOWS TERMINAL SETUP 🖥️\n{'=' * 80}")
@@ -168,12 +108,7 @@ def main():
         ts = TerminalSettings()
         ts.update_default_settings()
         ts.customize_powershell(nerd_font=True)
-
         ts.make_powershell_default_profile()
-        ts.add_croshell()
-        ts.add_ubuntu()
-        ts.standardize_profiles_order()
-
         print("⌨️  Adding keyboard shortcut for pane zoom (ctrl+shift+z)...")
         ts.dat["actions"].append({"command": "togglePaneZoom", "keys": "ctrl+shift+z"})
 

machineconfig/utils/links.py

@@ -112,10 +112,9 @@ def symlink_func(this: PathExtended, to_this: PathExtended, prioritize_to_this:
         console.print(Panel(f"❌ ERROR | Failed at linking {this} ➡️  {to_this}. Reason: {ex}", title="Error", expand=False))
 
 
-def symlink_copy(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool = True):
+def symlink_copy(this: PathExtended, to_this: PathExtended, prioritize_to_this: bool):
     this = PathExtended(this).expanduser().absolute()
     to_this = PathExtended(to_this).expanduser().absolute()
-    # Case analysis based on docstring of symlink_func
     if this.exists():
         if to_this.exists():
             if this.is_symlink():

machineconfig/utils/options.py

@@ -14,22 +14,25 @@ T = TypeVar("T")
 def check_tool_exists(tool_name: str) -> bool:
     if platform.system() == "Windows":
         tool_name = tool_name.replace(".exe", "") + ".exe"
-        cmd = "where.exe"
-        root_path = Path(WINDOWS_INSTALL_PATH)
+        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        tool_name = tool_name.replace(".exe", "") + ".exe"
+        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        return res1 or res2
     elif platform.system() in ["Linux", "Darwin"]:
-        cmd = "which"
         root_path = Path(LINUX_INSTALL_PATH)
         return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
     else:
         raise NotImplementedError(f"platform {platform.system()} not implemented")
-    _ = cmd
+    # _ = cmd
+    #     cmd = "where.exe"
+    #     cmd = "which"
     # try:  # talking to terminal is too slow.
     #     _tmp = subprocess.check_output([cmd, tool_name], stderr=subprocess.DEVNULL)
     #     res: bool = True
     # except (subprocess.CalledProcessError, FileNotFoundError):
     #     res = False
     # return res
-    return root_path.joinpath(tool_name).is_file()
+    # return root_path.joinpath(tool_name).is_file()
 
 
 def choose_one_option(options: Iterable[T], header: str = "", tail: str = "", prompt: str = "", msg: str = "", default: Optional[T] = None, fzf: bool = False, custom_input: bool = False) -> T:

machineconfig/utils/procs.py

@@ -230,5 +230,9 @@ def get_age(create_time: Any) -> str:
             return f"unknown due to {ee} and {e}"
 
 
+def main():
+    from machineconfig.utils.procs import ProcessManager; ProcessManager().choose_and_kill()
+
+
 if __name__ == "__main__":
-    pass
+    main()

machineconfig/utils/scheduling.py

@@ -72,7 +72,6 @@
 #     return "\n".join([header, separator] + rows)
 
 
-# SCHEDULER_DEFAULT_ROOT = PathExtended.home().joinpath("dotfiles/scripts/.scheduler")
 # SUCCESS = "success"
 # DEFAULT_CONFIG = """
 # [specs]

machineconfig/{cluster/sessions_managers → utils/schemas/layouts}/layout_types.py

@@ -24,6 +24,5 @@ class LayoutConfig(TypedDict):
 
 class LayoutsFile(TypedDict):
     """Complete layout file structure."""
-
     version: str
     layouts: List[LayoutConfig]

machineconfig/utils/schemas/repos/repos_types.py

@@ -0,0 +1,28 @@
+
+
+from typing import TypedDict
+
+
+
+class GitVersionInfo(TypedDict):
+    branch: str
+    commit: str
+
+
+class RepoRemote(TypedDict):
+    name: str
+    url: str
+
+
+class RepoRecordDict(TypedDict):
+    name: str
+    parentDir: str
+    currentBranch: str
+    remotes: list[RepoRemote]
+    version: GitVersionInfo
+    isDirty: bool
+
+
+class RepoRecordFile(TypedDict):
+    version: str
+    repos: list[RepoRecordDict]

machineconfig/utils/source_of_truth.py

@@ -3,12 +3,11 @@ Utils
 """
 
 import machineconfig
-# import platform
 from pathlib import Path
 
 LIBRARY_ROOT = Path(machineconfig.__file__).resolve().parent
 REPO_ROOT = LIBRARY_ROOT.parent.parent
-# PROGRAM_PATH = Path(Path.home().joinpath("tmp_results", "shells", "python_return_command").__str__() + (".ps1" if platform.system() == "Windows" else ".sh"))
+
 CONFIG_PATH = Path.home().joinpath(".config/machineconfig")
 DEFAULTS_PATH = Path.home().joinpath("dotfiles/machineconfig/defaults.ini")
 
@@ -22,6 +21,4 @@ WINDOWS_INSTALL_PATH = Path.home().joinpath("AppData/Local/Microsoft/WindowsApps
 
 
 if __name__ == "__main__":
-    # import typer
-    # typer.run(check_tool_exists)
     pass

machineconfig/utils/ssh.py

@@ -201,7 +201,7 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
         assert '"' not in cmd, 'Avoid using `"` in your command. I dont know how to handle this when passing is as command to python in pwsh command.'
         if not return_obj:
             return self.run(
-                cmd=f"""uv run --with machineconfig -c "{Terminal.get_header(wdir=None, toolbox=True)}{cmd}\n""" + '"', desc=desc or f"run_py on {self.get_remote_repr()}", verbose=verbose, strict_err=strict_err, strict_returncode=strict_returncode
+                cmd=f"""uv run --no-dev --project $HOME/code/machineconfig -c "{Terminal.get_header(wdir=None, toolbox=True)}{cmd}\n""" + '"', desc=desc or f"run_py on {self.get_remote_repr()}", verbose=verbose, strict_err=strict_err, strict_returncode=strict_returncode
             )
         assert "obj=" in cmd, "The command sent to run_py must have `obj=` statement if return_obj is set to True"
         source_file = self.run_py(f"""{cmd}\npath = Save.pickle(obj=obj, path=P.tmpfile(suffix='.pkl'))\nprint(path)""", desc=desc, verbose=verbose, strict_err=True, strict_returncode=True).op.split("\n")[-1]

{machineconfig-2.6.dist-info → machineconfig-2.7.dist-info}/METADATA

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