sysetup 1.2.1__tar.gz → 1.3.dev0__tar.gz

{sysetup-1.2.1/src/sysetup.egg-info → sysetup-1.3.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.2.1
+Version: 1.3.dev0
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -8,7 +8,7 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<2,>=1.2.6
+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
@@ -21,6 +21,7 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 
 # 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)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)

{sysetup-1.2.1 → sysetup-1.3.dev0}/README.md

@@ -1,5 +1,6 @@
 # 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)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)

{sysetup-1.2.1 → sysetup-1.3.dev0}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "sysetup"
-version = "1.2.1"
+version = "1.3.dev0"
 description = "Personal system setup"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "backupmaster >=1.2.6, <2",
+    "backupmaster >=1.2.21, <2",
     "dbus-next >=0.2.3, <1",
     "package-utils[context] >=0.6.1, <1",
     "powercli >=0.3.1, <1",
@@ -62,9 +62,6 @@ ignore = [
     "S101", # assert used
 ]
 
-[tool.ruff.lint.isort]
-known-first-party = ["src"]
-
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/main/environment.py

@@ -9,6 +9,5 @@ from sysetup.utils import download_file
 def setup() -> None:
     download_file(Path("etc") / "environment")
     if "SUDO_ASKPASS" not in os.environ:
-        path = Path.HOME / ".bask_profile"
-        download_file(Path.HOME / ".bask_profile")
-        load_dotenv(dotenv_path=Path.HOME / path)
+        download_file(Path.profile)
+        load_dotenv(dotenv_path=Path.profile)

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/main/files/assets.py

@@ -6,10 +6,15 @@ from sysetup.utils import download_directory
 
 
 def setup() -> None:
-    download_directory(Path.assets)
+    directories = (
+        Path.assets,
+        Path.HOME / ".local" / "share" / "kwalletd",
+        Path.assets.parent / "backup",
+    )
+    for directory in directories:
+        download_directory(directory)
     move_crontab()
     move_setup_files()
-    download_directory(Path.assets.parent / "backup")
 
 
 def move_crontab() -> None:

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/main/files/settings.py

@@ -41,5 +41,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:
+    if not context.is_running_in_test and cli.completes_successfully("which qdbus"):
         cli.run(command, script)

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/main/installations.py

@@ -4,11 +4,15 @@ import cli
 
 from sysetup.context import context
 from sysetup.models import Path
+from sysetup.utils import download_file
 
 
 def setup() -> None:
     install_chromium()
-    install_jumpapp()
+    install_keyd()
+    download_file(Path("/") / "etc" / "systemd" / "system" / "ydotoold.service")
+    enable_service("ydotoold")
+    enable_service("ssh")
     install_language_support()
     install_linter_env()
     install_personal_git_repositories()
@@ -19,10 +23,10 @@ def install_personal_git_repositories() -> None:
     token = os.getenv("GITHUB", None)
     if token is not None:
         base_url = base_url.replace("github.com", f"{token}@github.com")
-    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")
+        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")
 
 
 def install_language_support() -> None:
@@ -60,8 +64,23 @@ def install_linter_env() -> None:
         cli.run(f"{python_path} -m pip install autoimport powertrace-hooks")
 
 
-def install_jumpapp() -> None:
-    if not cli.capture_output("which jumpapp", check=False):
+def install_keyd() -> None:
+    install_repository("keyd", "quintenroets/keyd", branch="support-scroll-mapping")
+    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, branch: str | None = None) -> None:
+    if not cli.capture_output("which", name, check=False):
+        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("git clone https://github.com/mkropat/jumpapp", directory)
+            cli.run(*command, directory)
             cli.run_commands("make", "sudo make install", cwd=directory)

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/main/packages.py

@@ -19,6 +19,13 @@ def install_packages() -> None:
         packages: list[str] = path.yaml
         cli.install(*packages, install_command=command)
 
+    if not context.apt_is_installed:
+        commands = (
+            "sudo pacman -S --noconfirm python-pip base-devel",
+            "pip install wheel",
+        )
+        cli.run_commands(*commands)
+
 
 def update_package_manager() -> None:
     if context.apt_is_installed:
@@ -28,10 +35,10 @@ def update_package_manager() -> None:
 
 
 def update_apt() -> None:
-    agree_eula_command = (
-        "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula"
-        "select true | sudo debconf-set-selections"
+    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():
@@ -39,16 +46,15 @@ def update_apt() -> None:
 
 
 def cleanup_after_install() -> None:
-    after_install_command = (
-        "sudo apt-get autoremove -y"
-        if context.apt_is_installed
-        else (
-            "sudo pacman -S --noconfirm python-pip; sudo pacman -S --noconfirm"
-            " base-devel; pip install wheel"
+    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",
         )
-    )
-    cli.run_commands_in_shell(after_install_command, "sudo tlp start")
-    cli.run("systemctl enable ssh", root=True)  # start ssh server before log in
+        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

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup/models/path.py

@@ -33,7 +33,7 @@ class Path(superpathlib.Path):
     @classmethod
     @classproperty
     def linter_env(cls: type[T]) -> T:
-        path = Path.HOME / ".local" / "share" / "envs" / "linterenv"
+        path = cls.HOME / ".local" / "share" / "envs" / "linterenv"
         return cast(T, path)
 
     @classmethod
@@ -47,3 +47,9 @@ 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.2.1 → sysetup-1.3.dev0/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.2.1
+Version: 1.3.dev0
 Summary: Personal system setup
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
@@ -8,7 +8,7 @@ Project-URL: Source Code, https://github.com/quintenroets/sysetup
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backupmaster<2,>=1.2.6
+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
@@ -21,6 +21,7 @@ Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 
 # 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)
 ![Coverage](https://img.shields.io/badge/coverage-66%25-brightgreen)

{sysetup-1.2.1 → sysetup-1.3.dev0}/src/sysetup.egg-info/requires.txt

@@ -1,4 +1,4 @@
-backupmaster<2,>=1.2.6
+backupmaster<2,>=1.2.21
 dbus-next<1,>=0.2.3
 package-utils[context]<1,>=0.6.1
 powercli<1,>=0.3.1

{sysetup-1.2.1 → sysetup-1.3.dev0}/tests/test_background.py

@@ -5,13 +5,14 @@ import cli
 import pytest
 from backup.context import context
 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()
+@pytest.fixture
 def restore(path: Path) -> Callable[[Path], Iterator[None]]:
     def _restore(restored_path: Path) -> Iterator[None]:
         exists = restored_path.exists()
@@ -24,7 +25,7 @@ def restore(path: Path) -> Callable[[Path], Iterator[None]]:
     return _restore
 
 
-@pytest.fixture()
+@pytest.fixture
 def restore_and_check(
     restore: Callable[[Path], Iterator[None]],
 ) -> Callable[[Path], Iterator[None]]:
@@ -48,7 +49,7 @@ def restore_and_check(
     return _restore_and_check
 
 
-@pytest.fixture()
+@pytest.fixture
 def restore_config_path(
     restore_and_check: Callable[[Path], Iterator[None]],
 ) -> Iterator[None]:

{sysetup-1.2.1 → sysetup-1.3.dev0}/tests/test_cli_entry_point.py

@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 from package_dev_utils.tests.args import no_cli_args
+
 from sysetup import cli
 
 

{sysetup-1.2.1 → sysetup-1.3.dev0}/tests/test_installer.py

@@ -1,6 +1,7 @@
 from unittest.mock import PropertyMock, patch
 
 import cli
+
 from sysetup.main.installations import install_linter_env
 from sysetup.models import Path
 

{sysetup-1.2.1 → sysetup-1.3.dev0}/tests/test_main.py

@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 from package_dev_utils.tests.args import no_cli_args
+
 from sysetup.main.main import main