sysetup 1.4.0__tar.gz → 1.4.2__tar.gz

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

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.0
+Version: 1.4.2
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
-License: MIT
+License-Expression: MIT
 Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -16,8 +16,9 @@ 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-tools<1,>=0.7.1; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
+Dynamic: license-file
 
 # Sysetup
 [![PyPI version](https://badge.fury.io/py/sysetup.svg)](https://badge.fury.io/py/sysetup)
@@ -39,14 +40,10 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
     * Set wallpaper
     * Select We10OSX Cursors
 3) Configure autocpufreq
-4) Setup Chrome
-    * Enable GPU acceleration in chrome://flags
-    * PDF viewer: set page zoom to page fit
-    * Import certificate from Scripts/assets/sysetup/certificates/certificate.crt
-    * Click experimental: enable tab groups save and sync
-5) Login to
-    * Pycharm professional
-6) For new device: set touchpad scroll direction and click on touch
+4) Login to Pycharm professional
+5) For new device: configure mousepad
+   * natural touchpad scroll direction
+   * click on touch
 
 ## Installation
 ```shell

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

@@ -18,14 +18,10 @@
     * Set wallpaper
     * Select We10OSX Cursors
 3) Configure autocpufreq
-4) Setup Chrome
-    * Enable GPU acceleration in chrome://flags
-    * PDF viewer: set page zoom to page fit
-    * Import certificate from Scripts/assets/sysetup/certificates/certificate.crt
-    * Click experimental: enable tab groups save and sync
-5) Login to
-    * Pycharm professional
-6) For new device: set touchpad scroll direction and click on touch
+4) Login to Pycharm professional
+5) For new device: configure mousepad
+   * natural touchpad scroll direction
+   * click on touch
 
 ## Installation
 ```shell

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

@@ -1,9 +1,9 @@
 [project]
 name = "sysetup"
-version = "1.4.0"
+version = "1.4.2"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
-license = {text = "MIT"}
+license = "MIT"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
@@ -18,7 +18,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "types-requests >=2.32.0.20250306, <3",
-    "package-dev-tools >=0.5.11, <1",
+    "package-dev-tools >=0.7.1, <1",
     "package-dev-utils >=0.1.6, <1",
 ]
 

{sysetup-1.4.0 → sysetup-1.4.2}/src/sysetup/context/__init__.py

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

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

@@ -3,12 +3,12 @@ from functools import cached_property
 
 from package_utils.context import Context as Context_
 
-from sysetup.models import Options
-
 from .installations import is_installed
+from .options import Options
+from .secrets_ import Secrets
 
 
-class Context(Context_[Options, None, None]):
+class Context(Context_[Options, None, Secrets]):
     @cached_property
     def package_manager(self) -> str:
         options = "apt-get", "pacman"
@@ -23,4 +23,4 @@ class Context(Context_[Options, None, None]):
         return "DISPLAY" not in os.environ
 
 
-context = Context(Options)
+context = Context(Options, Secrets=Secrets)

sysetup-1.4.2/src/sysetup/context/secrets_.py

@@ -0,0 +1,10 @@
+import os
+from dataclasses import dataclass, field
+
+
+@dataclass
+class Secrets:
+    bw_clientid: str = field(default_factory=lambda: os.environ.get("BW_CLIENTID", ""))
+    bw_clientsecret: str = field(
+        default_factory=lambda: os.environ.get("BW_CLIENTSECRET", ""),
+    )

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

@@ -4,6 +4,8 @@ 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()
@@ -30,7 +32,7 @@ def install_language_support() -> None:
         pass
     else:
         if packages:
-            cli.install(packages)
+            install(packages)
 
 
 def install_chromium() -> None:
@@ -49,6 +51,19 @@ def _install_chromium() -> None:
     )
     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:

{sysetup-1.4.0 → sysetup-1.4.2}/src/sysetup/main/main.py

@@ -1,7 +1,6 @@
 import cli
 
-from sysetup.context import context
-from sysetup.models import Action
+from sysetup.context import Action, context
 
 from . import files, installations, packages
 

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

@@ -24,10 +24,7 @@ def enable_sudo() -> None:
 
 def install_packages() -> None:
     download_directory(Path.packages)
-    packages_install_command = (
-        "apt-get install -y" if context.apt_is_installed else "pacman -S --noconfirm"
-    )
-    installations = {"packages": packages_install_command, "snap": "snap install"}
+    installations = {"packages": None, "snap": "snap install"}
     for name, command in installations.items():
         path = (Path.packages / name).with_suffix(".yaml")
         packages: list[str] = path.yaml
@@ -71,7 +68,14 @@ def update_apt() -> None:
         cli.run("ln -s /var/lib/snapd/snap /snap", root=True)
 
 
-def install(packages: Iterable[str], install_command: str) -> None:
+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"

sysetup-1.4.2/src/sysetup/models/__init__.py

@@ -0,0 +1 @@
+from .path import Path

{sysetup-1.4.0 → sysetup-1.4.2}/src/sysetup/models/path.py

@@ -2,6 +2,7 @@ from typing import TypeVar, cast
 
 import superpathlib
 from simple_classproperty import classproperty
+from typing_extensions import Self
 
 T = TypeVar("T", bound="Path")
 
@@ -9,35 +10,35 @@ T = TypeVar("T", bound="Path")
 class Path(superpathlib.Path):
     @classmethod
     @classproperty
-    def source_root(cls: type[T]) -> T:
+    def source_root(cls) -> Self:
         return cls(__file__).parent.parent
 
     @classmethod
     @classproperty
-    def assets(cls: type[T]) -> T:
+    def assets(cls) -> Self:
         path = cls.script_assets / cls.source_root.name
-        return cast(T, path)
+        return cast("Self", path)
 
     @classmethod
     @classproperty
-    def config(cls: type[T]) -> T:
+    def config(cls) -> Self:
         path = cls.assets / "config" / "config.yaml"
-        return cast(T, path)
+        return cast("Self", path)
 
     @classmethod
     @classproperty
-    def packages(cls: type[T]) -> T:
+    def packages(cls) -> Self:
         path = cls.assets / "packages"
-        return cast(T, path)
+        return cast("Self", path)
 
     @classmethod
     @classproperty
-    def extensions(cls: type[T]) -> T:
+    def extensions(cls) -> Self:
         path = cls.HOME / ".local" / "share" / "extensions"
-        return cast(T, path)
+        return cast("Self", path)
 
     @classmethod
     @classproperty
-    def update_wallpaper_script(cls: type[T]) -> T:
+    def update_wallpaper_script(cls) -> Self:
         path = cls.source_root / "assets" / "scripts" / "update_wallpaper.js"
-        return cast(T, path)
+        return cast("Self", path)

{sysetup-1.4.0 → sysetup-1.4.2}/src/sysetup/utils/bitwarden.py

@@ -23,14 +23,19 @@ class Client:
         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)
+        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]
+        command: tuple[str, ...]
+        if context.secrets.bw_clientid:
+            cli.run("./bw login --apikey")
+            command = "./bw unlock --raw", self.password
+        else:
+            command = "./bw login --raw", self.email, self.password
+        return cli.capture_output(*command)
 
     def download_cli(self) -> None:
         response = requests.get(self.download_url, timeout=10).content

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

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sysetup
-Version: 1.4.0
+Version: 1.4.2
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
-License: MIT
+License-Expression: MIT
 Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -16,8 +16,9 @@ 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-tools<1,>=0.7.1; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
+Dynamic: license-file
 
 # Sysetup
 [![PyPI version](https://badge.fury.io/py/sysetup.svg)](https://badge.fury.io/py/sysetup)
@@ -39,14 +40,10 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
     * Set wallpaper
     * Select We10OSX Cursors
 3) Configure autocpufreq
-4) Setup Chrome
-    * Enable GPU acceleration in chrome://flags
-    * PDF viewer: set page zoom to page fit
-    * Import certificate from Scripts/assets/sysetup/certificates/certificate.crt
-    * Click experimental: enable tab groups save and sync
-5) Login to
-    * Pycharm professional
-6) For new device: set touchpad scroll direction and click on touch
+4) Login to Pycharm professional
+5) For new device: configure mousepad
+   * natural touchpad scroll direction
+   * click on touch
 
 ## Installation
 ```shell

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

@@ -14,8 +14,11 @@ 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/main/__init__.py
 src/sysetup/main/installations.py
 src/sysetup/main/main.py
@@ -26,8 +29,6 @@ src/sysetup/main/files/permissions.py
 src/sysetup/main/files/settings.py
 src/sysetup/main/files/setup.py
 src/sysetup/models/__init__.py
-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

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

@@ -7,5 +7,5 @@ superpathlib<3,>=2.0.4
 
 [dev]
 types-requests<3,>=2.32.0.20250306
-package-dev-tools<1,>=0.5.11
+package-dev-tools<1,>=0.7.1
 package-dev-utils<1,>=0.1.6

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

@@ -1,3 +0,0 @@
-from .action import Action
-from .options import Options
-from .path import Path