sysetup 1.4.3__tar.gz → 1.4.4__tar.gz

{sysetup-1.4.3/src/sysetup.egg-info → sysetup-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.3
+Version: 1.4.4
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,24 +8,22 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<3,>=2.0.2
-Requires-Dist: dbus-next<1,>=0.2.3
-Requires-Dist: package-utils[context]<1,>=0.6.1
-Requires-Dist: powercli<1,>=0.3.1
+Requires-Dist: backupmaster<3,>=2.0.5
+Requires-Dist: package-utils[context]<1,>=0.8.3
+Requires-Dist: powercli<1,>=0.3.7
 Requires-Dist: requests<3,>=2.32.3
-Requires-Dist: superpathlib<3,>=2.0.4
+Requires-Dist: superpathlib<3,>=2.0.11
 Provides-Extra: dev
 Requires-Dist: dirhash<1,>=0.5.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
-Requires-Dist: package-dev-tools<1,>=0.7.1; extra == "dev"
-Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
+Requires-Dist: package-dev-tools<1,>=0.8.0; extra == "dev"
 Dynamic: license-file
 
 # Sysetup
 [![PyPI version](https://badge.fury.io/py/sysetup.svg)](https://badge.fury.io/py/sysetup)
 ![PyPI downloads](https://img.shields.io/pypi/dm/sysetup)
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
-![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
+![Operating system](https://img.shields.io/badge/os-linux%20%7c%20macOS-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
 ## [Plasma](https://kde.org/plasma-desktop/) 6 required
 

{sysetup-1.4.3 → sysetup-1.4.4}/README.md

@@ -2,7 +2,7 @@
 [![PyPI version](https://badge.fury.io/py/sysetup.svg)](https://badge.fury.io/py/sysetup)
 ![PyPI downloads](https://img.shields.io/pypi/dm/sysetup)
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
-![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
+![Operating system](https://img.shields.io/badge/os-linux%20%7c%20macOS-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
 ## [Plasma](https://kde.org/plasma-desktop/) 6 required
 

{sysetup-1.4.3 → sysetup-1.4.4}/pyproject.toml

@@ -1,26 +1,24 @@
 [project]
 name = "sysetup"
-version = "1.4.3"
+version = "1.4.4"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "backupmaster >=2.0.2, <3",
-    "dbus-next >=0.2.3, <1",
-    "package-utils[context] >=0.6.1, <1",
-    "powercli >=0.3.1, <1",
+    "backupmaster >=2.0.5, <3",
+    "package-utils[context] >=0.8.3, <1",
+    "powercli >=0.3.7, <1",
     "requests >=2.32.3, <3",
-    "superpathlib >=2.0.4, <3",
+    "superpathlib >=2.0.11, <3",
 ]
 
 [project.optional-dependencies]
 dev = [
     "dirhash >=0.5.0, <1",
     "types-requests >=2.32.0.20250306, <3",
-    "package-dev-tools >=0.7.1, <1",
-    "package-dev-utils >=0.1.6, <1",
+    "package-dev-tools >=0.8.0, <1",
 ]
 
 [project.urls]
@@ -34,22 +32,10 @@ exportcrontab = "sysetup.main.files.assets:move_crontab"
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
-[tool.coverage.run]
-command_line = "-m pytest tests"
-
-[tool.coverage.report]
-precision = 4
-fail_under = 60
-
 [tool.mypy]
 strict = true
 no_implicit_reexport = false
 
-[tool.pytest.ini_options]
-pythonpath = [
-    "src", ".",
-]
-
 [tool.ruff]
 fix = true
 
@@ -60,13 +46,16 @@ ignore = [
     "D",       # docstrings
     "G004",    # logging f-string
     "S101",    # assert used
+    "D1",       # missing docstrings
+    "D200",     # one-line docstring
+    "D203",     # conflicts with D211
+    "D205",     # blank line between summary and description
+    "D212",     # conflicts with D213
+    "D401",     # imperative first line
 ]
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 
-[tool.setuptools]
-script-files = ["bin/pw", "bin/pw-askpass"]
-
 [tool.setuptools.package-data]
 sysetup = ["assets/scripts/update_wallpaper.js", "py.typed"]

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup/context/__init__.py

@@ -1,2 +1 @@
-from .action import Action
 from .context import Context, context

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup/context/context.py

@@ -1,11 +1,11 @@
-import os
 from functools import cached_property
+from pathlib import Path
 
-from package_utils.context import Context as Context_
+from package_utils.context.context import Context as Context_
 
-from .installations import is_installed
 from .options import Options
 from .secrets_ import Secrets
+from .system import is_installed
 
 
 class Context(Context_[Options, None, Secrets]):
@@ -19,8 +19,8 @@ class Context(Context_[Options, None, Secrets]):
         return self.package_manager == "apt-get"
 
     @cached_property
-    def is_running_in_test(self) -> bool:
-        return "DISPLAY" not in os.environ
+    def is_running_in_container(self) -> bool:
+        return Path("/.dockerenv").exists()
 
 
 context = Context(Options, Secrets=Secrets)

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup/context/options.py

@@ -3,11 +3,8 @@ from typing import Annotated
 
 import typer
 
-from .action import Action
-
 
 @dataclass
 class Options:
     bitwarden_password: Annotated[str, typer.Option()] = ""
     bitwarden_email: Annotated[str, typer.Option()] = "quinten.roets@gmail.com"
-    action: Annotated[Action, typer.Argument(help="The part to setup")] = Action.all

sysetup-1.4.4/src/sysetup/context/system.py

@@ -0,0 +1,15 @@
+import platform
+
+import cli
+
+
+def is_mac() -> bool:
+    return platform.system() == "Darwin"
+
+
+def is_linux() -> bool:
+    return platform.system() == "Linux"
+
+
+def is_installed(package: str) -> bool:
+    return cli.completes_successfully("which", package)

sysetup-1.4.4/src/sysetup/main/files.py

@@ -0,0 +1,89 @@
+import stat
+
+import cli
+
+from sysetup.context import context
+from sysetup.context.system import is_linux, is_mac
+from sysetup.models import Path
+from sysetup.utils import download_directory, ensure_downloaded
+
+from .packages import install
+
+
+def setup() -> None:
+    configure_git()
+    configure_ssh()
+    remove_clutter()
+    install_custom_certificate()
+
+
+def configure_git() -> None:
+    directory = Path.HOME / ".config" / "git" / "hooks"
+    download_directory(directory)
+    for path in directory.iterdir():
+        cli.run("chmod +x", path)
+
+
+def configure_ssh() -> None:
+    directory = Path.HOME / ".ssh"
+    download_directory(directory)
+    if is_linux():
+        remove_macos_ssh_options(directory / "config")
+    for path in directory.glob("id_*"):
+        if path.suffix != ".pub":
+            check_permissions(path)
+
+
+def remove_macos_ssh_options(config: Path) -> None:
+    lines = (line for line in config.lines if "UseKeychain" not in line)
+    config.lines = list(lines)
+
+
+def check_permissions(path: Path) -> None:
+    permissions = path.stat().st_mode
+    other_users_can_read = permissions & (stat.S_IRGRP | stat.S_IROTH)
+    if other_users_can_read:
+        path.chmod(0o600)
+
+
+def remove_clutter() -> None:
+    names = (
+        "Desktop",
+        "Downloads",
+        "Music",
+        "Pictures",
+        "Public",
+        "Templates",
+        "Videos",
+    )
+    for name in names:
+        path = Path.HOME / name
+        path.rmtree(missing_ok=True)
+
+    root = Path("/") if is_linux() else Path("/") / "opt" / "homebrew"
+    nginx_path = root / "etc" / "nginx" / "sites-enabled" / "default"
+    if nginx_path.exists():
+        cli.run("rm", nginx_path, root=True)
+
+
+def install_custom_certificate() -> None:
+    certificate_file = Path.assets / "certificates" / "certificate.crt"
+    ensure_downloaded(certificate_file)
+    if is_mac():
+        keychain = "/Library/Keychains/System.keychain"
+        command = (
+            f"security add-trusted-cert -d -r trustRoot "
+            f"-k {keychain} {certificate_file}"
+        )
+    else:
+        install(["libnss3-tools"])
+        certificate_directory = Path.HOME / ".pki" / "nssdb"
+        if not certificate_directory.exists():
+            certificate_directory.mkdir(parents=True)
+            cli.run(f"certutil -d sql:{certificate_directory} -N --empty-password")
+        command = (
+            f"certutil -d sql:{certificate_directory} "
+            f'-A -t "C,," -n "QCA" -i {certificate_file}'
+        )
+    if not context.is_running_in_container:
+        cli.run(command, root=is_mac())

sysetup-1.4.4/src/sysetup/main/linux/installations.py

@@ -0,0 +1,41 @@
+import cli
+
+from sysetup.context.system import is_installed
+from sysetup.main.packages import install
+from sysetup.models import Path
+
+
+def setup() -> None:
+    install_repository("keyd", "rvaiya/keyd")
+    install_repository("ydotool", "ReimuNotMoe/ydotool")
+    enable_service("ssh")
+    install_language_support()
+
+
+def install_language_support() -> None:
+    try:
+        packages = cli.capture_output("check-language-support")
+    except FileNotFoundError:
+        pass
+    else:
+        if packages:
+            install(packages)
+
+
+def install_repository(name: str, repository: str) -> None:
+    if not is_installed(name):
+        if name == "ydotool":
+            cli.run("apt-get install scdoc", root=True)
+        url = f"https://github.com/{repository}"
+        with Path.tempdir() as directory:
+            cli.run("git clone", url, directory)
+            if (directory / "CMakeLists.txt").exists():
+                cli.run("apt-get install -y cmake", root=True)
+                cli.run("cmake .", cwd=directory)
+            cli.run_commands("make", "sudo make install", cwd=directory)
+        enable_service(name)
+
+
+def enable_service(name: str) -> None:
+    if Path("/run/systemd/system").exists():
+        cli.run(f"systemctl enable --now {name}", root=True)

sysetup-1.4.4/src/sysetup/main/linux/packages.py

@@ -0,0 +1,52 @@
+import cli
+
+from sysetup.context import context
+from sysetup.context.system import is_installed
+from sysetup.main.packages import install_packages
+from sysetup.models import Path
+from sysetup.utils import bitwarden_client
+
+
+def setup() -> None:
+    enable_sudo()
+    update_package_manager()
+    install_packages()
+    cleanup_after_install()
+
+
+def enable_sudo() -> None:
+    password = bitwarden_client().fetch_secret("Laptop")
+    cli.run("sudo -S true", input=password)
+
+
+def update_package_manager() -> None:
+    if context.apt_is_installed:
+        update_apt()
+    else:
+        cli.run("pacman -Syy", root=True)
+
+
+def update_apt() -> None:
+    value = (
+        "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true"
+    )
+    agree_eula_command = f'echo "{value}" | sudo debconf-set-selections'
+    commands = "sudo apt-get update", agree_eula_command
+    cli.run_commands_in_shell(*commands)
+    if not Path("/snap").exists():
+        cli.run("ln -s /var/lib/snapd/snap /snap", root=True)
+
+
+def cleanup_after_install() -> None:
+    if context.apt_is_installed:
+        cli.run("sudo apt-get autoremove -y")
+    cli.run("tlp start", root=True)
+    if is_installed("qdbus"):
+        commands = "rm /usr/bin/qdbus", "ln -s /usr/lib/qt6/bin/qdbus /usr/bin/qdbus"
+        cli.run_commands(*commands, root=True)
+    delete = "apt purge -y" if context.apt_is_installed else "pacman -R --noconfirm"
+    commands = (
+        "auto-cpufreq --install",
+        f"{delete} firefox",
+    )
+    cli.run_commands(*commands, check=False, root=True)

sysetup-1.4.4/src/sysetup/main/linux/setup.py

@@ -0,0 +1,35 @@
+import cli
+
+from sysetup.context import context
+from sysetup.context.system import is_installed
+from sysetup.models import Path
+from sysetup.utils import ensure_downloaded
+
+from . import installations, packages
+
+
+def setup() -> None:
+    set_background()
+    packages.setup()
+    install_crontab()
+    installations.setup()
+
+
+def set_background() -> None:  # pragma: nocover
+    path = (
+        Path.HOME / ".local" / "share" / "wallpapers" / "Qwallpapers" / "background.jpg"
+    )
+    ensure_downloaded(path)
+    script = Path.update_wallpaper_script.text
+    script = script.replace("__wallpaper_uri__", path.as_uri())
+    command = (
+        "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript"
+    )
+    if not context.is_running_in_container and is_installed("qdbus"):
+        cli.run(command, script)
+
+
+def install_crontab() -> None:
+    path = Path.assets / "crontab" / "crontab"
+    ensure_downloaded(path)
+    cli.run("crontab -", input=path.text)

sysetup-1.4.4/src/sysetup/main/main.py

@@ -0,0 +1,32 @@
+import cli
+
+from sysetup.context import context
+from sysetup.context.system import is_linux, is_mac
+from sysetup.models import Path
+from sysetup.utils import bitwarden_client
+
+from . import files, linux, packages
+
+
+def main() -> None:
+    """
+    Personal system setup.
+    """
+    files.setup()
+    if is_linux():
+        linux.setup()
+    elif is_mac():
+        packages.install_packages()
+    install_personal_git_repositories()
+    if not context.is_running_in_container:
+        flags = ("--include-browser",) if is_linux() else ()
+        cli.run("backup pull --no-confirm-push", *flags)
+
+
+def install_personal_git_repositories() -> None:
+    github_token = bitwarden_client().fetch_secret("GitHub Token")
+    base_url = f"https://{github_token}@github.com/quintenroets"
+    if not Path.extensions.exists():
+        command = f"git clone {base_url}/extensions.git"
+        cli.run(command, Path.extensions)
+    cli.run(f"uv pip install git+{base_url}/system.git")

sysetup-1.4.4/src/sysetup/main/packages.py

@@ -0,0 +1,37 @@
+import shlex
+from collections.abc import Iterable
+
+import cli
+
+from sysetup.context import context
+from sysetup.context.system import is_linux
+from sysetup.models import Path
+from sysetup.utils import download_directory
+
+
+def install_packages() -> None:
+    download_directory(Path.packages)
+    installations = (
+        {"packages": None, "snap": "snap install"}
+        if is_linux()
+        else {"brew": "brew install"}
+    )
+    for name, command in installations.items():
+        path = (Path.packages / name).with_suffix(".yaml")
+        packages: list[str] = path.yaml
+        install(packages, install_command=command)
+    if is_linux() and not context.apt_is_installed:
+        commands = "sudo pacman -S --noconfirm base-devel", "uv pip install wheel"
+        cli.run_commands(*commands)
+
+
+def install(packages: Iterable[str], install_command: str | None = None) -> None:
+    if install_command is None:
+        install_command = (
+            "apt-get install -y"
+            if context.apt_is_installed
+            else "pacman -S --noconfirm"
+        )
+    for package in packages:
+        args = shlex.split(package)
+        cli.run(install_command, *args, root=is_linux(), check=False)

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup/models/path.py

@@ -1,11 +1,9 @@
-from typing import TypeVar, cast
+from typing import cast
 
 import superpathlib
 from simple_classproperty import classproperty
 from typing_extensions import Self
 
-T = TypeVar("T", bound="Path")
-
 
 class Path(superpathlib.Path):
     @classmethod

sysetup-1.4.4/src/sysetup/utils/__init__.py

@@ -0,0 +1,2 @@
+from .bitwarden import bitwarden_client
+from .download import download_directory, ensure_downloaded

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup/utils/bitwarden.py

@@ -1,8 +1,9 @@
 import io
 import json
+import sys
 import zipfile
 from dataclasses import dataclass
-from functools import cached_property
+from functools import cache, cached_property
 from typing import cast
 
 import cli
@@ -17,12 +18,12 @@ from sysetup.models import Path
 class Client:
     password: str
     email: str
-    download_url: str = "https://bitwarden.com/download/?app=cli&platform=linux"
 
     def fetch_secret(self, name: str) -> str:
         command = "./bw list items --session", self.session_token, "--search", name
         response = cli.capture_output(*command)
-        secret = json.loads(response)[0]["notes"]
+        item = json.loads(response)[0]
+        secret = item.get("notes") or item["login"]["password"]
         return cast("str", secret)
 
     @cached_property
@@ -40,20 +41,17 @@ class Client:
         return cli.capture_output(*command)
 
     def download_cli(self) -> None:
-        response = requests.get(self.download_url, timeout=10).content
+        platform = "macos" if sys.platform == "darwin" else "linux"
+        download_url = f"https://bitwarden.com/download/?app=cli&platform={platform}"
+        response = requests.get(download_url, timeout=10).content
         zip_bytes = io.BytesIO(response)
         with zipfile.ZipFile(zip_bytes, "r") as zip_file:
             zip_file.extractall()
         Path("bw").chmod(0o755)
 
 
-@dataclass
-class Bitwarden:
-    @cached_property
-    def client(self) -> Client:
-        password = context.options.bitwarden_password
-        password = password or Prompt.ask("Bitwarden password", password=True)
-        return Client(password=password, email=context.options.bitwarden_email)
-
-
-bitwarden = Bitwarden()
+@cache
+def bitwarden_client() -> Client:
+    password = context.options.bitwarden_password
+    password = password or Prompt.ask("Bitwarden password", password=True)
+    return Client(password=password, email=context.options.bitwarden_email)

sysetup-1.4.4/src/sysetup/utils/download.py

@@ -0,0 +1,18 @@
+import os
+
+from backup.syncer.builder import create_syncer
+
+from sysetup.models import Path
+
+from .bitwarden import bitwarden_client
+
+
+def ensure_downloaded(path: Path) -> None:
+    if not path.exists():
+        download_directory(path.parent)
+
+
+def download_directory(directory: Path) -> None:
+    if "RCLONE" not in os.environ:
+        os.environ["RCLONE"] = bitwarden_client().fetch_secret("Rclone")
+    create_syncer(directory=directory).capture_pull()

{sysetup-1.4.3 → sysetup-1.4.4/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.3
+Version: 1.4.4
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -8,24 +8,22 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<3,>=2.0.2
-Requires-Dist: dbus-next<1,>=0.2.3
-Requires-Dist: package-utils[context]<1,>=0.6.1
-Requires-Dist: powercli<1,>=0.3.1
+Requires-Dist: backupmaster<3,>=2.0.5
+Requires-Dist: package-utils[context]<1,>=0.8.3
+Requires-Dist: powercli<1,>=0.3.7
 Requires-Dist: requests<3,>=2.32.3
-Requires-Dist: superpathlib<3,>=2.0.4
+Requires-Dist: superpathlib<3,>=2.0.11
 Provides-Extra: dev
 Requires-Dist: dirhash<1,>=0.5.0; extra == "dev"
 Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
-Requires-Dist: package-dev-tools<1,>=0.7.1; extra == "dev"
-Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
+Requires-Dist: package-dev-tools<1,>=0.8.0; extra == "dev"
 Dynamic: license-file
 
 # Sysetup
 [![PyPI version](https://badge.fury.io/py/sysetup.svg)](https://badge.fury.io/py/sysetup)
 ![PyPI downloads](https://img.shields.io/pypi/dm/sysetup)
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
-![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
+![Operating system](https://img.shields.io/badge/os-linux%20%7c%20macOS-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
 ## [Plasma](https://kde.org/plasma-desktop/) 6 required
 

{sysetup-1.4.3 → sysetup-1.4.4}/src/sysetup.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-bin/pw
-bin/pw-askpass
 src/sysetup/__init__.py
 src/sysetup/py.typed
 src/sysetup.egg-info/PKG-INFO
@@ -14,25 +12,20 @@ src/sysetup.egg-info/top_level.txt
 src/sysetup/cli/__init__.py
 src/sysetup/cli/entry_point.py
 src/sysetup/context/__init__.py
-src/sysetup/context/action.py
 src/sysetup/context/context.py
-src/sysetup/context/installations.py
 src/sysetup/context/options.py
 src/sysetup/context/secrets_.py
+src/sysetup/context/system.py
 src/sysetup/main/__init__.py
-src/sysetup/main/installations.py
+src/sysetup/main/files.py
 src/sysetup/main/main.py
 src/sysetup/main/packages.py
-src/sysetup/main/files/__init__.py
-src/sysetup/main/files/assets.py
-src/sysetup/main/files/permissions.py
-src/sysetup/main/files/settings.py
-src/sysetup/main/files/setup.py
+src/sysetup/main/linux/__init__.py
+src/sysetup/main/linux/installations.py
+src/sysetup/main/linux/packages.py
+src/sysetup/main/linux/setup.py
 src/sysetup/models/__init__.py
 src/sysetup/models/path.py
 src/sysetup/utils/__init__.py
 src/sysetup/utils/bitwarden.py
-src/sysetup/utils/download.py
-tests/test_background.py
-tests/test_cli_entry_point.py
-tests/test_main.py
+src/sysetup/utils/download.py

sysetup-1.4.4/src/sysetup.egg-info/requires.txt

@@ -0,0 +1,10 @@
+backupmaster<3,>=2.0.5
+package-utils[context]<1,>=0.8.3
+powercli<1,>=0.3.7
+requests<3,>=2.32.3
+superpathlib<3,>=2.0.11
+
+[dev]
+dirhash<1,>=0.5.0
+types-requests<3,>=2.32.0.20250306
+package-dev-tools<1,>=0.8.0

sysetup-1.4.3/bin/pw

@@ -1,10 +0,0 @@
-#! /bin/bash
-
-password_name=${1:-Login}
-
-if command -v ksshaskpass >/dev/null 2>&1; then
-    ksshaskpass -- "Enter passphrase for $password_name: "
-else
-    security find-generic-password -s "$password_name" -a "autopass" -w
-    # to add: security add-generic-password -s "$password_name" -a "autopass" -U -w
-fi

sysetup-1.4.3/bin/pw-askpass

@@ -1,4 +0,0 @@
-#! /bin/bash
-# separate script because input message needs to be ignored
-
-pw

sysetup-1.4.3/src/sysetup/context/action.py

@@ -1,8 +0,0 @@
-from enum import Enum
-
-
-class Action(str, Enum):
-    all = "all"
-    files = "files"
-    packages = "packages"
-    install = "install"

sysetup-1.4.3/src/sysetup/context/installations.py

@@ -1,5 +0,0 @@
-import cli
-
-
-def is_installed(package: str) -> bool:
-    return cli.completes_successfully("which", package)

sysetup-1.4.3/src/sysetup/main/files/assets.py

@@ -1,47 +0,0 @@
-import cli
-from backup.syncer import Syncer
-from backup.syncer.sync_configs import SyncConfigs
-
-from sysetup.models import Path
-from sysetup.utils import download_directory
-
-
-def setup() -> None:
-    directories = (
-        Path.assets,
-        Path.HOME / ".local" / "share" / "kwalletd",
-        Path.assets.parent / "backup",
-    )
-    for directory in directories:
-        download_directory(directory)
-    move_crontab()
-    move_setup_files()
-
-
-def move_crontab() -> None:
-    src = Path.assets / "crontab" / "crontab"
-    cli.run("crontab -", input=src.text)
-
-
-def move_setup_files() -> None:
-    setup_files_root = Path.assets / "files"
-    setup_files = []
-    archived_setup_files = []
-    for path in setup_files_root.rglob("*"):
-        if path.is_file():
-            if path.archive_format is None:
-                setup_files.append(path)
-            else:
-                archived_setup_files.append(path)
-
-    config = SyncConfigs.cache.with_paths(setup_files)
-    if setup_files:
-        Syncer(config).capture_pull()
-    for path in archived_setup_files:
-        dest = (config.source / path.relative_to(setup_files_root)).parent
-        if dest.is_root and not dest.exists():
-            cli.run("mkdir -p", dest, root=True)
-        else:
-            dest.create_parent()
-        with cli.status(f"Unpacking {path.relative_to(setup_files_root)}"):
-            cli.capture_output("unzip -o", path, "-d", dest, root=dest.is_root)

sysetup-1.4.3/src/sysetup/main/files/permissions.py

@@ -1,33 +0,0 @@
-import stat
-
-import cli
-
-from sysetup.models import Path
-from sysetup.utils import download_directory
-
-
-def setup() -> None:
-    set_git_permissions()
-    set_ssh_permissions()
-
-
-def set_git_permissions() -> None:
-    git_hooks_folder = Path.HOME / ".config" / "git" / "hooks"
-    download_directory(git_hooks_folder)
-    for path in git_hooks_folder.iterdir():
-        cli.run("chmod +x", path)
-
-
-def set_ssh_permissions() -> None:
-    directory = Path.HOME / ".ssh"
-    download_directory(directory)
-    for path in directory.glob("id_*"):
-        if path.suffix != ".pub":
-            check_permissions(path)
-
-
-def check_permissions(path: Path) -> None:
-    permissions = path.stat().st_mode
-    other_users_can_read = permissions & (stat.S_IRGRP | stat.S_IROTH)
-    if other_users_can_read:
-        path.chmod(33152)

sysetup-1.4.3/src/sysetup/main/files/settings.py

@@ -1,42 +0,0 @@
-import cli
-
-from sysetup.context import context
-from sysetup.models import Path
-from sysetup.utils import download_directory, is_installed
-
-
-def remove_clutter() -> None:
-    names = (
-        "Desktop",
-        "Downloads",
-        "Music",
-        "Pictures",
-        "Public",
-        "Templates",
-        "Videos",
-    )
-    for name in names:
-        path = Path.HOME / name
-        path.rmtree(missing_ok=True)
-
-    nginx_path = Path("/") / "etc" / "nginx" / "sites-enabled" / "default"
-    if nginx_path.exists():
-        cli.run("rm", nginx_path, root=True)
-
-
-def set_background() -> None:  # pragma: nocover
-    wallpaper_path = (
-        Path.HOME / ".local" / "share" / "wallpapers" / "Qwallpapers" / "background.jpg"
-    )
-    download_directory(wallpaper_path.parent)
-    script = Path.update_wallpaper_script.text
-    script = script.replace("__wallpaper_uri__", wallpaper_path.as_uri())
-    run_kde_script(script)
-
-
-def run_kde_script(script: str) -> None:  # pragma: nocover
-    command = (
-        "qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript"
-    )
-    if not context.is_running_in_test and is_installed("qdbus"):
-        cli.run(command, script)

sysetup-1.4.3/src/sysetup/main/files/setup.py

@@ -1,8 +0,0 @@
-from sysetup.main.files import assets, permissions, settings
-
-
-def setup() -> None:
-    permissions.setup()
-    assets.setup()
-    settings.set_background()
-    settings.remove_clutter()

sysetup-1.4.3/src/sysetup/main/installations.py

@@ -1,99 +0,0 @@
-import cli
-
-from sysetup.context import context
-from sysetup.models import Path
-from sysetup.utils import bitwarden, is_installed
-
-from .packages import install
-
-
-def setup() -> None:
-    install_chromium()
-    install_keyd()
-    install_ydotool()
-    enable_service("ssh")
-    install_language_support()
-    install_personal_git_repositories()
-
-
-def install_personal_git_repositories() -> None:
-    github_token = bitwarden.client.fetch_secret("GitHub")
-    base_url = f"https://{github_token}@github.com/quintenroets"
-    if not Path.extensions.exists():
-        command = f"git clone {base_url}/extensions.git"
-        cli.run(command, Path.extensions)
-    cli.run(f"uv pip install git+{base_url}/system.git")
-
-
-def install_language_support() -> None:
-    try:
-        packages = cli.capture_output("check-language-support")
-    except FileNotFoundError:
-        pass
-    else:
-        if packages:
-            install(packages)
-
-
-def install_chromium() -> None:
-    if not is_installed("chromium-browser"):
-        _install_chromium()
-
-
-def _install_chromium() -> None:
-    release_name = cli.capture_output_lines("lsb_release -sc")[-1]
-    repo_url = f"https://freeshell.de/phd/chromium/{release_name}"
-    key = "869689FE09306074"
-    keyring = "/usr/share/keyrings/phd-chromium.gpg"
-    sources_file = "/etc/apt/sources.list.d/phd-chromium.list"
-    commands = (
-        f"gpg --keyserver keyserver.ubuntu.com --recv-keys {key}",
-        f"gpg --export {key} | sudo gpg --dearmor -o {keyring}",
-        f'echo "deb [signed-by={keyring}] {repo_url} /" | sudo tee {sources_file}',
-        "apt-get update",
-        "apt-get install -y chromium",
-    )
-    check = not context.is_running_in_test
-    cli.run_commands(*commands, shell=True, root=True, check=check)  # noqa: S604
-    install_custom_certificate()
-
-
-def install_custom_certificate() -> None:
-    install(["libnss3-tools"])
-    certificate_directory = Path.HOME / ".pki" / "nssdb"
-    certificate_file = Path.assets / "certificates" / "certificate.crt"
-    command = (
-        f"certutil -d sql:{certificate_directory} "
-        f'-A -t "C,," -n "QCA" -i {certificate_file}'
-    )
-    if not context.is_running_in_test:
-        cli.run(command)
-
-
-def install_keyd() -> None:
-    install_repository("keyd", "rvaiya/keyd")
-    enable_service("keyd")
-
-
-def enable_service(name: str) -> None:
-    if not context.is_running_in_test:
-        command = f"systemctl enable --now {name}"
-        cli.run(command, root=True)
-
-
-def install_repository(name: str, repository: str) -> None:
-    if not is_installed(name):
-        url = f"https://github.com/{repository}"
-        with Path.tempdir() as directory:
-            cli.run("git clone", url, directory)
-            if (directory / "CMakeLists.txt").exists():
-                cli.run("apt-get install -y cmake", root=True)
-                cli.run("cmake .", cwd=directory)
-            cli.run_commands("make", "sudo make install", cwd=directory)
-
-
-def install_ydotool() -> None:
-    if not is_installed("ydotool"):
-        cli.run("apt-get install scdoc", root=True)
-        install_repository("ydotool", "ReimuNotMoe/ydotool")
-        enable_service("ydotoold")

sysetup-1.4.3/src/sysetup/main/main.py

@@ -1,27 +0,0 @@
-import cli
-
-from sysetup.context import Action, context
-
-from . import files, installations, packages
-
-
-def main() -> None:
-    """
-    Personal system setup.
-    """
-    action_mapper = {
-        Action.all.value: setup,
-        Action.packages.value: packages.setup,
-        Action.files.value: files.setup,
-        Action.install.value: installations.setup,
-    }
-    action = action_mapper[context.options.action.value]
-    action()
-
-
-def setup() -> None:
-    packages.setup()
-    files.setup()
-    installations.setup()
-    if not context.is_running_in_test:
-        cli.run("backup pull --include-browser --no-confirm-push")

sysetup-1.4.3/src/sysetup/main/packages.py

@@ -1,87 +0,0 @@
-import platform
-import shlex
-import warnings
-from collections.abc import Iterable
-
-import cli
-
-from sysetup.context import context
-from sysetup.models import Path
-from sysetup.utils import bitwarden, download_directory, is_installed
-
-
-def setup() -> None:
-    enable_sudo()
-    update_package_manager()
-    install_packages()
-    cleanup_after_install()
-
-
-def enable_sudo() -> None:
-    password = bitwarden.client.fetch_secret("Laptop")
-    cli.run("sudo -S true", input=password)  # activate sudo without askpass
-
-
-def install_packages() -> None:
-    download_directory(Path.packages)
-    installations = {"packages": None, "snap": "snap install"}
-    for name, command in installations.items():
-        path = (Path.packages / name).with_suffix(".yaml")
-        packages: list[str] = path.yaml
-        install(packages, install_command=command)
-
-    if not context.apt_is_installed:
-        commands = "sudo pacman -S --noconfirm base-devel", "uv pip install wheel"
-        cli.run_commands(*commands)
-
-
-def cleanup_after_install() -> None:
-    if context.apt_is_installed:
-        cli.run("sudo apt-get autoremove -y")
-    cli.run("tlp start", root=True)
-    if is_installed("qdbus"):
-        commands = "rm /usr/bin/qdbus", "ln -s /usr/lib/qt6/bin/qdbus /usr/bin/qdbus"
-        cli.run_commands(*commands, root=True)
-    delete = "apt purge -y" if context.apt_is_installed else "pacman -R --noconfirm"
-    commands = (
-        "auto-cpufreq --install",  # Fails on VM
-        f"{delete} firefox",  # fails if firefox not installed
-    )
-    cli.run_commands(*commands, check=False, root=True)
-
-
-def update_package_manager() -> None:
-    if context.apt_is_installed:
-        update_apt()
-    else:
-        cli.run("pacman -Syy", root=True)
-
-
-def update_apt() -> None:
-    value = (
-        "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true"
-    )
-    agree_eula_command = f'echo "{value}" | sudo debconf-set-selections'
-    commands = "sudo apt-get update", agree_eula_command
-    cli.run_commands_in_shell(*commands)
-    if not Path("/snap").exists():
-        cli.run("ln -s /var/lib/snapd/snap /snap", root=True)
-
-
-def install(packages: Iterable[str], install_command: str | None = None) -> None:
-    if install_command is None:
-        install_command = (
-            "apt-get install -y"
-            if context.apt_is_installed
-            else "pacman -S --noconfirm"
-        )
-
-    is_linux = platform.system() == "Linux"
-    if not is_linux:
-        message = "Required packages can only be installed on Linux"
-        warnings.warn(message, stacklevel=2)
-        return
-
-    for package in packages:
-        args = shlex.split(package)
-        cli.run(install_command, *args, root=True, check=False)

sysetup-1.4.3/src/sysetup/utils/__init__.py

@@ -1,4 +0,0 @@
-from sysetup.context.installations import is_installed
-
-from .bitwarden import bitwarden
-from .download import download_directory, download_file

sysetup-1.4.3/src/sysetup/utils/download.py

@@ -1,36 +0,0 @@
-import os
-
-import cli
-from backup.context import context as backup_context
-from backup.syncer import Syncer
-from backup.syncer.sync_configs import select_sync_config
-
-from sysetup.models import Path
-
-from .bitwarden import bitwarden
-
-
-def download_directory(path: Path) -> None:
-    download_item(directory=path)
-
-
-def download_file(path: Path) -> None:
-    download_item(path)
-
-
-def download_item(path: Path | None = None, directory: Path | None = None) -> None:
-    check_authenticated()
-    location = path or directory
-    assert location is not None
-    config = select_sync_config(location)
-    config.path = path
-    config.directory = directory
-    Syncer(config).capture_pull()
-
-
-def check_authenticated() -> None:
-    try:
-        assert backup_context.secrets.rclone
-    except cli.models.CalledProcessError:
-        os.environ["RCLONE"] = "dummy"
-        backup_context.secrets.rclone = bitwarden.client.fetch_secret("Rclone")

sysetup-1.4.3/src/sysetup.egg-info/requires.txt

@@ -1,12 +0,0 @@
-backupmaster<3,>=2.0.2
-dbus-next<1,>=0.2.3
-package-utils[context]<1,>=0.6.1
-powercli<1,>=0.3.1
-requests<3,>=2.32.3
-superpathlib<3,>=2.0.4
-
-[dev]
-dirhash<1,>=0.5.0
-types-requests<3,>=2.32.0.20250306
-package-dev-tools<1,>=0.7.1
-package-dev-utils<1,>=0.1.6

sysetup-1.4.3/tests/test_background.py

@@ -1,54 +0,0 @@
-import os
-from collections.abc import Callable, Iterator
-
-import pytest
-from backup.utils import setup
-
-from sysetup.main.files.settings import set_background
-from sysetup.models import Path
-
-plasma_config_path = Path.HOME / ".config" / "plasma-org.kde.plasma.desktop-appletsrc"
-
-
-@pytest.fixture
-def restore(path: Path) -> Callable[[Path], Iterator[None]]:
-    def _restore(restored_path: Path) -> Iterator[None]:
-        exists = restored_path.exists()
-        if exists:
-            restored_path.copy_to(path, include_properties=False)
-        yield
-        if exists:
-            path.rename(restored_path, exist_ok=True)
-
-    return _restore
-
-
-@pytest.fixture
-def restore_and_check(
-    restore: Callable[[Path], Iterator[None]],
-) -> Callable[[Path], Iterator[None]]:
-    setup.check_setup()
-
-    def _restore_and_check(restored_path: Path) -> Iterator[None]:
-        content_hash = restored_path.content_hash
-        yield from restore(restored_path)
-        assert restored_path.content_hash == content_hash
-
-    return _restore_and_check
-
-
-@pytest.fixture
-def restore_config_path(
-    restore_and_check: Callable[[Path], Iterator[None]],
-) -> Iterator[None]:
-    yield from restore_and_check(plasma_config_path)
-
-
-def test_wallpaper(
-    restore_config_path: Callable[[Path], Iterator[None]],  # noqa: ARG001
-) -> None:
-    # "org.kde.PlasmaShell.evaluateScript missing in GITHUB_ACTIONS"
-    # still run existing test case to maximize code under coverage
-    if "GITHUB_ACTIONS" not in os.environ:
-        set_background()
-        assert "Qwallpapers" in plasma_config_path.text

sysetup-1.4.3/tests/test_cli_entry_point.py

@@ -1,12 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-from package_dev_utils.tests.args import no_cli_args
-
-from sysetup import cli
-
-
-@no_cli_args
-@patch("sysetup.main.main.setup")
-def test_entry_point(mocked_setup: MagicMock) -> None:
-    cli.entry_point()
-    mocked_setup.assert_called_once()

sysetup-1.4.3/tests/test_main.py

@@ -1,12 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-from package_dev_utils.tests.args import no_cli_args
-
-from sysetup.main.main import main
-
-
-@no_cli_args
-@patch("sysetup.main.main.setup")
-def test_main(mocked_setup: MagicMock) -> None:
-    main()
-    mocked_setup.assert_called_once()