machineconfig 1.94__py3-none-any.whl → 1.95__py3-none-any.whl

machineconfig/scripts/python/helpers/helpers2.py

@@ -1,28 +1,28 @@
-
-
 from crocodile.core import Struct
 from crocodile.file_management import Read
 from machineconfig.scripts.python.helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
 from machineconfig.utils.utils import DEFAULTS_PATH
 from typing import Optional
+from rich.console import Console
+from rich.panel import Panel
 
 
 ES = "^"  # chosen carefully to not mean anything on any shell. `$` was a bad choice.
+console = Console()
 
 
 def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str, str, str]:
+    print("Source:", source)
+    print("Target:", target)
     config = args.config
     if config == "ss":
         cloud_maybe: Optional[str] = target.split(":")[0]
-        if cloud_maybe == "": cloud_maybe = source.split(":")[0]
+        # if cloud_maybe == "": cloud_maybe = source.split(":")[0]
         if cloud_maybe == "": cloud_maybe = None
+        print("cloud_maybe:", cloud_maybe)
         maybe_config = get_secure_share_cloud_config(interactive=True, cloud=cloud_maybe)
     elif config is not None:
-        print(f"""
-╭{'─' * 70}╮
-│ 📄 Loading configuration from: {config}                   │
-╰{'─' * 70}╯
-""")
+        console.print(Panel(f"📄 Loading configuration from: {config}", width=150, border_style="blue"))
         maybe_config = Args.from_config(absolute(config))
     else:
         maybe_config = None
@@ -55,11 +55,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
 
         if maybe_config is None:
             default_cloud: str=Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
-            print(f"""
-╭{'─' * 70}╮
-│ ⚠️  No cloud config found. Using default cloud: {default_cloud}            │
-╰{'─' * 70}╯
-""")
+            console.print(Panel(f"⚠️  No cloud config found. Using default cloud: {default_cloud}", width=150, border_style="yellow"))
             source = default_cloud + ":" + source[1:]
         else:
             tmp = maybe_config
@@ -74,18 +70,17 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
     if target.startswith(":"):  # default cloud name is omitted cloud_name:  # or ES in target
         assert ES not in source, "Not Implemented here yet."
         path = absolute(source)
-        if maybe_config is None: maybe_config = find_cloud_config(path)
+        if maybe_config is None:
+            maybe_config = find_cloud_config(path)
 
         if maybe_config is None:
             default_cloud = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
-            print(f"""
-╭{'─' * 70}╮
-│ ⚠️  No cloud config found. Using default cloud: {default_cloud}            │
-╰{'─' * 70}╯
-""")
+            console.print(Panel(f"⚠️  No cloud config found. Using default cloud: {default_cloud}", width=150, border_style="yellow"))
             target = default_cloud + ":" + target[1:]
+            print("target mutated to:", target, f"because of default cloud being {default_cloud}")
         else:
             tmp = maybe_config
+            # print("target mutated to:", target, f"because of cloud config being {tmp.cloud}")
             target = f"{tmp.cloud}:" + target[1:]
             root = tmp.root
             rel2home = tmp.rel2home
@@ -131,19 +126,10 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
         if zip_arg and ".zip" not in target: target += ".zip"
         if encrypt and ".enc" not in target: target += ".enc"
     else:
-        raise ValueError(f"""
-╔{'═' * 70}╗
-║ ❌ ERROR: Invalid path configuration                                      ║
-╠{'═' * 70}╣
-║ Either source or target must be a remote path (i.e. machine:path)        ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("❌ ERROR: Invalid path configuration\nEither source or target must be a remote path (i.e. machine:path)", title="[bold red]Error[/bold red]", border_style="red"))
+        raise ValueError(f"Either source or target must be a remote path (i.e. machine:path)\nGot: source: `{source}`, target: `{target}`")
 
-    print(f"""
-╭{'─' * 70}╮
-│ 🔍 Path resolution complete                                               │
-╰{'─' * 70}╯
-""")
+    console.print(Panel("🔍 Path resolution complete", title="[bold blue]Resolution[/bold blue]", border_style="blue"))
     Struct({"cloud": cloud, "source": str(source), "target": str(target)}).print(as_config=True, title="CLI Resolution")
     _ = pwd, encrypt, zip_arg, share
     return cloud, str(source), str(target)

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -1,17 +1,17 @@
-
 from crocodile.file_management import P, Read
 from crocodile.meta import Terminal
 from machineconfig.scripts.python.get_zellij_cmd import get_zellij_cmd
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, get_shell_script, write_shell_script
+from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH
+from machineconfig.utils.code import write_shell_script_to_file
 import platform
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
 
 
 def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cloud: str):
-    print(f"""
-╔{'═' * 70}╗
-║ 🗑️  Deleting remote repo copy and pushing local copy                       ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel("🗑️  Deleting remote repo copy and pushing local copy", title="[bold blue]Repo Sync[/bold blue]", border_style="blue"))
     repo_sync_root = P(remote_repo).expanduser().absolute()
     repo_root_path = P(local_repo).expanduser().absolute()
     repo_sync_root.delete(sure=True)
@@ -20,21 +20,13 @@ def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cl
     from git.repo import Repo
     try:
         Remote.remove(Repo(repo_root_path), "originEnc")
-        print("🔗 Removed originEnc remote reference")
+        console.print(Panel("🔗 Removed originEnc remote reference", border_style="blue"))
     except Exception: pass  # type: ignore
-    print(f"""
-╭{'─' * 70}╮
-│ 📤 Uploading local repository to cloud...                                │
-╰{'─' * 70}╯
-""")
+    console.print(Panel(f"📈 Deleting remote repository copy and pushing local changes", width=150, border_style="blue"))
 
     repo_root_path.to_cloud(cloud=cloud, zip=True, encrypt=True, rel2home=True, os_specific=False)
 
-    print(f"""
-╔{'═' * 70}╗
-║ ✅ Repository successfully pushed to cloud                                ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel("✅ Repository successfully pushed to cloud", title="[bold green]Repo Sync[/bold green]", border_style="green"))
 
 
 # import sys
@@ -50,59 +42,36 @@ def get_wt_cmd(wd1: P, wd2: P) -> str:
 
 
 def inspect_repos(repo_local_root: str, repo_remote_root: str):
-    print(f"""
-╔{'═' * 70}╗
-║ 🔍 Inspecting Repositories                                                ║
-╠{'═' * 70}╣
-║ 📂 Local:  {repo_local_root}                      
-║ 📂 Remote: {repo_remote_root}                    
-╚{'═' * 70}╝
-""")
+    console.print(Panel(f"📂 Local:  {repo_local_root}\n📂 Remote: {repo_remote_root}", title="[bold blue]🔍 Inspecting Repositories[/bold blue]", border_style="blue"))
 
     if platform.system() == "Windows":
         program = get_wt_cmd(wd1=P(repo_local_root), wd2=P(repo_local_root))
-        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
+        write_shell_script_to_file(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
         return None
     elif platform.system() == "Linux":
         program = get_zellij_cmd(wd1=P(repo_local_root), wd2=P(repo_remote_root))
-        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
+        write_shell_script_to_file(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
         return None
     else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
 
 
 def fetch_dotfiles():
-    print(f"""
-╔{'═' * 70}╗
-║ 📁 Fetching Dotfiles                                                      ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel("📁 Fetching Dotfiles", title="[bold blue]Dotfiles[/bold blue]", border_style="blue"))
 
     cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
-    print(f"""
-╭{'─' * 70}╮
-│ ⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}     │
-╰{'─' * 70}╯
-""")
+    console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", width=150, border_style="yellow"))
 
     dotfiles_local = P.home().joinpath("dotfiles")
     CONFIG_PATH.joinpath("remote").create()
     dotfiles_remote = CONFIG_PATH.joinpath("remote", dotfiles_local.rel2home())
     remote_path = dotfiles_local.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
 
-    print(f"""
-╭{'─' * 70}╮
-│ 📥 Downloading dotfiles from cloud...                                    │
-╰{'─' * 70}╯
-""")
+    console.print(Panel(f"📥 Downloading dotfiles from cloud...", width=150, border_style="blue"))
 
     dotfiles_remote.from_cloud(remotepath=remote_path, cloud=cloud_resolved,
         unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=None)
 
-    print(f"""
-╭{'─' * 70}╮
-│ 🗑️  Removing old dotfiles and replacing with cloud version...            │
-╰{'─' * 70}╯
-""")
+    console.print(Panel(f"🗑️  Removing old dotfiles and replacing with cloud version...", width=150, border_style="blue"))
 
     dotfiles_local.delete(sure=True)
     dotfiles_remote.move(folder=P.home())
@@ -115,12 +84,8 @@ sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
-    shell_path = get_shell_script(shell_script=script)
+    shell_path = write_shell_script_to_file(shell_script=script)
     Terminal().run(f". {shell_path}", shell="bash").capture().print()
 
-    print(f"""
-╔{'═' * 70}╗
-║ ✅ Dotfiles successfully fetched and installed                            ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel("✅ Dotfiles successfully fetched and installed", title="[bold green]Dotfiles[/bold green]", border_style="green"))
 

machineconfig/scripts/python/pomodoro.py

@@ -31,8 +31,8 @@ def pomodoro(work: int = 25, rest: int = 5, repeats: int = 4):
     def speak(txt: str):
         print(f"🔊 Speaking: {txt}")
         install_n_import("gtts").gTTS(txt, lang='en', tld='com.au').save(tmp := P.tmpfile(suffix=".mp3"))
-        time.sleep(0.5)
         pyglet = install_n_import("pyglet")
+        time.sleep(0.5)
         pyglet.resource.path = [tmp.parent.to_str()]
         pyglet.resource.reindex()
         pyglet.resource.media(tmp.name).play()

machineconfig/scripts/python/repos.py

@@ -25,11 +25,11 @@ class GitAction(Enum):
 class RepoRecord:
     name: str
     parent_dir: str
-    remotes: list[str]
+    remotes: dict[str, str]  # Fixed: should be dict mapping remote name to URL
     version: dict[str, str]
 
 
-def git_action(path: P, action: GitAction, mess: Optional[str] = None, r: bool=False) -> str:
+def git_action(path: P, action: GitAction, mess: Optional[str] = None, r: bool = False, uv_sync: bool = False) -> str:
     from git.exc import InvalidGitRepositoryError
     from git.repo import Repo
     try:
@@ -37,25 +37,27 @@ def git_action(path: P, action: GitAction, mess: Optional[str] = None, r: bool=F
     except InvalidGitRepositoryError:
         pprint(f"⚠️ Skipping {path} because it is not a git repository.")
         if r:
-            prgs = [git_action(path=sub_path, action=action, mess=mess, r=r) for sub_path in path.search()]
+            prgs = [git_action(path=sub_path, action=action, mess=mess, r=r, uv_sync=uv_sync) for sub_path in path.search()]
             return "\n".join(prgs)
         else: return "\necho 'skipped because not a git repo'\n\n"
 
     program = f'''
-🔧 echo '>>>>>>>>> {action}'
+echo '>>>>>>>>> 🔧{action}'
 cd '{path}'
 '''
     if action == GitAction.commit:
         if mess is None: mess = "auto_commit_" + randstr()
         program += f'''
-🔄 git add .; git commit -am "{mess}"
+git commit -am "{mess}"
 '''
     if action == GitAction.push or action == GitAction.pull:
         action_name = "pull" if action == GitAction.pull else "push"
         cmds = [f'echo "🔄 {action_name.capitalize()}ing from {remote.url}" ; git {action_name} {remote.name} {repo.active_branch.name}' for remote in repo.remotes]
         program += '\n' + '\n'.join(cmds) + '\n'
-    program = program + '''
-✅ echo ""; echo ""
+    uv_sync = "uv sync" if uv_sync else ""
+    program = program + f'''
+{uv_sync}
+echo "✅"; echo ""
 '''
     return program
 
@@ -70,6 +72,7 @@ def main():
     parser.add_argument("directory", help="📁 Folder containing repos to record or a specs JSON file to follow.", default="")
     # FLAGS
     parser.add_argument("--push", help="🚀 Push changes.", action="store_true")
+    parser.add_argument("--uv_sync", help="🔄 Sync UV dependencies.", action="store_true")
     parser.add_argument("--pull", help="⬇️ Pull changes.", action="store_true")
     parser.add_argument("--commit", help="💾 Commit changes.", action="store_true")
     parser.add_argument("--all", help="🔄 Pull, commit, and push changes.", action="store_true")
@@ -98,7 +101,7 @@ def main():
     elif args.clone or args.checkout or args.checkout_to_branch:
         print("\n📥 Cloning or checking out repositories...")
         program += """\necho '>>>>>>>>> Cloning Repos'\n"""
-        if not repos_root.exists() or repos_root.stem != 'repos.json':  # user didn't pass absolute path to pickle file, but rather expected it to be in the default save location
+        if not repos_root.exists() or repos_root.name != 'repos.json':  # Fixed: use name instead of stem
             repos_root = CONFIG_PATH.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
             if not repos_root.exists():
                 if args.cloud is None:
@@ -111,12 +114,12 @@ def main():
         assert (repos_root.exists() and repos_root.name == 'repos.json') or args.cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
         program += install_repos(specs_path=str(repos_root), clone=args.clone, checkout_to_recorded_commit=args.checkout, checkout_to_branch=args.checkout_to_branch)
     elif args.all or args.commit or args.pull or args.push:
-        print("\n🔄 Performing Git actions on repositories...")
+        print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")
         for a_path in repos_root.search("*"):
             program += f"""echo "{("Handling " + str(a_path)).center(80, "-")}" """
-            if args.pull or args.all: program += git_action(path=a_path, action=GitAction.pull, r=args.recursive)
-            if args.commit or args.all: program += git_action(a_path, action=GitAction.commit, r=args.recursive)
-            if args.push or args.all: program += git_action(a_path, action=GitAction.push, r=args.recursive)
+            if args.pull or args.all: program += git_action(path=a_path, action=GitAction.pull, r=args.recursive, uv_sync=args.uv_sync)
+            if args.commit or args.all: program += git_action(a_path, action=GitAction.commit, r=args.recursive, uv_sync=args.uv_sync)
+            if args.push or args.all: program += git_action(a_path, action=GitAction.push, r=args.recursive, uv_sync=args.uv_sync)
     else: program = "echo '❌ No action specified. Try passing --push, --pull, --commit, or --all.'"
     write_shell_script_to_default_program_path(program=program, desc="Script to update repos", preserve_cwd=True, display=True, execute=False)
 
@@ -164,28 +167,40 @@ def install_repos(specs_path: str, clone: bool=True, checkout_to_recorded_commit
     repos: list[dict[str, Any]] = Read.json(path_obj)
     for repo in repos:
         parent_dir = P(repo["parent_dir"]).expanduser().absolute().create()
-        for idx, (remote_name, remote_url) in enumerate(repo["remotes"].items()):
-            if clone:
-                if idx == 0:  # clone
-                    if preferred_remote is not None:
-                        if preferred_remote in repo["remotes"]:
-                            remote_name = preferred_remote
-                            remote_url = repo["remotes"][preferred_remote]
-                        else:
-                            print(f"⚠️ `{preferred_remote=}` not found in {repo['remotes']}.")
-                    program += f"\ncd {parent_dir.collapseuser().as_posix()}; git clone {remote_url} --origin {remote_name}"
-                    program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git remote set-url {remote_name} {remote_url}"
-                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git remote add {remote_name} {remote_url}"
-            if checkout_to_recorded_commit:
-                commit = repo['version']['commit']
-                if isinstance(commit, str): program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git checkout {commit}"
-                else: print(f"Skipping {repo['parent_dir']} because it doesn't have a commit recorded. Found {commit}")
-                break
-            if checkout_to_branch:
-                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git checkout {repo['current_branch']}"
-                break
-            if editable_install and idx == 0:
-                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; uv pip install -e ."
+        
+        # Handle cloning and remote setup
+        if clone:
+            # Select the remote to use for cloning
+            remote_name, remote_url = next(iter(repo["remotes"].items()))  # Get first remote by default
+            if preferred_remote is not None and preferred_remote in repo["remotes"]:
+                remote_name = preferred_remote
+                remote_url = repo["remotes"][preferred_remote]
+            elif preferred_remote is not None:
+                print(f"⚠️ `{preferred_remote=}` not found in {repo['remotes']}.")
+            
+            # Clone with the selected remote
+            program += f"\ncd {parent_dir.collapseuser().as_posix()}; git clone {remote_url} --origin {remote_name} --depth 2"
+            program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git remote set-url {remote_name} {remote_url}"
+            
+            # Add any additional remotes
+            for other_remote_name, other_remote_url in repo["remotes"].items():
+                if other_remote_name != remote_name:
+                    program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git remote add {other_remote_name} {other_remote_url}"
+        
+        # Handle checkout operations (after all remotes are set up)
+        if checkout_to_recorded_commit:
+            commit = repo['version']['commit']
+            if isinstance(commit, str): 
+                program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git checkout {commit}"
+            else: 
+                print(f"Skipping {repo['parent_dir']} because it doesn't have a commit recorded. Found {commit}")
+        elif checkout_to_branch:
+            program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; git checkout {repo['current_branch']}"
+        
+        # Handle editable install
+        if editable_install:
+            program += f"\ncd {parent_dir.collapseuser().as_posix()}/{repo['name']}; uv pip install -e ."
+        
         program += "\n"
     pprint(program)
     return program

machineconfig/scripts/python/wifi_conn.py

@@ -10,6 +10,10 @@ from pathlib import Path
 import os
 import platform
 import subprocess
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
 
 def create_new_connection(name: str, ssid: str, password: str):
     print(f"\n🔧 Creating new connection: {name} (SSID: {ssid})")
@@ -45,9 +49,7 @@ def display_available_networks():
     print("✅ Network scan completed!\n")
 
 def main():
-    print("\n" + "=" * 50)
-    print("📶 Welcome to the WiFi Connector Tool")
-    print("=" * 50 + "\n")
+    console.print(Panel("📶 Welcome to the WiFi Connector Tool", title="[bold blue]WiFi Connection[/bold blue]", border_style="blue"))
 
     creds = configparser.ConfigParser()
     creds.read(Path.home().joinpath('dotfiles/machineconfig/setup/wifi.ini'))

machineconfig/scripts/windows/fire.ps1

@@ -1,18 +1,33 @@
 
-$op_script = "~/tmp_results/shells/python_return_command.ps1"
-if (Test-Path $op_script ) {
-  Remove-Item $op_script
+# param(
+#     [switch]$IgnoreKeyboardInterrupt
+# )
+
+# Generate a random string of 10 characters
+$random_str = -join ((65..90) + (97..122) + (48..57) | Get-Random -Count 10 | ForEach-Object {[char]$_})
+$op_script = "$HOME\tmp_results\shells\$random_str\python_return_command.ps1"
+# Export the op_script variable to environment so python can access it
+$env:op_script = $op_script
+
+# Create directory if it doesn't exist
+$script_dir = Split-Path -Path $op_script -Parent
+if (-not (Test-Path $script_dir)) {
+    New-Item -ItemType Directory -Path $script_dir -Force | Out-Null
 }
 
+# if (Test-Path $op_script ) {
+#   Remove-Item $op_script
+# }
 
-try {
-  # $null = & chafa --version
-  # & chafa "$HOME\code\machineconfig\assets\aafire.webp" --speed 2 --duration 1
-  # Chafa.exe "$HOME\code\machineconfig\assets\aafire.webp" --speed 2 --duration 1 --symbols ascii
-  Write-Host "🔥"
-} catch {
-  Write-Host "Chafa not found, skipping."
-}
+
+# try {
+#   # $null = & chafa --version
+#   # & chafa "$HOME\code\machineconfig\assets\aafire.webp" --speed 2 --duration 1
+#   # Chafa.exe "$HOME\code\machineconfig\assets\aafire.webp" --speed 2 --duration 1 --symbols ascii
+#   Write-Host "🔥"
+# } catch {
+#   Write-Host "Chafa not found, skipping."
+# }
 
 
 . "$HOME\scripts\activate_ve.ps1" ve
@@ -21,13 +36,10 @@ python -m machineconfig.scripts.python.fire_jobs $args
 
 if (Test-Path $op_script ) {
     . $op_script
-#   content of $op_script
-#  $content = Get-Content $op_script
-#  Invoke-Expression $content | Add-History   # this way, $content will go to hisyory of powershell. You don't neet Add-history
 }
 else
 {
-    Write-Host "No output script to be executed @ $op_script"
+    Write-Host "No output script to be executed at $op_script."
 }
 
 deactivate -ErrorAction SilentlyContinue

machineconfig/setup_linux/nix/cli_installation.sh

@@ -4,8 +4,7 @@
 #=======================================================================
 # This script installs various command-line utilities using the Nix package manager
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🔄 SYSTEM UTILITIES | Installing system management tools
 #=======================================================================
 """
@@ -22,8 +21,7 @@ nix-env -iA nixpkgs.procs || true
 echo "📥 Installing watchexec - executes commands when files change..."
 nix-env -iA nixpkgs.watchexec || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 📂 FILE MANAGEMENT | Installing file browsers and utilities
 #=======================================================================
 """
@@ -58,8 +56,7 @@ nix-env -iA nixpkgs.diskonaut || true
 echo "📥 Installing kondo - cleanup tool for dev projects..."
 nix-env -iA nixpkgs.kondo || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🖼️ VISUAL TOOLS | Installing terminal visualization tools
 #=======================================================================
 """
@@ -74,8 +71,7 @@ nix-env -iA nixpkgs.bottom || true
 echo "📥 Installing delta - syntax-highlighting pager for git..."
 nix-env -iA nixpkgs.delta || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🔧 DEVELOPMENT TOOLS | Installing programming utilities
 #=======================================================================
 """
@@ -99,8 +95,7 @@ nix-env -iA nixpkgs.tokei || true
 echo "📥 Installing gitui - terminal UI for git..."
 nix-env -iA nixpkgs.gitui || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🔎 SEARCH TOOLS | Installing fuzzy finders and search utilities
 #=======================================================================
 """
@@ -113,8 +108,7 @@ nix-env -iA nixpkgs.mcfly || true
 echo "📥 Installing skim - fuzzy finder in Rust..."
 nix-env -iA nixpkgs.skim || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🌐 NETWORK & CLOUD TOOLS | Installing file transfer and cloud utilities
 #=======================================================================
 """
@@ -127,8 +121,7 @@ nix-env -iA nixpkgs.termscp || true
 echo "📥 Installing rclone - rsync for cloud storage..."
 nix-env -iA nixpkgs.rclone || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🛡️ SECURITY TOOLS | Installing password management utilities
 #=======================================================================
 """
@@ -137,8 +130,7 @@ echo """
 echo "📥 Installing gopass - team password manager with git..."
 nix-env -iA nixpkgs.gopass || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 📚 DOCUMENTATION | Installing help and reference tools
 #=======================================================================
 """
@@ -151,8 +143,7 @@ nix-env -iA nixpkgs.tldr || true
 echo "📥 Installing nushell - modern shell alternative..."
 nix-env -iA nixpkgs.nushell || true
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 ✅ INSTALLATION COMPLETE | All Nix CLI tools have been installed
 #=======================================================================
 """

machineconfig/setup_linux/others/openssh-server_add_pub_key.sh

@@ -4,14 +4,12 @@
 #=======================================================================
 # This script helps set up passwordless SSH authentication to remote Linux machines
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 ℹ️ PASSWORDLESS SSH SETUP | Manual instructions for key deployment
 #=======================================================================
 """
 
-echo """
-🔐 There are two methods to copy your public key to a remote server:
+echo """🔐 There are two methods to copy your public key to a remote server:
 
 📌 METHOD 1: Using ssh-copy-id (Linux clients only)
    ssh-copy-id username@hostname
@@ -23,8 +21,7 @@ echo """
 📌 METHOD 3: Using SFTP (detailed below)
 """
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 📋 MANUAL SFTP PROCESS | Step-by-step instructions
 #=======================================================================
 

machineconfig/setup_linux/web_shortcuts/all.sh

@@ -4,16 +4,14 @@
 #=======================================================================
 # This script provides quick access to installation scripts via web
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 📚 AVAILABLE INSTALLATION OPTIONS | Web-based installers
 #=======================================================================
 
 Choose from the following installation options:
 """
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 📦 SYSTEM APPLICATIONS | Basic system applications
 #=======================================================================
 
@@ -21,8 +19,7 @@ echo """
 # curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash
 """
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🐍 PYTHON ENVIRONMENT | Virtual environment setup
 #=======================================================================
 
@@ -30,8 +27,7 @@ Setting up Python virtual environment...
 """
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 🔄 CODE REPOSITORIES | Cloning project repositories
 #=======================================================================
 
@@ -39,8 +35,7 @@ Setting up code repositories...
 """
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash
 
-echo """
-#=======================================================================
+echo """#=======================================================================
 ⚙️  DEVELOPMENT TOOLS | Developer applications
 #=======================================================================