From: alex <alex@pdp7.net>
Date: Sun, 7 Sep 2025 15:11:56 +0000 (+0200)
Subject: Clean up
X-Git-Url: https://xn--ix-yja.es/gitweb/?a=commitdiff_plain;h=7eb68dba62c4138ed25e839c6652f863350f8343;p=alex.git

Clean up

* Remove now-unused distrobox
* Make homogenous use of setup-*
---

diff --git a/scripts/p7s/distrobox.py b/scripts/p7s/distrobox.py
deleted file mode 100644
index 787f05e..0000000
--- a/scripts/p7s/distrobox.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import subprocess
-
-
-IMAGE="quay.io/alexpdp7/workstation:latest"
-NAME="workstation-latest"
-
-
-def create():
-    subprocess.run(["distrobox", "create", "-i", IMAGE], check=True)
-
-
-def enter():
-    os.execvp("distrobox", ["distrobox", "enter", NAME])
-
-
-def update():
-    print("If this fails on ws, systemctl --user stop soju bitlbee // systemctl --user start soju bitlbee")
-    subprocess.run(["distrobox", "rm", "-f", NAME], check=True)
-    subprocess.run(["podman", "rmi", IMAGE], check=True)
-    subprocess.run(["podman", "pull", IMAGE], check=True)
-    subprocess.run(["distrobox", "create", "-i", IMAGE], check=True)
diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml
index 0ebf657..7a45f4e 100644
--- a/scripts/pyproject.toml
+++ b/scripts/pyproject.toml
@@ -13,20 +13,16 @@ httpx = "^0.28.1"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-
 [tool.poetry.scripts]
 ruscreen = 'p7s.ruscreen:main'
-mbsync_config = 'p7s.mail:generate_config'
-db-create = 'p7s.distrobox:create'
-db-enter = 'p7s.distrobox:enter'
-db-update = 'p7s.distrobox:update'
-nextcloud_setup = 'p7s.nextcloud:setup_nextcloud'
-soju_setup = 'p7s.soju:setup_soju'
-bitlbee_setup = 'p7s.bitlbee:setup_bitlbee'
-setup_bash = 'p7s.bash:setup_bash'
-setup_emacs = 'p7s.emacs:setup_emacs'
-setup_ubpkg = 'p7s.ubpkg:setup_ubpkg'
-setup_paperwm = 'p7s.paperwm:setup_paperwm'
-setup_x12 = 'p7s.x12:setup_x12'
+setup-bash = 'p7s.bash:setup_bash'
+setup-bitlbee = 'p7s.bitlbee:setup_bitlbee'
+setup-emacs = 'p7s.emacs:setup_emacs'
+setup-mbsync = 'p7s.mail:setup_mbsync'
+setup-nextcloud = 'p7s.nextcloud:setup_nextcloud'
+setup-paperwm = 'p7s.paperwm:setup_paperwm'
+setup-soju = 'p7s.soju:setup_soju'
+setup-ubpkg = 'p7s.ubpkg:setup_ubpkg'
+setup-x12 = 'p7s.x12:setup_x12'
 senpai = 'p7s.senpai:main'
 ledger = 'p7s.ledger:main'