machineconfig 5.76__tar.gz → 5.77__tar.gz

{machineconfig-5.76/src/machineconfig.egg-info → machineconfig-5.77}/PKG-INFO

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

{machineconfig-5.76 → machineconfig-5.77}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.76"
+version = "5.77"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -89,7 +89,7 @@ dev = [
     "build>=1.3.0",
     "cleanpy>=0.5.1",
     "cowsay>=6.1",
-    "duckdb-engine>=0.17.0",
+    # "duckdb-engine>=0.17.0",
     "euporie>=2.8.14",
     "ipdb>=0.13.13",
     "ipykernel>=6.30.1",
@@ -99,7 +99,6 @@ dev = [
     "numpy>=2.3.3",
     "pandas>=2.3.3",
     "plotly>=6.3.0",
-    "polars>=1.33.1",
     "pre-commit>=4.3.0",
     "pudb>=2025.1",
     "pylint>=3.3.8",

{machineconfig-5.76 → machineconfig-5.77}/src/machineconfig/scripts/python/devops.py

@@ -22,16 +22,20 @@ def get_app():
     _ = install
     app.command("install", no_args_is_help=True, help="🛠️ [i] Install essential packages")(install)
     app.command("i", no_args_is_help=True, help="Install essential packages", hidden=True)(install)
-    app.add_typer(cli_repos.get_app(), name="repos")
-    app.add_typer(cli_repos.get_app(), name="r", hidden=True)
-    app.add_typer(cli_config.get_app(), name="config")
-    app.add_typer(cli_config.get_app(), name="c", hidden=True)
+    app_repos = cli_repos.get_app()
+    app.add_typer(app_repos, name="repos")
+    app.add_typer(app_repos, name="r", hidden=True)
+    app_config = cli_config.get_app()
+    app.add_typer(app_config, name="config")
+    app.add_typer(app_config, name="c", hidden=True)
     app.add_typer(cli_data.app_data, name="data")
     app.add_typer(cli_data.app_data, name="d", hidden=True)
-    app.add_typer(cli_self.get_app(), name="self")
-    app.add_typer(cli_self.get_app(), name="s", hidden=True)
-    app.add_typer(cli_network.get_app(), name="network")
-    app.add_typer(cli_network.get_app(), name="n", hidden=True)
+    app_self = cli_self.get_app()
+    app.add_typer(app_self, name="self")
+    app.add_typer(app_self, name="s", hidden=True)
+    app_nw = cli_network.get_app()
+    app.add_typer(app_nw, name="network")
+    app.add_typer(app_nw, name="n", hidden=True)
     return app
 
 def main():

{machineconfig-5.76 → machineconfig-5.77}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -31,6 +31,17 @@ def add_ssh_identity():
     import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
     helper.main()
 
+
+def show_address():
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8',80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+    print(f"This computer is @ {local_ip_v4}")
+
+
+
 def get_app():
     nw_apps = typer.Typer(help="🔐 [n] Network subcommands", no_args_is_help=True)
     nw_apps.command(name="share-terminal", help="📡  [t] Share terminal via web browser")(cli_terminal.main)
@@ -43,4 +54,6 @@ def get_app():
     nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True)(add_ssh_key)
     nw_apps.command(name="add-ssh-identity", help="🗝️  [a] Add SSH identity (private key) to this machine")(add_ssh_identity)
     nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
+    nw_apps.command(name="show-address", help="[A] Show this computer addresses on network")(show_address)
+    nw_apps.command(name="a", help="Show this computer addresses on network", hidden=True)(show_address)
     return nw_apps

{machineconfig-5.76 → machineconfig-5.77}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -53,6 +53,25 @@ def run_python(ip: str = typer.Argument(..., help="Python command to run in the
     import subprocess
     import sys
     subprocess.run([sys.executable, ip], cwd=machineconfig.__path__[0])
+def readme():
+    from rich.console import Console
+    from rich.markdown import Markdown
+    import requests
+
+    # URL of the raw README.md file
+    url_readme = "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/refs/heads/main/README.md"
+
+    # Fetch the content
+    response = requests.get(url_readme)
+    response.raise_for_status()  # Raise an error for bad responses
+
+    # Parse markdown
+    md = Markdown(response.text)
+
+    # Render in terminal
+    console = Console()
+    console.print(md)
+
 
 def get_app():
     cli_app = typer.Typer(help="🔄 [s] self operations subcommands", no_args_is_help=True)
@@ -68,4 +87,6 @@ def get_app():
     cli_app.command("n", no_args_is_help=False, help="NAVIGATE command structure with TUI", hidden=True)(navigate)
     cli_app.command("python", no_args_is_help=False, help="🐍  [c] python command/file in the machineconfig environment")(run_python)
     cli_app.command("c", no_args_is_help=False, help="RUN python command/file in the machineconfig environment", hidden=True)(run_python)
+    cli_app.command("readme", no_args_is_help=False, help="📚  [r] render readme markdown in terminal.")(readme)
+    cli_app.command("r", no_args_is_help=False, hidden=True)(readme)
     return cli_app

machineconfig-5.77/src/machineconfig/scripts/python/nw/add_ssh_key.py

@@ -0,0 +1,148 @@
+"""SSH"""
+
+from platform import system
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.path_extended import PathExtended
+from rich.console import Console
+from rich.panel import Panel
+from rich import box  # Import box
+from typing import Optional
+import typer
+
+
+console = Console()
+
+
+def get_add_ssh_key_script(path_to_key: PathExtended):
+    console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))
+    if system() == "Linux" or system() == "Darwin":
+        authorized_keys = PathExtended.home().joinpath(".ssh/authorized_keys")
+        console.print(Panel(f"🐧 Linux SSH configuration\n📄 Authorized keys file: {authorized_keys}", title="[bold blue]System Info[/bold blue]"))
+    elif system() == "Windows":
+        authorized_keys = PathExtended("C:/ProgramData/ssh/administrators_authorized_keys")
+        console.print(Panel(f"🪟 Windows SSH configuration\n📄 Authorized keys file: {authorized_keys}", title="[bold blue]System Info[/bold blue]"))
+    else:
+        console.print(Panel("❌ ERROR: Unsupported operating system\nOnly Linux and Windows are supported", title="[bold red]Error[/bold red]"))
+        raise NotImplementedError
+
+    if authorized_keys.exists():
+        split = "\n"
+        keys_text = authorized_keys.read_text(encoding="utf-8").split(split)
+        key_count = len([k for k in keys_text if k.strip()])
+        console.print(Panel(f"🔍 Current SSH authorization status\n✅ Found {key_count} authorized key(s)", title="[bold blue]Status[/bold blue]"))
+        if path_to_key.read_text(encoding="utf-8") in authorized_keys.read_text(encoding="utf-8"):
+            console.print(Panel(f"⚠️  Key already authorized\nKey: {path_to_key.name}\nStatus: Already present in authorized_keys file\nNo action required", title="[bold yellow]Warning[/bold yellow]"))
+            program = ""
+        else:
+            console.print(Panel(f"➕ Adding new SSH key to authorized keys\n🔑 Key file: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
+            if system() == "Linux":
+                program = f"cat {path_to_key} >> ~/.ssh/authorized_keys"
+            elif system() == "Windows":
+                program_path = LIBRARY_ROOT.joinpath("setup_windows/add-sshkey.ps1")
+                program = program_path.expanduser().read_text(encoding="utf-8")
+                place_holder = r'$sshfile = "$env:USERPROFILE\.ssh\pubkey.pub"'
+                assert place_holder in program, f"This section performs string manipulation on the script {program_path} to add the key to the authorized_keys file. The script has changed and the string {place_holder} is not found."
+                program = program.replace(place_holder, f'$sshfile = "{path_to_key}"')
+                console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Replaced placeholder with actual key path", title="[bold blue]Configuration[/bold blue]"))
+            else:
+                raise NotImplementedError
+    else:
+        console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
+        if system() == "Linux":
+            program = f"cat {path_to_key} > ~/.ssh/authorized_keys"
+        else:
+            program_path = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
+            program = PathExtended(program_path).expanduser().read_text(encoding="utf-8").replace('$sshfile=""', f'$sshfile="{path_to_key}"')
+            console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Set key path in script", title="[bold blue]Configuration[/bold blue]"))
+
+    if system() == "Linux" or system() == "Darwin":
+        program += """
+sudo chmod 700 ~/.ssh
+sudo chmod 644 ~/.ssh/authorized_keys
+sudo chmod 644 ~/.ssh/*.pub
+sudo service ssh --full-restart
+# from superuser.com/questions/215504/permissions-on-private-key-in-ssh-folder
+"""
+    return program
+
+
+
+"""
+# Common pitfalls: 
+# 🚫 Wrong line endings (LF/CRLF) in config files
+# 🌐 Network port conflicts (try 2222 -> 2223) between WSL and Windows
+# sudo service ssh restart
+# sudo service ssh status
+# sudo nano /etc/ssh/sshd_config
+"""
+
+
+def main(pub_path: Optional[str] = typer.Argument(None, help="Path to the public key file"),
+         pub_choose: bool = typer.Option(False, "--choose", "-c", help="Choose from available public keys in ~/.ssh"),
+         pub_val: bool = typer.Option(False, "--paste", "-p", help="Paste the public key content manually"),
+         from_github: Optional[str] = typer.Option(None, "--from-github", "-g", help="Fetch public keys from a GitHub username")
+         ) -> None:
+    if pub_path:
+        key_path = PathExtended(pub_path).expanduser().absolute()
+        if not key_path.exists():
+            console.print(Panel(f"❌ ERROR: Provided key path does not exist\nPath: {key_path}", title="[bold red]Error[/bold red]"))
+            raise FileNotFoundError(f"Provided key path does not exist: {key_path}")
+        console.print(Panel(f"📄 Using provided public key file: {key_path}", title="[bold blue]Info[/bold blue]"))
+        program = get_add_ssh_key_script(key_path)
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script=program)
+        console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
+        return
+    elif pub_choose:
+        console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
+        console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
+        pub_keys = PathExtended.home().joinpath(".ssh").search("*.pub")
+        if pub_keys:
+            console.print(Panel(f"✅ Found {len(pub_keys)} public key(s)", title="[bold green]Status[/bold green]", border_style="green"))
+        else:
+            console.print(Panel("⚠️  No public keys found", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
+        console.print(Panel(f"🔄 Processing all {len(pub_keys)} public keys...", title="[bold blue]Processing[/bold blue]", border_style="blue"))
+        program = "\n\n\n".join([get_add_ssh_key_script(key) for key in pub_keys])
+
+    elif pub_val:
+        console.print(Panel("📋 Please provide a filename and paste the public key content", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
+        key_filename = input("📝 File name (default: my_pasted_key.pub): ") or "my_pasted_key.pub"
+        key_path = PathExtended.home().joinpath(f".ssh/{key_filename}")
+        key_path.write_text(input("🔑 Paste the public key here: "), encoding="utf-8")
+        console.print(Panel(f"💾 Key saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
+        program = get_add_ssh_key_script(key_path)
+    elif from_github:
+        console.print(Panel(f"🌐 Fetching public keys from GitHub user: {from_github}", title="[bold blue]GitHub Fetch[/bold blue]", border_style="blue"))
+        import requests
+        # $pubkey_url = 'https://github.com/thisismygitrepo.keys'  # $pubkey_string = (Invoke-WebRequest $pubkey_url).Content
+        response = requests.get(f"https://api.github.com/users/{from_github}/keys")
+        if response.status_code != 200:
+            console.print(Panel(f"❌ ERROR: Failed to fetch keys from GitHub user {from_github}\nStatus Code: {response.status_code}", title="[bold red]Error[/bold red]", border_style="red"))
+            raise RuntimeError(f"Failed to fetch keys from GitHub user {from_github}: Status Code {response.status_code}")
+        keys = response.json()
+        if not keys:
+            console.print(Panel(f"⚠️  No public keys found for GitHub user: {from_github}", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
+        console.print(Panel(f"✅ Found {len(keys)} public key(s) for user: {from_github}", title="[bold green]Success[/bold green]", border_style="green"))
+        key_path = PathExtended.home().joinpath(f".ssh/{from_github}_github_keys.pub")
+        key_path.write_text("\n".join([key["key"] for key in keys]), encoding="utf-8")
+        console.print(Panel(f"💾 Keys saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
+        program = get_add_ssh_key_script(key_path)
+    else:
+        console.print(Panel("❌ ERROR: No method provided to add SSH key\nUse --help for options", title="[bold red]Error[/bold red]", border_style="red"))
+        raise ValueError("No method provided to add SSH key. Use --help for options.")
+    console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script=program)
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8',80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+    print(f"This computer is @ {local_ip_v4}")
+    console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
+
+
+if __name__ == "__main__":
+    pass

machineconfig-5.77/src/machineconfig/scripts/python/nw/devops_add_identity.py

@@ -0,0 +1,82 @@
+"""ID"""
+
+# from platform import system
+from machineconfig.utils.path_extended import PathExtended
+from machineconfig.utils.options import choose_from_options
+from rich.panel import Panel
+from rich.text import Text
+
+BOX_WIDTH = 150  # width for box drawing
+
+
+def main() -> None:
+    title = "🔑 SSH IDENTITY MANAGEMENT"
+    print(Panel(Text(title, justify="center"), expand=False))
+    print(Panel("🔍 Searching for existing SSH keys...", expand=False))
+    private_keys = [x.with_name(x.stem) for x in PathExtended.home().joinpath(".ssh").search("*.pub")]
+    private_keys = [x for x in private_keys if x.exists()]
+    if private_keys:
+        print(Panel(f"✅ Found {len(private_keys)} SSH private key(s)", expand=False))
+    else:
+        print(Panel("⚠️  No SSH private keys found", expand=False))
+
+    choice = choose_from_options(msg="Path to private key to be used when ssh'ing: ", options=[str(x) for x in private_keys] + ["I have the path to the key file", "I want to paste the key itself"], multi=False)
+
+    if choice == "I have the path to the key file":
+        print(Panel("📄 Please enter the path to your private key file", expand=False))
+        path_to_key = PathExtended(input("📋 Input path here: ")).expanduser().absolute()
+        print(Panel(f"📂 Using key from custom path: {path_to_key}", expand=False))
+
+    elif choice == "I want to paste the key itself":
+        print(Panel("📋 Please provide a filename and paste the private key content", expand=False))
+        key_filename = input("📝 File name (default: my_pasted_key): ") or "my_pasted_key"
+        path_to_key = PathExtended.home().joinpath(f".ssh/{key_filename}")
+        path_to_key.parent.mkdir(parents=True, exist_ok=True)
+        path_to_key.write_text(input("🔑 Paste the private key here: "), encoding="utf-8")
+        print(Panel(f"💾 Key saved to: {path_to_key}", expand=False))
+
+    else:
+        path_to_key = PathExtended(choice)
+        print(Panel(f"🔑 Using selected key: {path_to_key.name}", expand=False))
+
+    txt = f"IdentityFile {path_to_key.collapseuser().as_posix()}"  # adds this id for all connections, no host specified.
+    config_path = PathExtended.home().joinpath(".ssh/config")
+
+    print(Panel("📝 Updating SSH configuration...", expand=False))
+
+    # Inline the previous modify_text behavior (now deprecated):
+    # - If file doesn't exist, seed content with txt_search
+    # - Otherwise, replace a matching line or append if not found
+    if config_path.exists():
+        current = config_path.read_text(encoding="utf-8")
+        print(Panel("✏️  Updated existing SSH config file", expand=False))
+    else:
+        current = txt
+        print(Panel("📄 Created new SSH config file", expand=False))
+    lines = current.split("\n")
+    found = False
+    for i, line in enumerate(lines):
+        if txt in line:
+            lines[i] = txt
+            found = True
+    if not found:
+        lines.insert(0, txt)
+    new_content = "\n".join(lines)
+    config_path.write_text(new_content, encoding="utf-8")
+
+    panel_complete = Panel(Text("✅ SSH IDENTITY CONFIGURATION COMPLETE\nIdentity added to SSH config file\nConsider reloading the SSH config to apply changes", justify="center"), expand=False, border_style="green")
+    program = f"echo '{panel_complete}'"
+
+    success_message = f"🎉 CONFIGURATION SUCCESSFUL\nIdentity added: {path_to_key.name}\nConfig file: {config_path}"
+    print(Panel(Text(success_message, justify="center"), expand=False, border_style="green"))
+
+    import subprocess
+
+    # run program
+    subprocess.run(program, shell=True, check=True, text=True)
+    print(Panel("🔐 Identity added to SSH agent", expand=False, border_style="green"))
+    return None
+
+
+if __name__ == "__main__":
+    pass

{machineconfig-5.76 → machineconfig-5.77}/src/machineconfig/settings/lf/linux/exe/previewer.sh

@@ -2,7 +2,8 @@
 # 🔍 File Preview Script for LF File Manager
 # Uses: 
 # 🖼️ chafa, viu - Image preview
-# 📝 pistol - General file preview
+# 📝 bat - Syntax-highlighted text/code preview
+# 📄 pistol - General file preview
 
 file=$1
 width="$2"
@@ -30,6 +31,10 @@ case "$file" in
     fi
     exit 0
     ;;
+  # 📝 Text/Code Files - Use bat for syntax highlighting
+  *.py|*.json|*.js|*.ts|*.html|*.css|*.scss|*.less|*.xml|*.yml|*.yaml|*.toml|*.ini|*.cfg|*.conf|*.sh|*.bash|*.zsh|*.fish|*.ps1|*.rs|*.go|*.java|*.cpp|*.c|*.h|*.hpp|*.cs|*.php|*.rb|*.pl|*.pm|*.lua|*.vim|*.sql|*.md|*.txt|*.log|*.csv|*.tsv)
+    bat --color=always --style=plain --paging=never "$file"
+    ;;
   *)
     # 📄 Default file preview
     pistol "$file"