sysetup 1.3.6__tar.gz → 1.4.0__tar.gz

{sysetup-1.3.6/src/sysetup.egg-info → sysetup-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sysetup
-Version: 1.3.6
+Version: 1.4.0
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -12,10 +12,10 @@ Requires-Dist: backupmaster<2,>=1.2.21
 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: python-dotenv<2,>=1.0.1
 Requires-Dist: requests<3,>=2.32.3
 Requires-Dist: superpathlib<3,>=2.0.4
 Provides-Extra: dev
+Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.5.11; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 
@@ -34,7 +34,7 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
    ```shell
    wget -O - sysetup.quintenroets.com | bash
    ```
-   give rclone password when prompted
+   give Bitwarden password when prompted
 2) Appearance
     * Set wallpaper
     * Select We10OSX Cursors
@@ -46,7 +46,6 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
     * Click experimental: enable tab groups save and sync
 5) Login to
     * Pycharm professional
-    * VNC Server
 6) For new device: set touchpad scroll direction and click on touch
 
 ## Installation

{sysetup-1.3.6 → sysetup-1.4.0}/README.md

@@ -13,7 +13,7 @@
    ```shell
    wget -O - sysetup.quintenroets.com | bash
    ```
-   give rclone password when prompted
+   give Bitwarden password when prompted
 2) Appearance
     * Set wallpaper
     * Select We10OSX Cursors
@@ -25,7 +25,6 @@
     * Click experimental: enable tab groups save and sync
 5) Login to
     * Pycharm professional
-    * VNC Server
 6) For new device: set touchpad scroll direction and click on touch
 
 ## Installation

{sysetup-1.3.6 → sysetup-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sysetup"
-version = "1.3.6"
+version = "1.4.0"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}
@@ -11,13 +11,13 @@ dependencies = [
     "dbus-next >=0.2.3, <1",
     "package-utils[context] >=0.6.1, <1",
     "powercli >=0.3.1, <1",
-    "python-dotenv >=1.0.1, <2",
     "requests >=2.32.3, <3",
     "superpathlib >=2.0.4, <3",
 ]
 
 [project.optional-dependencies]
 dev = [
+    "types-requests >=2.32.0.20250306, <3",
     "package-dev-tools >=0.5.11, <1",
     "package-dev-utils >=0.1.6, <1",
 ]

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/context/context.py

@@ -4,7 +4,8 @@ from functools import cached_property
 from package_utils.context import Context as Context_
 
 from sysetup.models import Options
-from sysetup.utils import is_installed
+
+from .installations import is_installed
 
 
 class Context(Context_[Options, None, None]):

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/main/files/assets.py

@@ -33,11 +33,12 @@ def move_setup_files() -> None:
             else:
                 archived_setup_files.append(path)
 
-    backup = cache.Backup(paths=setup_files)
-    backup.pull()
+    if setup_files:
+        cache.Backup(paths=setup_files).pull()
 
+    source = cache.Backup().source
     for path in archived_setup_files:
-        dest = (backup.source / path.relative_to(setup_files_root)).parent
+        dest = (source / path.relative_to(setup_files_root)).parent
         if dest.is_root and not dest.exists():
             cli.run("mkdir -p", dest, root=True)
         else:

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/main/files/settings.py

@@ -2,7 +2,7 @@ import cli
 
 from sysetup.context import context
 from sysetup.models import Path
-from sysetup.utils import download_directory
+from sysetup.utils import download_directory, is_installed
 
 
 def remove_clutter() -> None:
@@ -29,11 +29,8 @@ def set_background() -> None:  # pragma: nocover
         Path.HOME / ".local" / "share" / "wallpapers" / "Qwallpapers" / "background.jpg"
     )
     download_directory(wallpaper_path.parent)
-    wallpaper_uri = wallpaper_path.as_uri()
-    script = Path.update_wallpaper_script.text.replace(
-        "__wallpaper_uri__",
-        wallpaper_uri,
-    )
+    script = Path.update_wallpaper_script.text
+    script = script.replace("__wallpaper_uri__", wallpaper_path.as_uri())
     run_kde_script(script)
 
 
@@ -41,5 +38,5 @@ 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 cli.completes_successfully("which qdbus"):
+    if not context.is_running_in_test and is_installed("qdbus"):
         cli.run(command, script)

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/main/installations.py

@@ -1,27 +1,22 @@
-import os
-
 import cli
 
 from sysetup.context import context
 from sysetup.models import Path
-from sysetup.utils import download_file, is_installed
+from sysetup.utils import bitwarden, is_installed
 
 
 def setup() -> None:
     install_chromium()
     install_keyd()
-    download_file(Path("/") / "etc" / "systemd" / "system" / "ydotoold.service")
-    enable_service("ydotoold")
+    install_ydotool()
     enable_service("ssh")
     install_language_support()
     install_personal_git_repositories()
 
 
 def install_personal_git_repositories() -> None:
-    base_url = "https://github.com/quintenroets"
-    token = os.getenv("GITHUB", None)
-    if token is not None:
-        base_url = base_url.replace("github.com", f"{token}@github.com")
+    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)
@@ -72,4 +67,14 @@ def install_repository(name: str, repository: str) -> None:
         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.3.6 → sysetup-1.4.0}/src/sysetup/main/main.py

@@ -3,7 +3,7 @@ import cli
 from sysetup.context import context
 from sysetup.models import Action
 
-from . import environment, files, installations, packages
+from . import files, installations, packages
 
 
 def main() -> None:
@@ -12,17 +12,15 @@ def main() -> None:
     """
     action_mapper = {
         Action.all.value: setup,
-        Action.env.value: environment.setup,
+        Action.packages.value: packages.setup,
         Action.files.value: files.setup,
         Action.install.value: installations.setup,
-        Action.packages.value: packages.setup,
     }
     action = action_mapper[context.options.action.value]
     action()
 
 
 def setup() -> None:
-    environment.setup()
     packages.setup()
     files.setup()
     installations.setup()

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/main/packages.py

@@ -1,29 +1,58 @@
+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 download_directory, is_installed
+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"}
+    packages_install_command = (
+        "apt-get install -y" if context.apt_is_installed else "pacman -S --noconfirm"
+    )
+    installations = {"packages": packages_install_command, "snap": "snap install"}
     for name, command in installations.items():
         path = (Path.packages / name).with_suffix(".yaml")
         packages: list[str] = path.yaml
-        cli.install(*packages, install_command=command)
+        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()
@@ -42,16 +71,13 @@ def update_apt() -> None:
         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",  # Fails on VM
-        f"{delete} firefox",  # fails if firefox not installed
-    )
-    cli.run_commands(*commands, check=False, root=True)
+def install(packages: Iterable[str], install_command: str) -> None:
+    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.3.6 → sysetup-1.4.0}/src/sysetup/models/action.py

@@ -6,4 +6,3 @@ class Action(str, Enum):
     files = "files"
     packages = "packages"
     install = "install"
-    env = "env"

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup/models/options.py

@@ -8,4 +8,6 @@ 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.3.6 → sysetup-1.4.0}/src/sysetup/models/path.py

@@ -41,9 +41,3 @@ class Path(superpathlib.Path):
     def update_wallpaper_script(cls: type[T]) -> T:
         path = cls.source_root / "assets" / "scripts" / "update_wallpaper.js"
         return cast(T, path)
-
-    @classmethod
-    @classproperty
-    def profile(cls: type[T]) -> T:
-        path = cls.HOME / ".bash_profile"
-        return cast(T, path)

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

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

sysetup-1.4.0/src/sysetup/utils/bitwarden.py

@@ -0,0 +1,52 @@
+import io
+import json
+import zipfile
+from dataclasses import dataclass
+from functools import cached_property
+from typing import cast
+
+import cli
+import requests
+from rich.prompt import Prompt
+
+from sysetup.context import context
+from sysetup.models import Path
+
+
+@dataclass
+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"]
+        return cast(str, secret)
+
+    @cached_property
+    def session_token(self) -> str:
+        if not Path("bw").exists():
+            self.download_cli()
+        output = cli.capture_output(f"./bw login {self.email} {self.password}")
+        return output.split("--session ")[-1]
+
+    def download_cli(self) -> None:
+        response = requests.get(self.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()

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

@@ -0,0 +1,28 @@
+import os
+
+import cli
+from backup.backups import Backup
+from backup.context import context as backup_context
+from backup.models import Path as BackupPath
+
+from sysetup.models import Path
+
+from .bitwarden import bitwarden
+
+
+def download_directory(path: Path) -> None:
+    check_authenticated()
+    Backup(sub_check_path=BackupPath(path), confirm=False).pull()
+
+
+def download_file(path: Path) -> None:
+    check_authenticated()
+    Backup(path=BackupPath(path), confirm=False).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.3.6 → sysetup-1.4.0/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sysetup
-Version: 1.3.6
+Version: 1.4.0
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -12,10 +12,10 @@ Requires-Dist: backupmaster<2,>=1.2.21
 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: python-dotenv<2,>=1.0.1
 Requires-Dist: requests<3,>=2.32.3
 Requires-Dist: superpathlib<3,>=2.0.4
 Provides-Extra: dev
+Requires-Dist: types-requests<3,>=2.32.0.20250306; extra == "dev"
 Requires-Dist: package-dev-tools<1,>=0.5.11; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 
@@ -34,7 +34,7 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
    ```shell
    wget -O - sysetup.quintenroets.com | bash
    ```
-   give rclone password when prompted
+   give Bitwarden password when prompted
 2) Appearance
     * Set wallpaper
     * Select We10OSX Cursors
@@ -46,7 +46,6 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
     * Click experimental: enable tab groups save and sync
 5) Login to
     * Pycharm professional
-    * VNC Server
 6) For new device: set touchpad scroll direction and click on touch
 
 ## Installation

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup.egg-info/SOURCES.txt

@@ -15,8 +15,8 @@ src/sysetup/cli/__init__.py
 src/sysetup/cli/entry_point.py
 src/sysetup/context/__init__.py
 src/sysetup/context/context.py
+src/sysetup/context/installations.py
 src/sysetup/main/__init__.py
-src/sysetup/main/environment.py
 src/sysetup/main/installations.py
 src/sysetup/main/main.py
 src/sysetup/main/packages.py
@@ -30,8 +30,8 @@ src/sysetup/models/action.py
 src/sysetup/models/options.py
 src/sysetup/models/path.py
 src/sysetup/utils/__init__.py
+src/sysetup/utils/bitwarden.py
 src/sysetup/utils/download.py
-src/sysetup/utils/installations.py
 tests/test_background.py
 tests/test_cli_entry_point.py
 tests/test_main.py

{sysetup-1.3.6 → sysetup-1.4.0}/src/sysetup.egg-info/requires.txt

@@ -2,10 +2,10 @@ backupmaster<2,>=1.2.21
 dbus-next<1,>=0.2.3
 package-utils[context]<1,>=0.6.1
 powercli<1,>=0.3.1
-python-dotenv<2,>=1.0.1
 requests<3,>=2.32.3
 superpathlib<3,>=2.0.4
 
 [dev]
+types-requests<3,>=2.32.0.20250306
 package-dev-tools<1,>=0.5.11
 package-dev-utils<1,>=0.1.6

{sysetup-1.3.6 → sysetup-1.4.0}/tests/test_background.py

@@ -3,7 +3,6 @@ from collections.abc import Callable, Iterator
 
 import cli
 import pytest
-from backup.context import context
 from backup.utils import setup
 
 from sysetup.main.files.settings import set_background
@@ -30,17 +29,10 @@ def restore_and_check(
     restore: Callable[[Path], Iterator[None]],
 ) -> Callable[[Path], Iterator[None]]:
     setup.check_setup()
-    env = os.environ | {"RCLONE_CONFIG_PASS": context.secrets.rclone}
-    env.pop("RCLONE_PASSWORD_COMMAND", None)
 
     def _restore_and_check(restored_path: Path) -> Iterator[None]:
         def extract_content_hash() -> str:
-            return cli.capture_output(
-                "rclone hashsum MD5",
-                restored_path,
-                env=env,
-                check=False,
-            )
+            return cli.capture_output("rclone hashsum MD5", restored_path, check=False)
 
         content_hash = extract_content_hash()
         yield from restore(restored_path)

sysetup-1.3.6/src/sysetup/main/environment.py

@@ -1,13 +0,0 @@
-import os
-
-from dotenv import load_dotenv
-
-from sysetup.models import Path
-from sysetup.utils import download_file
-
-
-def setup() -> None:
-    download_file(Path("etc") / "environment")
-    if "SUDO_ASKPASS" not in os.environ:
-        download_file(Path.profile)
-        load_dotenv(dotenv_path=Path.profile)

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

@@ -1,2 +0,0 @@
-from .download import download_directory, download_file
-from .installations import is_installed

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

@@ -1,12 +0,0 @@
-from backup.backups import Backup
-from backup.models import Path as BackupPath
-
-from sysetup.models import Path
-
-
-def download_directory(path: Path) -> None:
-    Backup(sub_check_path=BackupPath(path), confirm=False).pull()
-
-
-def download_file(path: Path) -> None:
-    Backup(path=BackupPath(path), confirm=False).pull()