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

machineconfig/settings/shells/wt/settings.json

@@ -1,71 +1,64 @@
 {
     "$help": "https://aka.ms/terminal-documentation",
     "$schema": "https://aka.ms/terminal-profiles-schema",
-    "actions":
+    "actions": [],
+    "copyFormatting": "none",
+    "copyOnSelect": true,
+    "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
+    "focusFollowMouse": true,
+    "keybindings": 
     [
         {
-            "command": "find",
-            "keys": "ctrl+shift+f"
+            "id": "Terminal.TogglePaneZoom",
+            "keys": "ctrl+shift+z"
         },
         {
-            "command":
-            {
-                "action": "splitPane",
-                "split": "auto",
-                "splitMode": "duplicate"
-            },
-            "keys": "alt+shift+d"
+            "id": "Terminal.PasteFromClipboard",
+            "keys": "ctrl+v"
         },
         {
-            "command": "paste",
-            "keys": "ctrl+v"
+            "id": "Terminal.FindText",
+            "keys": "ctrl+shift+f"
         },
         {
-            "command":
-            {
-                "action": "copy",
-                "singleLine": false
-            },
-            "keys": "ctrl+c"
+            "id": "Terminal.DuplicatePaneAuto",
+            "keys": "alt+shift+d"
         },
         {
-            "command": "unbound",
-            "keys": "ctrl+alt+down"
+            "id": "Terminal.CopyToClipboard",
+            "keys": "ctrl+c"
         },
         {
-            "command": "togglePaneZoom",
-            "keys": "ctrl+shift+z"
+            "id": null,
+            "keys": "ctrl+alt+down"
         },
         {
-            "command": "toggleSplitOrientation",
+            "id": "Terminal.ToggleSplitOrientation",
             "keys": "ctrl+shift+l"
         }
     ],
-    "copyFormatting": "none",
-    "copyOnSelect": true,
-    "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
-    "focusFollowMouse": true,
     "launchMode": "fullscreen",
-    "newTabMenu":
+    "newTabMenu": 
     [
         {
             "type": "remainingProfiles"
         }
     ],
-    "profiles":
+    "profiles": 
     {
-        "defaults":
+        "defaults": 
         {
+            "colorScheme": "Campbell (modified)",
             "padding": "0",
             "useAcrylic": false
         },
-        "list":
+        "list": 
         [
             {
                 "commandline": "pwsh",
                 "cursorColor": "#D4D8E1",
                 "cursorShape": "filledBox",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -91,7 +84,7 @@
             },
             {
                 "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -149,7 +142,7 @@
             }
         ]
     },
-    "schemes":
+    "schemes": 
     [
         {
             "background": "#000000",
@@ -167,59 +160,13 @@
             "cyan": "#3A96DD",
             "foreground": "#CCCCCC",
             "green": "#13A10E",
-            "name": "Campbell",
+            "name": "Campbell (modified)",
             "purple": "#881798",
             "red": "#C50F1F",
             "selectionBackground": "#FFFFFF",
             "white": "#CCCCCC",
             "yellow": "#C19C00"
         },
-        {
-            "background": "#012456",
-            "black": "#0C0C0C",
-            "blue": "#0037DA",
-            "brightBlack": "#767676",
-            "brightBlue": "#3B78FF",
-            "brightCyan": "#61D6D6",
-            "brightGreen": "#16C60C",
-            "brightPurple": "#B4009E",
-            "brightRed": "#E74856",
-            "brightWhite": "#F2F2F2",
-            "brightYellow": "#F9F1A5",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#3A96DD",
-            "foreground": "#CCCCCC",
-            "green": "#13A10E",
-            "name": "Campbell Powershell",
-            "purple": "#881798",
-            "red": "#C50F1F",
-            "selectionBackground": "#FFFFFF",
-            "white": "#CCCCCC",
-            "yellow": "#C19C00"
-        },
-        {
-            "name": "deep",
-            "black": "#000000",
-            "red": "#d70005",
-            "green": "#1cd915",
-            "yellow": "#d9bd26",
-            "blue": "#5665ff",
-            "purple": "#b052da",
-            "cyan": "#50d2da",
-            "white": "#e0e0e0",
-            "brightBlack": "#535353",
-            "brightRed": "#fb0007",
-            "brightGreen": "#22ff18",
-            "brightYellow": "#fedc2b",
-            "brightBlue": "#9fa9ff",
-            "brightPurple": "#e09aff",
-            "brightCyan": "#8df9ff",
-            "brightWhite": "#ffffff",
-            "background": "#090909",
-            "foreground": "#cdcdcd",
-            "selectionBackground": "#780002",
-            "cursorColor": "#d0d0d0"
-        },
         {
             "background": "#FBFBFB",
             "black": "#403F53",
@@ -266,52 +213,6 @@
             "white": "#FFFFFF",
             "yellow": "#ADDB67"
         },
-        {
-            "background": "#282C34",
-            "black": "#282C34",
-            "blue": "#61AFEF",
-            "brightBlack": "#5A6374",
-            "brightBlue": "#61AFEF",
-            "brightCyan": "#56B6C2",
-            "brightGreen": "#98C379",
-            "brightPurple": "#C678DD",
-            "brightRed": "#E06C75",
-            "brightWhite": "#DCDFE4",
-            "brightYellow": "#E5C07B",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#56B6C2",
-            "foreground": "#DCDFE4",
-            "green": "#98C379",
-            "name": "One Half Dark",
-            "purple": "#C678DD",
-            "red": "#E06C75",
-            "selectionBackground": "#FFFFFF",
-            "white": "#DCDFE4",
-            "yellow": "#E5C07B"
-        },
-        {
-            "background": "#FAFAFA",
-            "black": "#383A42",
-            "blue": "#0184BC",
-            "brightBlack": "#4F525D",
-            "brightBlue": "#61AFEF",
-            "brightCyan": "#56B5C1",
-            "brightGreen": "#98C379",
-            "brightPurple": "#C577DD",
-            "brightRed": "#DF6C75",
-            "brightWhite": "#FFFFFF",
-            "brightYellow": "#E4C07A",
-            "cursorColor": "#4F525D",
-            "cyan": "#0997B3",
-            "foreground": "#383A42",
-            "green": "#50A14F",
-            "name": "One Half Light",
-            "purple": "#A626A4",
-            "red": "#E45649",
-            "selectionBackground": "#FFFFFF",
-            "white": "#FAFAFA",
-            "yellow": "#C18301"
-        },
         {
             "background": "#000000",
             "black": "#00FF00",
@@ -335,98 +236,6 @@
             "white": "#00FF00",
             "yellow": "#00FF00"
         },
-        {
-            "background": "#002B36",
-            "black": "#002B36",
-            "blue": "#268BD2",
-            "brightBlack": "#073642",
-            "brightBlue": "#839496",
-            "brightCyan": "#93A1A1",
-            "brightGreen": "#586E75",
-            "brightPurple": "#6C71C4",
-            "brightRed": "#CB4B16",
-            "brightWhite": "#FDF6E3",
-            "brightYellow": "#657B83",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#2AA198",
-            "foreground": "#839496",
-            "green": "#859900",
-            "name": "Solarized Dark",
-            "purple": "#D33682",
-            "red": "#DC322F",
-            "selectionBackground": "#FFFFFF",
-            "white": "#EEE8D5",
-            "yellow": "#B58900"
-        },
-        {
-            "background": "#FDF6E3",
-            "black": "#002B36",
-            "blue": "#268BD2",
-            "brightBlack": "#073642",
-            "brightBlue": "#839496",
-            "brightCyan": "#93A1A1",
-            "brightGreen": "#586E75",
-            "brightPurple": "#6C71C4",
-            "brightRed": "#CB4B16",
-            "brightWhite": "#FDF6E3",
-            "brightYellow": "#657B83",
-            "cursorColor": "#002B36",
-            "cyan": "#2AA198",
-            "foreground": "#657B83",
-            "green": "#859900",
-            "name": "Solarized Light",
-            "purple": "#D33682",
-            "red": "#DC322F",
-            "selectionBackground": "#FFFFFF",
-            "white": "#EEE8D5",
-            "yellow": "#B58900"
-        },
-        {
-            "background": "#000000",
-            "black": "#000000",
-            "blue": "#3465A4",
-            "brightBlack": "#555753",
-            "brightBlue": "#729FCF",
-            "brightCyan": "#34E2E2",
-            "brightGreen": "#8AE234",
-            "brightPurple": "#AD7FA8",
-            "brightRed": "#EF2929",
-            "brightWhite": "#EEEEEC",
-            "brightYellow": "#FCE94F",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#06989A",
-            "foreground": "#D3D7CF",
-            "green": "#4E9A06",
-            "name": "Tango Dark",
-            "purple": "#75507B",
-            "red": "#CC0000",
-            "selectionBackground": "#FFFFFF",
-            "white": "#D3D7CF",
-            "yellow": "#C4A000"
-        },
-        {
-            "background": "#FFFFFF",
-            "black": "#000000",
-            "blue": "#3465A4",
-            "brightBlack": "#555753",
-            "brightBlue": "#729FCF",
-            "brightCyan": "#34E2E2",
-            "brightGreen": "#8AE234",
-            "brightPurple": "#AD7FA8",
-            "brightRed": "#EF2929",
-            "brightWhite": "#EEEEEC",
-            "brightYellow": "#FCE94F",
-            "cursorColor": "#000000",
-            "cyan": "#06989A",
-            "foreground": "#555753",
-            "green": "#4E9A06",
-            "name": "Tango Light",
-            "purple": "#75507B",
-            "red": "#CC0000",
-            "selectionBackground": "#FFFFFF",
-            "white": "#D3D7CF",
-            "yellow": "#C4A000"
-        },
         {
             "background": "#300A24",
             "black": "#171421",
@@ -450,52 +259,6 @@
             "white": "#CCCCCC",
             "yellow": "#A2734C"
         },
-        {
-            "background": "#300A24",
-            "black": "#171421",
-            "blue": "#0037DA",
-            "brightBlack": "#767676",
-            "brightBlue": "#08458F",
-            "brightCyan": "#2C9FB3",
-            "brightGreen": "#26A269",
-            "brightPurple": "#A347BA",
-            "brightRed": "#C01C28",
-            "brightWhite": "#F2F2F2",
-            "brightYellow": "#A2734C",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#3A96DD",
-            "foreground": "#FFFFFF",
-            "green": "#26A269",
-            "name": "Ubuntu-ColorScheme",
-            "purple": "#881798",
-            "red": "#C21A23",
-            "selectionBackground": "#FFFFFF",
-            "white": "#CCCCCC",
-            "yellow": "#A2734C"
-        },
-        {
-            "background": "#000000",
-            "black": "#000000",
-            "blue": "#000080",
-            "brightBlack": "#808080",
-            "brightBlue": "#0000FF",
-            "brightCyan": "#00FFFF",
-            "brightGreen": "#00FF00",
-            "brightPurple": "#FF00FF",
-            "brightRed": "#FF0000",
-            "brightWhite": "#FFFFFF",
-            "brightYellow": "#FFFF00",
-            "cursorColor": "#FFFFFF",
-            "cyan": "#008080",
-            "foreground": "#C0C0C0",
-            "green": "#008000",
-            "name": "Vintage",
-            "purple": "#800080",
-            "red": "#800000",
-            "selectionBackground": "#FFFFFF",
-            "white": "#C0C0C0",
-            "yellow": "#808000"
-        },
         {
             "background": "#010C18",
             "black": "#0B3B61",
@@ -518,9 +281,31 @@
             "selectionBackground": "#38FF9C",
             "white": "#16FDA2",
             "yellow": "#FFF383"
+        },
+        {
+            "background": "#090909",
+            "black": "#000000",
+            "blue": "#5665FF",
+            "brightBlack": "#535353",
+            "brightBlue": "#9FA9FF",
+            "brightCyan": "#8DF9FF",
+            "brightGreen": "#22FF18",
+            "brightPurple": "#E09AFF",
+            "brightRed": "#FB0007",
+            "brightWhite": "#FFFFFF",
+            "brightYellow": "#FEDC2B",
+            "cursorColor": "#D0D0D0",
+            "cyan": "#50D2DA",
+            "foreground": "#CDCDCD",
+            "green": "#1CD915",
+            "name": "deep",
+            "purple": "#B052DA",
+            "red": "#D70005",
+            "selectionBackground": "#780002",
+            "white": "#E0E0E0",
+            "yellow": "#D9BD26"
         }
     ],
-    "startOnUserLogin": true,
     "theme": "dark",
     "themes": []
 }

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -49,6 +49,7 @@ else
     """
 fi
 
+
 echo """#=======================================================================
 🔒 SSH SERVER | Remote access setup
 #=======================================================================
@@ -76,7 +77,9 @@ echo """#=======================================================================
 
 🔐 Method 2: USING SSH
     FROM REMOTE, RUN:
-    fptx ~/dotfiles \$USER@\$(hostname):^ -z
+    fptx ~/dotfiles $USER@$(hostname):^ -z
+    # OR, using IP address if router has not yet found the hostname:
+    fptx ~/dotfiles $USER@$(hostname -I | awk '{print $1}'):^ -z
 
 ☁️  Method 3: USING INTERNET SECURE SHARE
     cd ~
@@ -138,7 +141,7 @@ if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
     sudo nala install libssl-dev -y
     sudo nala install ffmpeg -y
-    python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code,docker,warp-cli
+    python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code
 else
     echo """    ⏭️  Skipping development tools installation
     """

machineconfig/setup_windows/wt_and_pwsh/set_pwsh_theme.py

@@ -5,12 +5,9 @@ https://glitchbone.github.io/vscode-base16-term/#/3024
 """
 
 
-# # import crocodile.environment as env
-from crocodile.file_management import P
-# from crocodile.meta import Terminal
+from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.utils import LIBRARY_ROOT
 from machineconfig.utils.installer_utils.installer_class import Installer
-# import os
 import subprocess
 
 
@@ -36,8 +33,8 @@ def install_nerd_fonts():
     folder.search("*LICENSE*").apply(lambda p: p.delete(sure=True))
     
     print("⚙️  Installing fonts via PowerShell...")
-    file = P.tmpfile(suffix=".ps1").write_text(LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text().replace(r".\fonts-to-be-installed", str(folder)))
-    subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {file.to_str()}", check=True)
+    file = PathExtended.tmpfile(suffix=".ps1").write_text(LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text().replace(r".\fonts-to-be-installed", str(folder)))
+    subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {str(file)}", check=True)
     
     print("🗑️  Cleaning up temporary files...")
     folder.delete(sure=True)

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -1,8 +1,9 @@
 """Set Windows Terminal Settings
 """
 
-from crocodile.core import randstr, List as L
-from crocodile.file_management import P, Read, Save
+from machineconfig.utils.utils2 import randstr, read_json
+from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.io_save import save_json
 import crocodile.environment as env
 from machineconfig.utils.utils import LIBRARY_ROOT
 from uuid import uuid4
@@ -34,20 +35,21 @@ class TerminalSettings(object):
         if not isinstance(tmp, str):
             print("❌ ERROR: Could not find LOCALAPPDATA environment variable!")
             raise ValueError("Could not find LOCALAPPDATA environment variable.")
-        self.path = P(tmp).joinpath(r"Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json")
+        self.path = PathExtended(tmp).joinpath(r"Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json")
         backup_name = f".orig_{randstr()}"
         print(f"📝 Creating backup of original settings as {backup_name}...")
         self.path.copy(append=backup_name)
         print(f"📂 Loading Windows Terminal settings from: {self.path}")
-        self.dat: dict[str, Any] = Read.json(self.path)
-        self.profs = L(self.dat["profiles"]["list"])
+        self.dat: dict[str, Any] = read_json(self.path)
+        # Use a plain Python list for profiles
+        self.profs = list(self.dat["profiles"]["list"])
         console = Console()
         console.print(Panel(f"✅ Successfully loaded {len(self.profs)} profiles", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
 
     def save_terminal_settings(self):
         print(f"\n💾 Saving terminal settings to: {self.path}")
         self.dat["profiles"]["list"] = list(self.profs)
-        Save.json(obj=self.dat, path=self.path, indent=5)
+        save_json(obj=self.dat, path=self.path, indent=5)
         console.print(Panel("✅ Settings saved successfully!", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
 
     # ========================= Terminal Settings =========================================
@@ -80,7 +82,7 @@ class TerminalSettings(object):
         
         for idx, item in enumerate(self.profs):
             if item["name"] == "PowerShell":
-                self.profs.list[idx].update(pwsh)
+                self.profs[idx].update(pwsh)
                 console.print(Panel("✅ PowerShell profile customized successfully", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
                 break
         else:
@@ -124,7 +126,7 @@ class TerminalSettings(object):
                       guid="{" + str(uuid4()) + "}",
                       startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
                       )
-        if self.profs.filter(lambda x: x["name"] == "Ubuntu").__len__() < 1:
+        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:
@@ -144,7 +146,7 @@ class TerminalSettings(object):
             elif name == "Command Prompt": cmd = profile
             elif name == "Azure Cloud Shell": azure = profile
             else: others.append(profile)
-        self.profs = L([item for item in [pwsh, croshell, ubuntu, wpwsh, cmd, azure] + others if item is not None])
+        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"))
 
 

machineconfig/utils/ai/url2md.py

@@ -1,4 +1,4 @@
-from crocodile.core import randstr
+from machineconfig.utils.utils2 import randstr
 from pathlib import Path
 import subprocess
 import multiprocessing
@@ -48,7 +48,7 @@ commands: list[str] = []
 for a_url in relevant_urls:
     commands.append(f"""curl {a_url} | html2markdown --output {op_dir.joinpath(a_url.split('/')[-1] + "_" + randstr(5) + ".md")} """)
 
-def run_command(cmd):
+def run_command(cmd: str) -> bool:
     try:
         _result = subprocess.run(cmd, shell=True, check=True, capture_output=True, text=True)
         print(f"✅ Completed: {cmd[:60]} ...")

machineconfig/utils/cloud/onedrive/setup_oauth.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+"""
+OneDrive OAuth Setup Script
+
+This script helps you set up OAuth authentication for OneDrive without rclone.
+Run this script to complete the initial OAuth setup.
+"""
+
+import sys
+from pathlib import Path
+
+# Add the parent directory to the path so we can import transaction
+sys.path.insert(0, str(Path(__file__).parent))
+
+# from transaction import setup_oauth_authentication, CLIENT_ID, CLIENT_SECRET, REDIRECT_URI
+from machineconfig.utils.cloud.onedrive.transaction import CLIENT_ID, CLIENT_SECRET, REDIRECT_URI, setup_oauth_authentication
+
+def main():
+    """Main setup function."""
+    print("🔧 OneDrive OAuth Setup")
+    print("=" * 40)
+    
+    # Check if environment variables are set
+    if CLIENT_ID == "your_client_id_here":
+        print("\n❌ ONEDRIVE_CLIENT_ID environment variable not set!")
+        print("\n📋 Azure App Registration Setup:")
+        print("1. Go to https://portal.azure.com")
+        print("2. Navigate to 'Azure Active Directory' > 'App registrations'")
+        print("3. Click 'New registration'")
+        print("4. Name: 'OneDrive API Access'")
+        print("5. Supported account types: 'Personal Microsoft accounts only'")
+        print("6. Redirect URI: 'Web' -> 'http://localhost:8080/callback'")
+        print("7. Click 'Register'")
+        print("\n📋 After registration:")
+        print("8. Copy the 'Application (client) ID'")
+        print("9. Go to 'API permissions' > 'Add a permission'")
+        print("10. Select 'Microsoft Graph' > 'Delegated permissions'")
+        print("11. Add 'Files.ReadWrite.All' and 'offline_access'")
+        print("12. Click 'Grant admin consent' (if required)")
+        print("\n📋 Set environment variables:")
+        print("   export ONEDRIVE_CLIENT_ID='your_client_id_here'")
+        print("   export ONEDRIVE_REDIRECT_URI='http://localhost:8080/callback'")
+        print("\n🔄 Then run this script again.")
+        return
+    
+    print(f"✅ Client ID: {CLIENT_ID}")
+    print(f"✅ Redirect URI: {REDIRECT_URI}")
+    
+    if CLIENT_SECRET and CLIENT_SECRET != "your_client_secret_here":
+        print("✅ Client Secret: [SET]")
+    else:
+        print("ℹ️  Client Secret: [NOT SET - Using public client mode]")
+    
+    print("\n🚀 Starting OAuth setup...")
+    setup_oauth_authentication()
+
+
+if __name__ == "__main__":
+    main()