machineconfig 5.17__py3-none-any.whl → 5.18__py3-none-any.whl

machineconfig/scripts/python/ai/solutions/generic.py

@@ -6,9 +6,19 @@ from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 def create_dot_scripts(repo_root: Path) -> None:
     scripts_dir = LIBRARY_ROOT.joinpath("scripts/python/ai/scripts")
     target_dir = repo_root.joinpath(".scripts")
+    import shutil
+    shutil.rmtree(target_dir, ignore_errors=True)
     target_dir.mkdir(parents=True, exist_ok=True)
-    for script_path in scripts_dir.iterdir():
-        target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
+    # for script_path in scripts_dir.iterdir():
+    #     target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
+    import platform
+    if platform.system() == "Windows":
+        script_path = scripts_dir.joinpath("lint_and_type_check.ps1")
+    elif platform.system() in ["Linux", "Darwin"]:
+        script_path = scripts_dir.joinpath("lint_and_type_check.sh")
+    else:
+        raise NotImplementedError(f"Platform {platform.system()} is not supported.")
+    target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
 
 
 def adjust_gitignore(repo_root: Path) -> None:

machineconfig/scripts/python/count_lines_frontend.py

@@ -6,7 +6,7 @@ def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to
     from machineconfig.scripts.python import count_lines
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
-    # --project $HOME/code/machineconfig 
+    # --project $HOME/code/machineconfig --group plot
     cmd = f"""uv run --python 3.13 --with machineconfig[plot] {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)

machineconfig/scripts/python/devops.py

@@ -4,102 +4,131 @@ import machineconfig.utils.installer_utils.installer as installer_entry_point
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
 
-from machineconfig.utils.installer import get_machineconfig_version
+import machineconfig.profile.create_frontend as create_frontend
+# import machineconfig.scripts.python.dotfile as dotfile_module
 import typer
+from typing import Literal, Annotated
 
 
-app = typer.Typer(help=f"🛠️ DevOps operations @ machineconfig {get_machineconfig_version()}", no_args_is_help=True)
+app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True)
 app.command(name="install", help="📦 Install essential packages")(installer_entry_point.main)
-app.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal.main)
 app.add_typer(repos.app, name="repos", help="📁 Manage git repositories")
 
-ssh_app = typer.Typer(help="🔐 SSH operations subcommands", no_args_is_help=True)
-app.add_typer(ssh_app, name="ssh")
 
+config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
+app.add_typer(config_apps, name="config")
 
-@app.command()
+
+
+app_data = typer.Typer(help="💾 Data subcommands", no_args_is_help=True)
+app.add_typer(app_data, name="data")
+
+nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
+nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal.main)
+app.add_typer(nw_apps, name="network")
+
+
+self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
+app.add_typer(self_app, name="self")
+
+
+@self_app.command()
 def update():
     """🔄 UPDATE essential repos"""
     import machineconfig.scripts.python.devops_update_repos as helper
     helper.main()
+@self_app.command()
+def interactive():
+    """🤖 INTERACTIVE configuration of machine."""
+    from machineconfig.scripts.python.interactive import main
+    main()
+@self_app.command()
+def status():
+    """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
+    pass
 
 
-@app.command()
-def symlinks():
-    """🔗 SYMLINKS of dotfiles."""
-    import machineconfig.profile.create as helper
-    helper.main_symlinks()
+@config_apps.command(no_args_is_help=True)
+def private():
+    """🔗 Manage private configuration files."""
+    create_frontend.main_private_from_parser()
 
+@config_apps.command(no_args_is_help=True)
+def public():
+    """🔗 Manage public configuration files."""
+    create_frontend.main_public_from_parser()
 
-@app.command()
-def profile():
-    """🔗 Update shell profile."""
-    import machineconfig.profile.create as helper
-    helper.main_profile()
+# @config_apps.command(no_args_is_help=True)
+# def dotfile():
+#     """🔗 Manage dotfiles."""
+#     dotfile_module.main()
 
 
-@app.command()
-def symlinks_new():
-    """🆕 SYMLINKS new"""
-    import machineconfig.jobs.python.python_ve_symlink as helper
-    helper.main()
+@config_apps.command(no_args_is_help=True)
+def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="Choose the method to configure the shell profile: 'copy' copies the init script directly, 'reference' references machineconfig for dynamic updates.")]):
+    """🔗 Configure your shell profile."""
+    from machineconfig.profile.shell import create_default_shell_profile
+    create_default_shell_profile(method=method)
 
 
-@ssh_app.command()
+@nw_apps.command()
 def add_key():
     """🔑 SSH add pub key to this machine"""
     import machineconfig.scripts.python.devops_add_ssh_key as helper
     helper.main()
-@ssh_app.command()
+@nw_apps.command()
 def add_identity():
     """🗝️ SSH add identity (private key) to this machine"""
     import machineconfig.scripts.python.devops_add_identity as helper
     helper.main()
-@ssh_app.command()
+@nw_apps.command()
 def connect():
     """🔐 SSH use key pair to connect two machines"""
     raise NotImplementedError
-@ssh_app.command()
+
+@nw_apps.command()
 def setup():
     """📡 SSH setup"""
-    _program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
-    _program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
-    import subprocess
-    from platform import system
-    subprocess.run(_program_linux if system() == "Linux" else _program_windows, shell=True, check=True)
-@ssh_app.command()
-def setup_wsl():
-    """🐧 SSH setup wsl"""
-    import subprocess
-    subprocess.run("curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash", shell=True, check=True)
-
-
-@app.command()
+    import platform
+    if platform.system() == "Windows":
+        from machineconfig.setup_windows import SSH_SERVER
+        program = SSH_SERVER.read_text(encoding="utf-8")
+    elif platform.system() == "Linux" or platform.system() == "Darwin":
+        from machineconfig.setup_linux import SSH_SERVER
+        program = SSH_SERVER.read_text(encoding="utf-8")
+    else:
+        raise NotImplementedError(f"Platform {platform.system()} is not supported.")
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(program=program)
+
+
+@app_data.command()
 def backup():
     """💾 BACKUP"""
     from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="BACKUP")
 
 
-@app.command()
+@app_data.command()
 def retrieve():
     """📥 RETRIEVE"""
     from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="RETRIEVE")
 
 
-@app.command()
-def scheduler():
-    """⏰ SCHEDULER"""
-    # from machineconfig.scripts.python.scheduler import main as helper
-    # helper()
+# @app.command()
+# def scheduler():
+#     """⏰ SCHEDULER"""
+#     # from machineconfig.scripts.python.scheduler import main as helper
+#     # helper()
+
 
-@app.command()
-def interactive():
-    """🤖 INTERACTIVE configuration of machine."""
-    from machineconfig.scripts.python.interactive import main
-    main()
 
+# @app.command()
+# def scheduler():
+#     """⏰ SCHEDULER"""
+#     # from machineconfig.scripts.python.scheduler import main as helper
+#     # helper()
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/dotfile.py

@@ -3,15 +3,13 @@
 from typing import Annotated
 
 import typer
-from rich.console import Console
-from rich.panel import Panel
 
-from machineconfig.utils.links import symlink_func
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT, REPO_ROOT
 
-
-console = Console()
+# @app.command()
+# def symlinks_new():
+#     """🆕 SYMLINKS new. consider moving to the new config command, then may be merge it with the dotfile subcommand"""
+#     import machineconfig.jobs.python.python_ve_symlink as helper
+#     helper.main()
 
 
 def main(
@@ -19,6 +17,14 @@ def main(
     overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
     dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
 ) -> None:
+
+    from rich.console import Console
+    from rich.panel import Panel
+
+    from machineconfig.utils.links import symlink_map
+    from machineconfig.utils.path_extended import PathExtended
+    from machineconfig.utils.source_of_truth import LIBRARY_ROOT, REPO_ROOT
+    console = Console()
     orig_path = PathExtended(file).expanduser().absolute()
     if dest == "":
         if "Local" in str(orig_path):
@@ -35,7 +41,7 @@ def main(
         dest_path.mkdir(parents=True, exist_ok=True)
         new_path = dest_path.joinpath(orig_path.name)
 
-    symlink_func(this=orig_path, to_this=new_path, prioritize_to_this=overwrite)
+    symlink_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict="throwError")
 
     console.print(
         Panel(

machineconfig/scripts/python/interactive.py

@@ -76,7 +76,6 @@ def get_installation_choices() -> list[str]:
         Choice(value="install_repos", title="🐍 Install Repos                - Set up Python environment and repositories permanently.", checked=False),
         Choice(value="install_ssh_server", title="🔒 Install SSH Server             - Set up remote access", checked=False),
         Choice(value="install_shell_profile", title="🐚 Configure Shell Profile         - Source machineconfig shell initialization", checked=False),
-        Choice(value="create_symlinks", title="🔗 Create Symlinks                - Set up configuration symlinks (finish dotfiles transfer first)", checked=False),
         Choice(value="retrieve_repositories", title="📚 Retrieve Repositories          - Clone repositories to ~/code", checked=False),
         Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
     ]
@@ -142,30 +141,12 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         console.print(Panel("🐚 [bold green]SHELL PROFILE[/bold green]\n[italic]Shell configuration setup[/italic]", border_style="green"))
         console.print("🔧 Configuring shell profile", style="bold cyan")
         try:
-            from machineconfig.profile.create import main_profile
-
-            main_profile()
+            from machineconfig.profile.shell import create_default_shell_profile
+            create_default_shell_profile()
             console.print("✅ Shell profile configured successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
-    if "create_symlinks" in selected_options:
-        display_dotfiles_instructions()
-        dotfiles_ready = questionary.confirm("📂 Have you finished copying dotfiles?", default=True).ask()
-        if dotfiles_ready:
-            console.print(Panel("🔗 [bold cyan]SYMLINK CREATION[/bold cyan]\n[italic]Configuration setup[/italic]", border_style="cyan"))
-            console.print("🔧 Creating symlinks", style="bold cyan")
-            try:
-                from machineconfig.profile.create import main_symlinks
-                main_symlinks()
-                console.print("✅ Symlinks created successfully", style="bold green")
-            except Exception as e:
-                console.print(f"❌ Error creating symlinks: {e}", style="bold red")
-            run_shell_script("sudo chmod 600 $HOME/.ssh/*")
-            run_shell_script("sudo chmod 700 $HOME/.ssh")
-        else:
-            console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
-
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
         from machineconfig.scripts.python import repos
@@ -200,6 +181,7 @@ def main() -> None:
         console.print("❌ Installation cancelled.", style="bold red")
         sys.exit(0)
     execute_installations(selected_options)
+    display_dotfiles_instructions()
     display_completion_message()
 
 

machineconfig/scripts/python/share_terminal.py

@@ -133,7 +133,7 @@ def main(
 ttyd --writable -t enableSixel=true {ssl_args} --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' {start_command}
 """
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(code)
+    run_shell_script(code, display_script=False)
 
 
 def main_with_parser():

machineconfig/setup_linux/__init__.py

@@ -0,0 +1,11 @@
+
+from pathlib import Path
+
+APPS = Path(__file__).parent.joinpath("apps.sh")
+REPOS = Path(__file__).parent.joinpath("repos.sh")
+VE = Path(__file__).parent.joinpath("ve.sh")
+
+APPS_DESKTOP = Path(__file__).parent.joinpath("apps_desktop.sh")
+APPS_GUI = Path(__file__).parent.joinpath("apps_gui.sh")
+
+SSH_SERVER = Path(__file__).parent.joinpath("ssh/openssh_server.sh")

machineconfig/setup_linux/{openssh_all.sh → ssh/openssh_all.sh}

@@ -13,6 +13,7 @@ sudo chmod 700 ~/.ssh
 echo "✅ FINISHED modifying .ssh folder attributes."
 
 # 🔄 Clean install OpenSSH server
+sudo nala install openssh-server -y || true  # try to install first
 sudo nala purge openssh-server -y
 sudo nala install openssh-server -y
 echo "✅ FINISHED installing openssh-server."

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -6,4 +6,4 @@ echo """
 ======================================================================="""
 
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
-$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops interactive
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops self interactive

machineconfig/setup_windows/__init__.py

@@ -0,0 +1,12 @@
+
+from pathlib import Path
+
+APPS = Path(__file__).parent.joinpath("apps.ps1")
+REPOS = Path(__file__).parent.joinpath("repos.ps1")
+VE = Path(__file__).parent.joinpath("ve.ps1")
+
+DOCKER = Path(__file__).parent.joinpath("others/docker.ps1")
+OBS = Path(__file__).parent.joinpath("others/obs.ps1")
+POWER_OPTIONS = Path(__file__).parent.joinpath("others/power_options.ps1")
+
+SSH_SERVER = Path(__file__).parent.joinpath("ssh/openssh_server.ps1")

machineconfig/setup_windows/apps.ps1

@@ -12,6 +12,7 @@ winget install --no-upgrade --name "Starship"                     --Id "Starship
 winget install --no-upgrade --name "Git"                          --Id "Git.Git"                    --source winget --scope user --accept-package-agreements --accept-source-agreements
 winget install --no-upgrade --name "Neovim"                       --Id "Neovim.Neovim"              --source winget --scope user --accept-package-agreements --accept-source-agreements
 winget install --no-upgrade --name "GNU Nano"                     --Id "GNU.Nano"                   --source winget --scope user --accept-package-agreements --accept-source-agreements
+winget install --no-upgrade                                       --Id CoreyButler.NVMforWindows    --source winget --scope user --accept-package-agreements --accept-source-agreements
 Install-Module -Name Terminal-Icons -Repository PSGallery -Force -AcceptLicense -PassThru -Confirm  # -RequiredVersion 2.5.10
 Install-Module -Name PSFzf  -SkipPublisherCheck  # -AcceptLicense -PassThru -Confirm  #  -RequiredVersion 2.5.10
 

machineconfig/setup_windows/{openssh_all.ps1 → ssh/openssh_all.ps1}

@@ -9,12 +9,12 @@ if (!$pubkey_string) {
     Write-Output "pubkey_string is already defined."
 }
 
-cd ~
-echo $null >> .ssh/authorized_keys  # powershell way of touching a file if it doesn't exist
-echo $pubkey_string >> .ssh/authorized_keys
-echo $pubkey_string > .ssh/pubkey.pub
-Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh-server_add-sshkey.ps1 | Invoke-Expression
 
+echo $null >> $HOME/.ssh/authorized_keys  # powershell way of touching a file if it doesn't exist
+echo $pubkey_string >> $HOME/.ssh/authorized_keys
+echo $pubkey_string > $HOME/.ssh/pubkey.pub
+
+Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh-server_add-sshkey.ps1 | Invoke-Expression
 ipconfig.exe
 
 echo "Done"

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -9,5 +9,5 @@ Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machin
 .\ve.ps1
 rm ve.ps1
 
-uv run --python 3.13 --with machineconfig devops interactive
+uv run --python 3.13 --with machineconfig devops self interactive
 # uv run --python 3.13 --with machineconfig https://raw.githubusercontent.com/thisismygitrepo/machineconfig/ee4f69e838e1acbb275bfb5a3d3faee23345f2a8/src/machineconfig/scripts/python/devops.py

machineconfig/utils/code.py

@@ -98,7 +98,7 @@ def print_code(code: str, lexer: str, desc: str, subtitle: str = ""):
     console.print(Panel(Syntax(code=code, lexer=lexer), title=f"📄 {desc}", subtitle=subtitle), style="bold red")
 
 
-def run_shell_script(program: str):
+def run_shell_script(program: str, display_script: bool = True):
     import tempfile
     if platform.system() == "Windows":
         suffix = ".ps1"
@@ -110,16 +110,19 @@ def run_shell_script(program: str):
         temp_file.write(program)
         temp_script_path = PathExtended(temp_file.name)
     console = Console()
-    # console.print(f"📝 [blue]Temporary script written to:[/blue] [green]{temp_script_path}[/green]")
-    from rich.syntax import Syntax
-    console.print(Panel(Syntax(code=program, lexer=lexer), title=f"📄script @ {temp_script_path}", subtitle="shell code"), style="bold red")
+    if display_script:
+        from rich.syntax import Syntax
+        console.print(Panel(Syntax(code=program, lexer=lexer), title=f"📄 shell script @ {temp_script_path}", subtitle="shell script being executed"), style="bold red")
+
     if platform.system() == "Windows":
         import subprocess
         subprocess.run(f'powershell -ExecutionPolicy Bypass -File "{temp_script_path}"', check=True, shell=True)
     elif platform.system() == "Linux" or platform.system() == "Darwin":
         import subprocess
         subprocess.run(f"bash {str(temp_script_path)}", check=True, shell=True)
+
     temp_script_path.unlink(missing_ok=True)
+
 # def run_command(command: str, description: str) -> bool:
 #     """Execute a shell command and return success status."""
 #     console.print(f"\n🔧 {description}", style="bold cyan")