sysetup 1.3.3__tar.gz → 1.3.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.3.3
+Version: 1.3.5
 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

{sysetup-1.3.3 → sysetup-1.3.5}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "sysetup"
-version = "1.3.3"
+version = "1.3.5"
 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",

{sysetup-1.3.3 → sysetup-1.3.5}/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.3.3 → sysetup-1.3.5}/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_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()
@@ -61,15 +65,22 @@ def install_linter_env() -> None:
 
 
 def install_keyd() -> None:
-    install_repository("keyd", "quintenroets/keyd")
-    commands = ("systemctl enable keyd", "systemctl start keyd")
+    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:
-        cli.run_commands(*commands, root=True)
+        command = f"systemctl enable --now {name}"
+        cli.run(command, root=True)
 
 
-def install_repository(name: str, repository: str) -> None:
+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", url, directory)
+            cli.run(*command, directory)
             cli.run_commands("make", "sudo make install", cwd=directory)

{sysetup-1.3.3 → sysetup-1.3.5}/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.3.3 → sysetup-1.3.5/src/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.3.3
+Version: 1.3.5
 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

{sysetup-1.3.3 → sysetup-1.3.5}/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