sysetup 1.3.5__tar.gz → 1.3.7__tar.gz

{sysetup-1.3.5/src/sysetup.egg-info → sysetup-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sysetup
-Version: 1.3.5
+Version: 1.3.7
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -25,14 +25,14 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
 ![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
-## [Plasma](https://kde.org/plasma-desktop/) 5.22 required
+## [Plasma](https://kde.org/plasma-desktop/) 6 required
 
 [Setup info](docs/setup-plasma.md)
 
 ## Setup steps
 1) Run
    ```shell
-   wget -O - https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
+   wget -O - sysetup.quintenroets.com | bash
    ```
    give rclone password when prompted
 2) Appearance
@@ -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.5 → sysetup-1.3.7}/README.md

@@ -4,14 +4,14 @@
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
 ![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
-## [Plasma](https://kde.org/plasma-desktop/) 5.22 required
+## [Plasma](https://kde.org/plasma-desktop/) 6 required
 
 [Setup info](docs/setup-plasma.md)
 
 ## Setup steps
 1) Run
    ```shell
-   wget -O - https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
+   wget -O - sysetup.quintenroets.com | bash
    ```
    give rclone password when prompted
 2) Appearance
@@ -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.5 → sysetup-1.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sysetup"
-version = "1.3.5"
+version = "1.3.7"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}
@@ -55,11 +55,10 @@ fix = true
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [
-    "ANN101",  # annotate self
-    "ANN102",  # annotate cls
     "ANN401",  # annotated with Any
-    "D", # docstrings
-    "S101", # assert used
+    "D",       # docstrings
+    "G004",    # logging f-string
+    "S101",    # assert used
 ]
 
 [tool.ruff.lint.per-file-ignores]

{sysetup-1.3.5 → sysetup-1.3.7}/src/sysetup/context/context.py

@@ -1,23 +1,17 @@
 import os
-from collections.abc import Iterator
 from functools import cached_property
 
-import cli
 from package_utils.context import Context as Context_
 
 from sysetup.models import Options
+from sysetup.utils import is_installed
 
 
 class Context(Context_[Options, None, None]):
     @cached_property
     def package_manager(self) -> str:
-        def generate_package_manager() -> Iterator[str]:
-            package_managers = "apt-get", "pacman"
-            for package_manager in package_managers:
-                if cli.completes_successfully("which", package_manager):
-                    yield package_manager
-
-        return next(generate_package_manager())
+        options = "apt-get", "pacman"
+        return next(option for option in options if is_installed(option))
 
     @cached_property
     def apt_is_installed(self) -> bool:

{sysetup-1.3.5 → sysetup-1.3.7}/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.5 → sysetup-1.3.7}/src/sysetup/main/installations.py

@@ -4,17 +4,16 @@ import cli
 
 from sysetup.context import context
 from sysetup.models import Path
-from sysetup.utils import download_file
+from sysetup.utils import download_file, is_installed
 
 
 def setup() -> None:
     install_chromium()
     install_keyd()
+    install_ydotool()
     download_file(Path("/") / "etc" / "systemd" / "system" / "ydotoold.service")
-    enable_service("ydotoold")
     enable_service("ssh")
     install_language_support()
-    install_linter_env()
     install_personal_git_repositories()
 
 
@@ -26,7 +25,7 @@ def install_personal_git_repositories() -> None:
     if not Path.extensions.exists():
         command = f"git clone {base_url}/extensions.git"
         cli.run(command, Path.extensions)
-    cli.run(f"pip install git+{base_url}/system.git")
+    cli.run(f"uv pip install git+{base_url}/system.git")
 
 
 def install_language_support() -> None:
@@ -40,7 +39,7 @@ def install_language_support() -> None:
 
 
 def install_chromium() -> None:
-    if not cli.capture_output("which chromium-browser", check=False):
+    if not is_installed("chromium-browser"):
         _install_chromium()
 
 
@@ -57,15 +56,8 @@ def _install_chromium() -> None:
     cli.run_commands(*commands, shell=True, root=True, check=check)  # noqa: S604
 
 
-def install_linter_env() -> None:
-    if not Path.linter_env.exists():
-        cli.run("python -m venv", Path.linter_env.name, cwd=Path.linter_env.parent)
-        python_path = Path.linter_env / "bin" / "python"
-        cli.run(f"{python_path} -m pip install autoimport powertrace-hooks")
-
-
 def install_keyd() -> None:
-    install_repository("keyd", "quintenroets/keyd", branch="support-scroll-mapping")
+    install_repository("keyd", "rvaiya/keyd")
     enable_service("keyd")
 
 
@@ -75,12 +67,19 @@ def enable_service(name: str) -> None:
         cli.run(command, root=True)
 
 
-def install_repository(name: str, repository: str, branch: str | None = None) -> None:
-    if not cli.capture_output("which", name, check=False):
+def install_repository(name: str, repository: str) -> None:
+    if not is_installed(name):
         url = f"https://github.com/{repository}"
-        command: tuple[str, ...] = "git clone", url
-        if branch is not None:
-            command = (*command, "-b", branch)
         with Path.tempdir() as directory:
-            cli.run(*command, directory)
+            cli.run("git clone", url, directory)
+            if (directory / "CMakeLists.txt").exists():
+                cli.run("apt-get install cmake", root=True)
+                cli.run("cmake .")
             cli.run_commands("make", "sudo make install", cwd=directory)
+
+
+def install_ydotool() -> None:
+    if not is_installed("ydotool"):
+        cli.run("apt-get install scdoc")
+        install_repository("ydotool", "ReimuNotMoe/ydotool")
+        enable_service("ydotoold")

{sysetup-1.3.5 → sysetup-1.3.7}/src/sysetup/main/packages.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 setup() -> None:
@@ -20,10 +20,7 @@ def install_packages() -> None:
         cli.install(*packages, install_command=command)
 
     if not context.apt_is_installed:
-        commands = (
-            "sudo pacman -S --noconfirm python-pip base-devel",
-            "pip install wheel",
-        )
+        commands = "sudo pacman -S --noconfirm base-devel", "uv pip install wheel"
         cli.run_commands(*commands)
 
 
@@ -39,7 +36,7 @@ def update_apt() -> None:
         "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]
+    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)
@@ -49,11 +46,8 @@ def cleanup_after_install() -> None:
     if context.apt_is_installed:
         cli.run("sudo apt-get autoremove -y")
     cli.run("tlp start", root=True)
-    if cli.completes_successfully("which qdbus"):
-        commands = (
-            "rm /usr/bin/qdbus",
-            "ln -s /usr/lib/qt6/bin/qdbus /usr/bin/qdbus",
-        )
+    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 = (

{sysetup-1.3.5 → sysetup-1.3.7}/src/sysetup/models/path.py

@@ -30,12 +30,6 @@ class Path(superpathlib.Path):
         path = cls.assets / "packages"
         return cast(T, path)
 
-    @classmethod
-    @classproperty
-    def linter_env(cls: type[T]) -> T:
-        path = cls.HOME / ".local" / "share" / "envs" / "linterenv"
-        return cast(T, path)
-
     @classmethod
     @classproperty
     def extensions(cls: type[T]) -> T:

{sysetup-1.3.5 → sysetup-1.3.7}/src/sysetup/utils/__init__.py

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

sysetup-1.3.7/src/sysetup/utils/installations.py

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

{sysetup-1.3.5 → sysetup-1.3.7/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sysetup
-Version: 1.3.5
+Version: 1.3.7
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -25,14 +25,14 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 ![Python version](https://img.shields.io/badge/python-3.10+-brightgreen)
 ![Operating system](https://img.shields.io/badge/os-linux-brightgreen)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)
-## [Plasma](https://kde.org/plasma-desktop/) 5.22 required
+## [Plasma](https://kde.org/plasma-desktop/) 6 required
 
 [Setup info](docs/setup-plasma.md)
 
 ## Setup steps
 1) Run
    ```shell
-   wget -O - https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
+   wget -O - sysetup.quintenroets.com | bash
    ```
    give rclone password when prompted
 2) Appearance
@@ -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.5 → sysetup-1.3.7}/src/sysetup.egg-info/SOURCES.txt

@@ -31,7 +31,7 @@ src/sysetup/models/options.py
 src/sysetup/models/path.py
 src/sysetup/utils/__init__.py
 src/sysetup/utils/download.py
+src/sysetup/utils/installations.py
 tests/test_background.py
 tests/test_cli_entry_point.py
-tests/test_installer.py
 tests/test_main.py

sysetup-1.3.5/tests/test_installer.py

@@ -1,15 +0,0 @@
-from unittest.mock import PropertyMock, patch
-
-import cli
-
-from sysetup.main.installations import install_linter_env
-from sysetup.models import Path
-
-
-def test_linter_env() -> None:
-    with Path.tempfile(create=False) as path:
-        mocked_path = PropertyMock(return_value=path)
-        with patch.object(Path, "linter_env", new_callable=mocked_path):
-            install_linter_env()
-            python_path = Path.linter_env / "bin" / "python"
-            cli.run(f"{python_path} -m pip show autoimport")