machineconfig 5.15__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/jobs/installer/package_groups.py

@@ -1,9 +1,16 @@
-from typing import Literal, TypeAlias, Union
+
+GUI = [
+    "brave",
+    "code",
+    "git",
+    "wezterm",
+]
 
 # AI/LLM Tools - AI-powered coding and chat assistants
-PACKAGES_AI_TOOLS = [
+AGENTS = [
     "aider",
-    "github-copilot-cli",
+    "aichat",
+    "copilot",
     "gemini",
     "crush",
     "opencode-ai",
@@ -11,18 +18,15 @@ PACKAGES_AI_TOOLS = [
     "chatgpt",
     "mods",
     "q",
+    "qwen-code",
     "cursor-cli",
     "droid",
+    "kilocode",
+    "cline",
     "auggie",
+    # "gorilla",
 ]
 
-# Tunneling/Port Forwarding - Tools for exposing local services
-PACKAGES_TUNNELING = [
-    "ngrok",
-    "devtunnel",
-    "cloudflared",
-    "forward-cli",
-]
 
 # Terminal Emulators & Shells - Terminal applications, emulators, and shell environments
 PACKAGES_TERMINAL_EMULATORS = [
@@ -41,6 +45,8 @@ PACKAGES_BROWSERS = [
     "bypass-paywalls-chrome",
     "browsh",
     "carbonyl",
+    "m365",
+    "zoomit",
 ]
 
 # Code Editors & IDEs - Code editing tools
@@ -51,34 +57,22 @@ PACKAGES_CODE_EDITORS = [
     "lvim",
 ]
 
-# Presentation & Text UI Tools - Markdown viewers, presentations, prompts, and text decoration
-PACKAGES_PRESENTATION = [
-    "patat",
-    "marp",
-    "presenterm",
-    "glow",
-    "gum",
-    "boxes",
-    "hx",
-]
+
 
 # Database Tools - Database clients and visualizers
 PACKAGES_DATABASE = [
     "SqliteBrowser",
+    "sqlite3",
+    "redis",
+    "redis-cli",
+    "postgresql-client",
+    "duckdb",
     "DBeaver",
     "rainfrog",
-    "duckdb",
-]
 
-# Documentation & Conversion - Document conversion, diagram tools, and fast file operations
-PACKAGES_DOC_CONVERSION = [
-    "mermaid-cli",
-    "html2markdown",
-    "pandoc",
-    "cpz",
-    "rmz",
 ]
 
+
 # Media & Entertainment - Music players and media tools
 PACKAGES_MEDIA = [
     "ytui-music",
@@ -90,6 +84,10 @@ PACKAGES_MEDIA = [
 
 # File Sharing & Cloud - File sharing, transfer, backup, sync, and QR tools
 PACKAGES_FILE_SHARING = [
+    "ngrok",
+    "devtunnel",
+    "cloudflared",
+    "forward-cli",
     "ffsend",
     "portal",
     "qrcp",
@@ -104,28 +102,25 @@ PACKAGES_FILE_SHARING = [
     "restic",
     "syncthing",
     "cloudreve",
+    "ots",
 ]
 
 
-# Git & Docker Tools - Version control and container utilities
-PACKAGES_GIT_DOCKER_TOOLS = [
-    "lazygit",
-    "onefetch",
-    "gitcs",
-    "lazydocker",
-]
-
 # Development Tools - Various development utilities
 PACKAGES_DEV_UTILS = [
     "devcontainer",
     "rust-analyzer",
     "evcxr",
     "geckodriver",
-    "hyperfine",
 ]
 
 # Code Analysis, Git & Docs - Code analysis, statistics, documentation, and Git tools
 PACKAGES_CODE_ANALYSIS = [
+    "lazygit",
+    "onefetch",
+    "gitcs",
+    "lazydocker",
+    "hyperfine",
     "kondo",
     "tokei",
     "navi",
@@ -133,6 +128,8 @@ PACKAGES_CODE_ANALYSIS = [
     "gitui",
     "delta",
     "gh",
+    "watchexec",
+    "jq",
 ]
 
 # Productivity & Utilities - Productivity tools, security, remote access, and terminal enhancements
@@ -140,49 +137,38 @@ PACKAGES_PRODUCTIVITY = [
     "espanso",
     "bitwarden",
     "openpomodoro-cli",
-    "just",
     "rustdesk",
-    "ots",
-    "lolcatjs",
-    "figlet-cli",
+    "mermaid-cli",
+    "html2markdown",
+    "pandoc",
+    "patat",
+    "marp",
+    "presenterm",
+    "glow",
+    "gum",
+    "hx",
 ]
 
-# Miscellaneous Tools - Other tools
-PACKAGES_MISC_DEV = [
-    "Gorilla",
-    "nerdfont",
-    "Redis",
-    "winget",
-    "transmission",
-    "exa",
-    "bytehound",
-    "atuin",
-    "xcrawl3r",
-    "obsidian",
-    "istio",
-    "cointop",
-    "nnn",
-]
 
-# Main DEV package list - combines all subgroups
-PACKAGES_NAMES_DEV = [
-    *PACKAGES_AI_TOOLS,
-    *PACKAGES_TUNNELING,
-    *PACKAGES_TERMINAL_EMULATORS,
-    *PACKAGES_BROWSERS,
-    *PACKAGES_CODE_EDITORS,
-    *PACKAGES_PRESENTATION,
-    *PACKAGES_DATABASE,
-    *PACKAGES_DOC_CONVERSION,
-    *PACKAGES_MEDIA,
-    *PACKAGES_FILE_SHARING,
-    *PACKAGES_GIT_DOCKER_TOOLS,
-    *PACKAGES_DEV_UTILS,
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_PRODUCTIVITY,
-    *PACKAGES_MISC_DEV,
+# sudo nala install cowsay -y || true
+# sudo nala install lolcat -y || true
+# sudo nala install boxes -y || true
+# sudo nala install figlet -y || true
+# sudo nala install fortune -y || true
+# sudo nala install toilet -y || true
+TERMINAL_EYE_CANDY = [
+    "lolcatjs",
+    "figlet-cli",
+    "boxes",
+    # "transmission",
+    # "bytehound",
+    # "xcrawl3r",
+    # "obsidian",
+    # "istio",
+    # "cointop",
 ]
 
+
 # System & Network Monitoring - System resource monitors, process viewers, network analysis, and system info tools
 PACKAGES_SYSTEM_MONITORS = [
     "btop",
@@ -195,33 +181,16 @@ PACKAGES_SYSTEM_MONITORS = [
     "cpufetch",
     "fastfetch",
     "topgrade",
+    "speedtest",
 ]
 
 
-# File Tools - File browsing, navigation, listing, directory jumping, and disk usage analysis
-PACKAGES_FILE_TOOLS = [
-    "xplr",
-    "joshuto",
-    "lf",
-    "tere",
-    "yazi",
-    "lsd",
-    "zoxide",
-    "diskonaut",
-    "dua",
-    "dust",
-]
-
-# File Viewers - File preview and viewing tools
-PACKAGES_FILE_VIEWERS = [
-    "pistol",
-    "bat",
-    "viu",
-]
 
 
 # Search & Archive Tools - File and content search utilities, archive management
-PACKAGES_SEARCH = [
+PACKAGES_FILE = [
+    "nerdfont",
+    "winget",
     "fd",
     "fzf",
     "broot",
@@ -229,6 +198,23 @@ PACKAGES_SEARCH = [
     "rga",
     "ugrep",
     "ouch",
+    "pistol",
+    "bat",
+    "viu",
+    # "xplr",
+    # "joshuto",
+    # "lf",
+    # "nnn",
+    "yazi",
+    "tere",
+    # "exa",
+    "lsd",
+    "zoxide",
+    "diskonaut",
+    "dua",
+    "dust",
+    "cpz",
+    "rmz",
 ]
 
 # Terminal & Shell Enhancements - Terminal multiplexers, shell history, and prompts
@@ -236,92 +222,34 @@ PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
     "mcfly",
+    "atuin",
     "starship",
-]
-
-
-
-# Cloud & Utilities - Cloud storage, file watching, web terminal, and presentation tools
-PACKAGES_CLOUD_UTILS = [
-    "rclone",
-    "watchexec",
-    "m365",
-    "zoomit",
-    "speedtest",
-]
-
-# Web Sharing - Share terminal over web
-PACKAGES_WEB_TERMINAL = [
     "gotty",
     "ttyd",
-]
-
-
-# Main ESSENTIAL package list - combines all subgroups
-PACKAGES_NAMES_ESSENTIAL = [
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_PRESENTATION,
-    *PACKAGES_FILE_VIEWERS,
-    *PACKAGES_FILE_TOOLS,
-    *PACKAGES_SYSTEM_MONITORS,
-    *PACKAGES_WEB_TERMINAL,
-    *PACKAGES_TERMINAL_SHELL,
-    *PACKAGES_SEARCH,
-    *PACKAGES_AI_TOOLS,
-    *PACKAGES_CLOUD_UTILS,
-]
-
-PACKAGE_GROUPS: TypeAlias = Literal[
-    "ESSENTIAL",
-    "DEV",
-    "AI_TOOLS",
-    "TUNNELING",
-    "TERMINAL_EMULATORS",
-    "BROWSERS",
-    "CODE_EDITORS",
-    "PRESENTATION",
-    "DATABASE",
-    "DOC_CONVERSION",
-    "MEDIA",
-    "FILE_SHARING",
-    "GIT_DOCKER_TOOLS",
-    "DEV_UTILS",
-    "CODE_ANALYSIS",
-    "PRODUCTIVITY",
-    "MISC_DEV",
-    "SYSTEM_MONITORS",
-    "FILE_TOOLS",
-    "FILE_VIEWERS",
-    "SEARCH",
-    "TERMINAL_SHELL",
-    "CLOUD_UTILS",
-    "WEB_TERMINAL",
-]
-PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
-    "ESSENTIAL": PACKAGES_NAMES_ESSENTIAL,
-    "DEV": PACKAGES_NAMES_DEV,
-    "AI_TOOLS": PACKAGES_AI_TOOLS,
-    "TUNNELING": PACKAGES_TUNNELING,
-    "TERMINAL_EMULATORS": PACKAGES_TERMINAL_EMULATORS,
-    "BROWSERS": PACKAGES_BROWSERS,
-    "CODE_EDITORS": PACKAGES_CODE_EDITORS,
-    "PRESENTATION": PACKAGES_PRESENTATION,
-    "DATABASE": PACKAGES_DATABASE,
-    "DOC_CONVERSION": PACKAGES_DOC_CONVERSION,
-    "MEDIA": PACKAGES_MEDIA,
-    "FILE_SHARING": PACKAGES_FILE_SHARING,
-    "GIT_DOCKER_TOOLS": PACKAGES_GIT_DOCKER_TOOLS,
-    "DEV_UTILS": PACKAGES_DEV_UTILS,
-    "CODE_ANALYSIS": PACKAGES_CODE_ANALYSIS,
-    "PRODUCTIVITY": PACKAGES_PRODUCTIVITY,
-    "MISC_DEV": PACKAGES_MISC_DEV,
-    "SYSTEM_MONITORS": PACKAGES_SYSTEM_MONITORS,
-    "FILE_TOOLS": PACKAGES_FILE_TOOLS,
-    "FILE_VIEWERS": PACKAGES_FILE_VIEWERS,
-    "SEARCH": PACKAGES_SEARCH,
-    "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
-    "CLOUD_UTILS": PACKAGES_CLOUD_UTILS,
-    "WEB_TERMINAL": PACKAGES_WEB_TERMINAL,
+    "rclone",
+    "cb"
+]
+
+
+
+PACKAGE_GROUP2NAMES: dict[str, list[str]] = {
+    "sysabc": ["sysabc"],
+    "termabc": [*PACKAGES_CODE_ANALYSIS, *PACKAGES_SYSTEM_MONITORS, *PACKAGES_TERMINAL_SHELL, *PACKAGES_FILE,],
+    "gui": GUI,
+    "dev": [*PACKAGES_TERMINAL_EMULATORS, *PACKAGES_BROWSERS, *PACKAGES_CODE_EDITORS, *PACKAGES_DATABASE, *PACKAGES_MEDIA, *PACKAGES_FILE_SHARING, *PACKAGES_DEV_UTILS, *PACKAGES_CODE_ANALYSIS, *PACKAGES_PRODUCTIVITY, *TERMINAL_EYE_CANDY,],
+    "dev-utils": PACKAGES_DEV_UTILS,
+    "term-eye-candy": TERMINAL_EYE_CANDY,
+    "agents": AGENTS,
+    "terminal-emulator": PACKAGES_TERMINAL_EMULATORS,
+    "shell": PACKAGES_TERMINAL_SHELL,
+    "browsers": PACKAGES_BROWSERS,
+    "code-editors": PACKAGES_CODE_EDITORS,
+    "code-analysis": PACKAGES_CODE_ANALYSIS,
+    "db": PACKAGES_DATABASE,
+    "media": PACKAGES_MEDIA,
+    "file-sharing": PACKAGES_FILE_SHARING,
+    "productivity": PACKAGES_PRODUCTIVITY,
+    "sys-monitor": PACKAGES_SYSTEM_MONITORS,
+    "search": PACKAGES_FILE,
 }
 
-_ = Union, Literal

machineconfig/logger.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 import logging
 import os

machineconfig/profile/backup.toml

@@ -0,0 +1,49 @@
+
+# locations to be backed up to the cloud.
+
+[thunderbird_windows]
+path = '~/AppData/Roaming/Thunderbird/Profiles'
+encrypt = 'True'
+zip = 'True'
+rel2home = 'True'
+os_specific = 'True'
+
+
+[thunderbird_linux]
+path = '~/.thunderbird'
+encrypt = 'True'
+zip = 'True'
+rel2home = 'True'
+os_specific = 'True'
+
+
+[zoxide_windows]
+path = '~/AppData/Local/zoxide/db.zo'
+encrypt = 'False'
+zip = 'False'
+rel2home = 'True'
+os_specific = 'True'
+
+
+[zoxide_linux]
+path = '~/.local/share/zoxide/db.zo'
+encrypt = 'False'
+zip = 'False'
+rel2home = 'True'
+os_specific = 'True'
+
+
+#[dotfiles]
+# path = '~/dotfiles'
+# encrypt = 'True'
+# zip = 'True'
+# rel2home = 'True'
+# os_specific = 'True'
+
+
+[ipython]
+path = '~/.ipython'
+encrypt = 'True'
+zip = 'True'
+rel2home = 'True'
+os_specific = 'False'

machineconfig/profile/bash_shell_profiles.md

@@ -0,0 +1,11 @@
+
+# Non-login shells, .bashrc > .profile are read.
+# for login shells, e.g. SSH, .bash_login > .bash_profile > .profile is read.
+
+# The strategy to ensure consistent configuration for login and nonlogin shells is to put all the configuration in .bashrc, and then source it from .bash_profile and .profile.
+
+# ensure .bash_profile only calls .profile
+# ensure .profile calls .bashrc only at the end.
+
+When you login: /etc/profile -> ~/.profile -> ~/.bash_profile -> ~/.bashrc
+When you open a new terminal: ~/.bashrc

machineconfig/profile/create_helper.py

@@ -0,0 +1,74 @@
+
+from typing import Literal
+from pathlib import Path
+import shutil
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
+
+
+def _copy_path(source: Path, target: Path, overwrite: bool = False) -> None:
+    source = source.expanduser().resolve()
+    target = target.expanduser().resolve()
+    if not source.exists():
+        raise FileNotFoundError(f"Source path does not exist: {source}")
+    target.parent.mkdir(parents=True, exist_ok=True)
+    if target.exists() and not overwrite:
+        raise FileExistsError(f"Target already exists and overwrite=False: {target}")
+    if target.exists() and overwrite:
+        if target.is_dir():
+            shutil.rmtree(target)
+        else:
+            target.unlink()
+    if source.is_file():
+        shutil.copy2(source, target)
+    elif source.is_dir():
+        shutil.copytree(source, target, dirs_exist_ok=overwrite)
+    else:
+        raise ValueError(f"Source is neither file nor directory: {source}")
+
+
+def copy_assets_to_machine(which: Literal["scripts", "settings"]) -> None:
+    import platform
+    import subprocess
+    
+    system_name = platform.system().lower()
+    if system_name == "windows":
+        system = "windows"
+    elif system_name in {"linux", "darwin"}:
+        system = "linux"
+    else:
+        raise NotImplementedError(f"System {system_name} not supported")
+
+    match which:
+        case "scripts":
+            source = LIBRARY_ROOT.joinpath("scripts", system)
+            target = CONFIG_ROOT.joinpath("scripts")
+            
+            wrap_mcfg_source = LIBRARY_ROOT.joinpath("scripts", "nu", "wrap_mcfg.nu")
+            wrap_mcfg_target = CONFIG_ROOT.joinpath("scripts", "wrap_mcfg.nu")
+            wrap_mcfg_target.parent.mkdir(parents=True, exist_ok=True)
+            _copy_path(source=wrap_mcfg_source, target=wrap_mcfg_target, overwrite=True)
+        case "settings":
+            source = LIBRARY_ROOT.joinpath("settings")
+            target = CONFIG_ROOT.joinpath("settings")
+
+    _copy_path(source=source, target=target, overwrite=True)
+    
+    if system_name == "linux" and which == "scripts":
+        from rich.console import Console
+        console = Console()
+        console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
+        scripts_path = CONFIG_ROOT.joinpath("scripts")
+        subprocess.run(f"chmod +x {scripts_path} -R", shell=True, capture_output=True, text=True, check=False)
+        console.print("[green]✅ Script permissions updated[/green]")
+
+    home_dir = Path.home()
+    if system_name == "windows":
+        yazi_plugins_dir = home_dir.joinpath("AppData", "Roaming", "yazi", "config")
+    else:
+        yazi_plugins_dir = home_dir.joinpath(".config", "yazi")
+    
+    yazi_plugins_path = yazi_plugins_dir.joinpath("plugins")
+    if not yazi_plugins_path.exists():
+        yazi_plugins_dir.mkdir(parents=True, exist_ok=True)
+        import git
+        git.Repo.clone_from("https://github.com/yazi-rs/plugins", yazi_plugins_path)