diff --git a/.config/setup/01-install-packages.sh b/.config/setup/04-install-deb-packages.sh
similarity index 81%
rename from .config/setup/01-install-packages.sh
rename to .config/setup/04-install-deb-packages.sh
index 5653bd4..d1e8af7 100755
--- a/.config/setup/01-install-packages.sh
+++ b/.config/setup/04-install-deb-packages.sh
@@ -106,31 +106,5 @@ META_PKGS=(
     # keep-sorted end
 )
 
-PIPX_PKGS=(
-    # keep-sorted start
-    python-lsp-server
-    rshell
-    ruff
-    # keep-sorted end
-)
-
 sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes "${DEB_PKGS[@]}"
 sudo DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends --yes "${META_PKGS[@]}"
-
-if (( "${#PIPX_PKGS[@]}" != 0 )); then
-    pipx install "${PIPX_PKGS[@]}"
-fi
-
-PYLSP_PLUGINS=(
-    # keep-sorted start
-    fs
-    podman
-    pydantic
-    pylsp-mypy
-    pylsp-rope
-    pytest
-    types-pyxdg
-    # keep-sorted end
-)
-
-pipx inject python-lsp-server "${PYLSP_PLUGINS[@]}"
diff --git a/.config/setup/06-install-pipx-packages.sh b/.config/setup/06-install-pipx-packages.sh
new file mode 100755
index 0000000..91d04f3
--- /dev/null
+++ b/.config/setup/06-install-pipx-packages.sh
@@ -0,0 +1,30 @@
+#! /usr/bin/bash
+
+set -euo pipefail
+IFS=$'\n\t'
+
+PIPX_PKGS=(
+    # keep-sorted start
+    python-lsp-server
+    rshell
+    ruff
+    # keep-sorted end
+)
+
+if (( "${#PIPX_PKGS[@]}" != 0 )); then
+    pipx install "${PIPX_PKGS[@]}"
+fi
+
+PYLSP_PLUGINS=(
+    # keep-sorted start
+    fs
+    podman
+    pydantic
+    pylsp-mypy
+    pylsp-rope
+    pytest
+    types-pyxdg
+    # keep-sorted end
+)
+
+pipx inject python-lsp-server "${PYLSP_PLUGINS[@]}"