machineconfig 6.82__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/jobs/installer/linux_scripts/q.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
-mkdir -p $HOME/Downloads || true
-cd $HOME/Downloads
-curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
-unzip q.zip
-./q/install.sh  # goes to ~/.local/bin.
-rm q.zip
-rm -rfd q
+# mkdir -p $HOME/Downloads || true
+# cd $HOME/Downloads
+# curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
+# unzip q.zip
+# ./q/install.sh  # goes to ~/.local/bin.
+# rm q.zip
+# rm -rfd q
+
+# This is a clean installation that inloves only binary movement, no bashrc manipulation.
+devops install "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip"

machineconfig/jobs/installer/linux_scripts/redis.sh

@@ -45,6 +45,7 @@ sudo nala update
 # Install Redis
 echo "📥 Installing Redis..."
 sudo nala install redis -y
+sudo nala install redis-tools -y
 
 echo """✅ INSTALLATION COMPLETE | Redis has been installed successfully
 

machineconfig/jobs/installer/package_groups.py

@@ -1,13 +1,20 @@
-from typing import Literal, TypeAlias, Union
+
+GUI = [
+    "brave",
+    "code",
+    "git",
+    # "wezterm",  # needs admin
+]
 
 # AI/LLM Tools - AI-powered coding and chat assistants
 AGENTS = [
     "aider",
+    "aichat",
     "copilot",
     "gemini",
     "crush",
     "opencode-ai",
-    "ollama",
+    # "ollama",
     "chatgpt",
     "mods",
     "q",
@@ -17,6 +24,7 @@ AGENTS = [
     "kilocode",
     "cline",
     "auggie",
+    # "gorilla",
 ]
 
 
@@ -54,9 +62,14 @@ PACKAGES_CODE_EDITORS = [
 # Database Tools - Database clients and visualizers
 PACKAGES_DATABASE = [
     "SqliteBrowser",
+    "sqlite3",
+    "redis",
+    "redis-cli",
+    "postgresql-client",
+    "duckdb",
     "DBeaver",
     "rainfrog",
-    "duckdb",
+
 ]
 
 
@@ -136,22 +149,23 @@ PACKAGES_PRODUCTIVITY = [
     "hx",
 ]
 
-# Miscellaneous Tools - Other tools
-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",
-    "Gorilla",
-    "Redis",
-    "transmission",
-    "exa",
-    "bytehound",
-    "atuin",
-    "xcrawl3r",
-    "obsidian",
-    "istio",
-    "cointop",
-    "nnn",
+    # "transmission",
+    # "bytehound",
+    # "xcrawl3r",
+    # "obsidian",
+    # "istio",
+    # "cointop",
 ]
 
 
@@ -179,6 +193,7 @@ PACKAGES_FILE = [
     "winget",
     "fd",
     "fzf",
+    "tv",
     "broot",
     "rg",
     "rga",
@@ -187,11 +202,13 @@ PACKAGES_FILE = [
     "pistol",
     "bat",
     "viu",
-    "xplr",
-    "joshuto",
-    "lf",
-    "tere",
+    # "xplr",
+    # "joshuto",
+    # "lf",
+    # "nnn",
     "yazi",
+    "tere",
+    # "exa",
     "lsd",
     "zoxide",
     "diskonaut",
@@ -206,82 +223,34 @@ PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
     "mcfly",
+    "atuin",
     "starship",
     "gotty",
     "ttyd",
     "rclone",
+    "cb"
 ]
 
 
 
-
-
-PACKAGE_GROUPS: TypeAlias = Literal[
-    "ESSENTIAL",
-    "DEV",
-    "AGENTS",
-    "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",
-]
-
-
-
-# Main ESSENTIAL package list - combines all subgroups
-ESSENTIAL = [
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_SYSTEM_MONITORS,
-    *PACKAGES_TERMINAL_SHELL,
-    *PACKAGES_FILE,
-]
-DEV = [
-    *PACKAGES_TERMINAL_EMULATORS,
-    *PACKAGES_BROWSERS,
-    *PACKAGES_CODE_EDITORS,
-    *PACKAGES_DATABASE,
-    *PACKAGES_MEDIA,
-    *PACKAGES_FILE_SHARING,
-    *PACKAGES_DEV_UTILS,
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_PRODUCTIVITY,
-    *PACKAGES_MISC_DEV,
-]
-
-PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
-    "ESSENTIAL": ESSENTIAL,
-    "DEV": DEV,
-    "AGENTS": AGENTS,
-    "TERMINAL_EMULATORS": PACKAGES_TERMINAL_EMULATORS,
-    "BROWSERS": PACKAGES_BROWSERS,
-    "CODE_EDITORS": PACKAGES_CODE_EDITORS,
-    "DATABASE": PACKAGES_DATABASE,
-    "MEDIA": PACKAGES_MEDIA,
-    "FILE_SHARING": PACKAGES_FILE_SHARING,
-    "DEV_UTILS": PACKAGES_DEV_UTILS,
-    "CODE_ANALYSIS": PACKAGES_CODE_ANALYSIS,
-    "PRODUCTIVITY": PACKAGES_PRODUCTIVITY,
-    "MISC_DEV": PACKAGES_MISC_DEV,
-    "SYSTEM_MONITORS": PACKAGES_SYSTEM_MONITORS,
-    "SEARCH": PACKAGES_FILE,
-    "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
+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/jobs/installer/powershell_scripts/install_fonts.ps1

@@ -6,6 +6,19 @@ $objShell = New-Object -ComObject Shell.Application
 $objFolder = $objShell.Namespace($FONTS)
 $Fontdir = Get-ChildItem -Path $Path -File
 
+$invalidCharPattern = "[{0}]" -f ([Regex]::Escape(([string]::Join('', [System.IO.Path]::GetInvalidFileNameChars()))))
+
+function Get-FontBaseNameSafe {
+    param([string]$Input)
+    if ([string]::IsNullOrWhiteSpace($Input)) { return "" }
+    $candidate = ($Input -split ',')[0].Trim()
+    try { return [System.IO.Path]::GetFileNameWithoutExtension($candidate) }
+    catch {
+        $sanitized = [Regex]::Replace($candidate, $invalidCharPattern, '')
+        return ($sanitized -replace '\\.[^.]+$')
+    }
+}
+
 # Normalization helper: remove spaces, underscores, hyphens, 'nerd', 'font', and collapse 'nf' for broad matching
 function Normalize-FontName {
     param([string]$Name)
@@ -17,47 +30,129 @@ function Normalize-FontName {
     return $n
 }
 
+function Get-FontIdentityForms {
+    param([string]$Name)
+    if ([string]::IsNullOrWhiteSpace($Name)) { return @() }
+    $normalized = Normalize-FontName $Name
+    if ([string]::IsNullOrWhiteSpace($normalized)) { return @() }
+
+    $forms = @()
+    $forms += $normalized
+
+    $stylePattern = '(regular|italic|oblique|bold|bolditalic|semibold|semilight|light|extrabold|extralight|medium|thin|black|book|ultra|heavy|demi|retina|condensed|narrow|windowscompatible|complete|windowscomp|compatibility)+$'
+    $stem = $normalized
+    while ($stem -match $stylePattern) {
+        $stem = [Regex]::Replace($stem, $stylePattern, '')
+        if ([string]::IsNullOrWhiteSpace($stem)) { break }
+        $forms += $stem
+    }
+
+    $stemForVariants = $stem
+    foreach ($tail in @('mono', 'propo')) {
+        $tmp = $stemForVariants
+        while (-not [string]::IsNullOrWhiteSpace($tmp) -and $tmp.EndsWith($tail)) {
+            $tmp = $tmp.Substring(0, $tmp.Length - $tail.Length)
+            if ([string]::IsNullOrWhiteSpace($tmp)) { break }
+            $forms += $tmp
+        }
+    }
+
+    return ($forms | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique)
+}
+
+function Test-FontFormsOverlapFuzzy {
+    param(
+        [string[]]$CandidateForms,
+        [string[]]$ExistingForms
+    )
+    foreach ($candidate in $CandidateForms) {
+        if ([string]::IsNullOrWhiteSpace($candidate)) { continue }
+        foreach ($existing in $ExistingForms) {
+            if ([string]::IsNullOrWhiteSpace($existing)) { continue }
+            if ($existing.Contains($candidate) -or $candidate.Contains($existing)) { return $true }
+        }
+    }
+    return $false
+}
+
+function Merge-UniqueForms {
+    param(
+        [string[]]$Existing,
+        [string[]]$Additional
+    )
+    return (($Existing + $Additional) | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique)
+}
+
 # Cache installed font basenames once (raw + normalized map)
 $installedFontFiles = Get-ChildItem C:\Windows\Fonts -File
-$installedFonts = @{}
-foreach ($f in $installedFontFiles) { $installedFonts[(Normalize-FontName $f.BaseName)] = 1 }
+$installedFonts = @()
+foreach ($f in $installedFontFiles) {
+    $installedFonts = Merge-UniqueForms $installedFonts (Get-FontIdentityForms $f.BaseName)
+}
 
-Write-Host "Existing related fonts detected:" ($installedFonts.Keys | Where-Object { $_ -match 'caskaydiacove|cascadiacode' } | Sort-Object | Get-Unique) -ForegroundColor DarkGray
+$relatedInstalled = $installedFonts | Where-Object { $_ -match 'caskaydiacove|cascadiacode' } | Sort-Object | Get-Unique
+Write-Host "Existing related fonts detected:" $relatedInstalled -ForegroundColor DarkGray
+
+$registryFonts = @()
+$fontReg = $null
+try {
+    $fontReg = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts' -ErrorAction Stop
+} catch {
+    Write-Host "Registry font list unavailable: $($_.Exception.Message)" -ForegroundColor DarkYellow
+}
+if ($null -ne $fontReg) {
+    foreach ($prop in $fontReg.PSObject.Properties) {
+        $val = ($prop.Value | Out-String).Trim()
+        $nm  = ($prop.Name | Out-String).Trim()
+        $registryFonts = Merge-UniqueForms $registryFonts (Get-FontIdentityForms (Get-FontBaseNameSafe $val))
+        $registryFonts = Merge-UniqueForms $registryFonts (Get-FontIdentityForms (Get-FontBaseNameSafe $nm))
+    }
+}
 
 foreach ($File in $Fontdir) {
-    if ($File.Name -notmatch 'pfb$') {
-    $candidateRaw = $File.BaseName
-    $candidateNorm = Normalize-FontName $candidateRaw
-
-        # 1. Exact file existence check (handles .ttf/.otf pairs) before invoking Shell CopyHere.
-        $destFile = Join-Path -Path 'C:\Windows\Fonts' -ChildPath $File.Name
-        if (Test-Path -LiteralPath $destFile) { Write-Host "Skip (file exists) $($File.Name)" -ForegroundColor Green; continue }
-
-        # 2. Registry check: Fonts are registered under HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts
-        try {
-            $fontReg = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts' -ErrorAction Stop
-            $regMatch = $false
-            foreach ($prop in $fontReg.PSObject.Properties) {
-                $val = ($prop.Value | Out-String).Trim()
-                $nm  = ($prop.Name | Out-String).Trim()
-                $valNorm = Normalize-FontName ( [System.IO.Path]::GetFileNameWithoutExtension($val) )
-                $nmNorm  = Normalize-FontName $nm
-                if ($valNorm -eq $candidateNorm -or $nmNorm -eq $candidateNorm -or $nmNorm -match [Regex]::Escape($candidateNorm)) { $regMatch = $true; break }
-            }
-            if ($regMatch) {
-                Write-Host "Skip (registry) $($File.Name)" -ForegroundColor Green
-                continue
-            }
-        } catch {
-            Write-Host "Registry font query failed: $($_.Exception.Message) (continuing)" -ForegroundColor DarkYellow
-        }
+    if ($File.Name -match 'pfb$') { continue }
 
-        # 3. Original heuristic set: in-memory list
-        if ($installedFonts.ContainsKey($candidateNorm)) { Write-Host "Skip (norm map) $($File.Name)" -ForegroundColor Green; continue }
-        if ($installedFonts.Keys | Where-Object { $_ -match [Regex]::Escape($candidateNorm) }) { Write-Host "Skip (norm regex) $($File.Name)" -ForegroundColor Green; continue }
+    $candidateForms = Get-FontIdentityForms $File.BaseName
+    if ($candidateForms.Count -eq 0) { $candidateForms = @(Normalize-FontName $File.BaseName) }
+    $candidateNorm = if ($candidateForms.Count -gt 0) { $candidateForms[0] } else { '' }
 
-        Write-Host "Installing font (no matches) $($File.Name) | norm=$candidateNorm" -ForegroundColor Yellow
-        $objFolder.CopyHere($File.FullName)
+    # 1. Exact file existence check (handles .ttf/.otf pairs) before invoking Shell CopyHere.
+    $destFile = Join-Path -Path 'C:\Windows\Fonts' -ChildPath $File.Name
+    if (Test-Path -LiteralPath $destFile) {
+        Write-Host "Skip (file exists) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
     }
+
+    # 2. Registry check: Fonts are registered under HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts
+    if ($registryFonts.Count -gt 0) {
+        $exactRegMatch = $candidateForms | Where-Object { $registryFonts -contains $_ }
+        if ($exactRegMatch.Count -gt 0) {
+            Write-Host "Skip (registry) $($File.Name)" -ForegroundColor Green
+            $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+            continue
+        }
+        if (Test-FontFormsOverlapFuzzy $candidateForms $registryFonts) {
+            Write-Host "Skip (registry family) $($File.Name)" -ForegroundColor Green
+            $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+            continue
+        }
+    }
+
+    # 3. Original heuristic set: in-memory list
+    if (($candidateForms | Where-Object { $installedFonts -contains $_ }).Count -gt 0) {
+        Write-Host "Skip (installed map) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
+    }
+    if (Test-FontFormsOverlapFuzzy $candidateForms $installedFonts) {
+        Write-Host "Skip (installed family) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
+    }
+
+    Write-Host "Installing font (no matches) $($File.Name) | norm=$candidateNorm" -ForegroundColor Yellow
+    $objFolder.CopyHere($File.FullName)
+    $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
 }
 Write-Host "Font installation script completed." -ForegroundColor Cyan

machineconfig/logger.py

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

machineconfig/profile/create_helper.py

@@ -1,35 +1,62 @@
 
 from typing import Literal
+from pathlib import Path
+import shutil
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 
 
-def copy_assets_to_machine(which: Literal["scripts", "settings"]):
-    # callers, symlink public, shell profile adder (requires init.ps1 and scripts dir to be present on machine)
+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
-    if platform.system().lower() == "windows":
+    import subprocess
+    
+    system_name = platform.system().lower()
+    if system_name == "windows":
         system = "windows"
-    elif platform.system().lower() == "linux" or platform.system().lower() == "darwin":
+    elif system_name in {"linux", "darwin"}:
         system = "linux"
     else:
-        raise NotImplementedError(f"System {platform.system().lower()} not supported")
+        raise NotImplementedError(f"System {system_name} not supported")
+
     match which:
         case "scripts":
             source = LIBRARY_ROOT.joinpath("scripts", system)
-            target = CONFIG_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")
-    from machineconfig.utils.path_extended import PathExtended
-    PathExtended(source).copy(folder=target.parent, overwrite=True)
-    import platform
-    system = platform.system().lower()
-    if system == "linux" and which == "scripts":
-        import subprocess
+
+    _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]")
-        subprocess.run(f"chmod +x {CONFIG_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
+        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]")
-
-

machineconfig/profile/create_links.py

@@ -13,6 +13,7 @@ from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_map, copy_map
+from machineconfig.profile.create_links_export import ON_CONFLICT_STRICT
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 
 import platform
@@ -79,7 +80,7 @@ def read_mapper() -> MapperFileData:
 
 
 def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
-                 on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"],
+                 on_conflict: ON_CONFLICT_STRICT,
                  method: Literal["symlink", "copy"]
                  ):
     operation_records: list[OperationRecord] = []

machineconfig/profile/create_links_export.py

@@ -1,12 +1,33 @@
 
 import typer
-from typing import Optional, Literal, Annotated
+from typing import Optional, Literal, Annotated, TypeAlias
 
+ON_CONFLICT_LOOSE: TypeAlias = Literal[
+    "throw-error", "t",
+    "overwrite-self-managed", "os",
+    "backup-self-managed", "bs",
+    "overwrite-default-path", "od",
+    "backup-default-path", "bd"
+    ]
+ON_CONFLICT_STRICT: TypeAlias = Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"]
+ON_CONFLICT_MAPPER: dict[str, ON_CONFLICT_STRICT] = {
+    "t": "throw-error",
+    "os": "overwrite-self-managed",
+    "bs": "backup-self-managed",
+    "od": "overwrite-default-path",
+    "bd": "backup-default-path",
+    "throw-error": "throw-error",
+    "overwrite-self-managed": "overwrite-self-managed",
+    "backup-self-managed": "backup-self-managed",
+    "overwrite-default-path": "overwrite-default-path",
+    "backup-default-path": "backup-default-path",
+    }
 
-def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for setting up the config file.")],
-                            on_conflict: Annotated[Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")],
-                            which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
-                            interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
+
+def main_public_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for setting up the config file.")],
+                            on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+                            which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = "all",
+                            interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Run in interactive mode")] = False):
     """Terminology:
     SOURCE = Self-Managed-Config-File-Path
     TARGET = Config-File-Default-Path
@@ -16,7 +37,7 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.
     if which is None:
         assert interactive is True
         from machineconfig.utils.options import choose_from_options
-        items_chosen = choose_from_options(msg="Which symlink to create?", options=list(mapper_full.keys()), fzf=True, multi=True)
+        items_chosen = choose_from_options(msg="Which symlink to create?", options=list(mapper_full.keys()), tv=True, multi=True)
     else:
         assert interactive is False
         if which == "all":
@@ -24,31 +45,56 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.
         else:
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
-
+    if len(items_objections) == 0:
+        typer.echo("[red]Error:[/] No valid items selected.")
+        typer.Exit(code=1)
+        return
     from machineconfig.profile.create_links import apply_mapper
     from machineconfig.profile.create_helper import copy_assets_to_machine
     copy_assets_to_machine(which="settings")  # config files live here and will be linked to.
-    apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
+    method_map: dict[str, Literal["symlink", "copy"]] = {
+        "s": "symlink",
+        "symlink": "symlink",
+        "c": "copy",
+        "copy": "copy",
+    }
+    method = method_map[method]
+    apply_mapper(mapper_data=items_objections, on_conflict=ON_CONFLICT_MAPPER[on_conflict], method=method)
 
 
-def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")] = "throwError",
-                             which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
-                             interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
+def main_private_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
+                             on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+                             which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = "all",
+                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Run in interactive mode")] = False):
     from machineconfig.profile.create_links import ConfigMapper, read_mapper
-
     mapper_full = read_mapper()["private"]
     if which is None:
-        assert interactive is True
+        if interactive is False:
+            typer.echo("[red]Error:[/] --which must be provided when not running in interactive mode.")
+            typer.Exit(code=1)
+            return
         from machineconfig.utils.options import choose_from_options
-        items_chosen = choose_from_options(msg="Which symlink to create?", options=list(mapper_full.keys()), fzf=True, multi=True)
+        items_chosen = choose_from_options(msg="Which symlink to create?", options=list(mapper_full.keys()), tv=True, multi=True)
     else:
-        assert interactive is False
+        if interactive is True:
+            typer.echo("[yellow]Warning:[/] --which is provided, but its not allowed to be used together with --interactive. Ignoring --interactive flag.")
+            typer.Exit(code=0)
+            return
         if which == "all":
             items_chosen = list(mapper_full.keys())
         else:
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
-
+    if len(items_objections) == 0:
+        typer.echo("[red]Error:[/] No valid items selected.")
+        typer.Exit(code=1)
+        return
     from machineconfig.profile.create_links import apply_mapper
-    apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
+    method_map: dict[str, Literal["symlink", "copy"]] = {
+        "s": "symlink",
+        "symlink": "symlink",
+        "c": "copy",
+        "copy": "copy",
+    }
+    method = method_map[method]
+    apply_mapper(mapper_data=items_objections, on_conflict=ON_CONFLICT_MAPPER[on_conflict], method=method)