diff --git a/.config/setup/04-install-deb-packages.sh b/.config/setup/04-install-deb-packages.sh index ae5a17e..a8d976f 100755 --- a/.config/setup/04-install-deb-packages.sh +++ b/.config/setup/04-install-deb-packages.sh @@ -60,7 +60,6 @@ DEB_PKGS=( ntfs-3g nvtop pipewire-audio - pipx postfix pre-commit pulseaudio-utils diff --git a/.config/setup/06-install-pipx-packages.sh b/.config/setup/06-install-pipx-packages.sh deleted file mode 100755 index e7bc1eb..0000000 --- a/.config/setup/06-install-pipx-packages.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /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 - testcontainers - types-docker - types-pyxdg - # keep-sorted end -) - -pipx inject python-lsp-server "${PYLSP_PLUGINS[@]}" diff --git a/.config/setup/46-install-uv-packages.sh b/.config/setup/46-install-uv-packages.sh new file mode 100755 index 0000000..0c09810 --- /dev/null +++ b/.config/setup/46-install-uv-packages.sh @@ -0,0 +1,30 @@ +#! /usr/bin/bash + +set -euo pipefail +IFS=$'\n\t' + +UV_PKGS=( + # keep-sorted start + rshell + ruff + # keep-sorted end +) + +for package in "${UV_PKGS[@]}"; do + uv tool install "${package}" +done + +PYLSP_PLUGINS=( + # keep-sorted start + --with fs + --with podman + --with pydantic + --with pylsp-mypy + --with pylsp-rope + --with pytest + --with testcontainers + --with types-docker + --with types-pyxdg + # keep-sorted end +) +uv tool install "${PYLSP_PLUGINS[@]}" python-lsp-server diff --git a/.local/bin/upgrade b/.local/bin/upgrade index 3e85388..9e432c7 100755 --- a/.local/bin/upgrade +++ b/.local/bin/upgrade @@ -19,8 +19,8 @@ cargo_update() { cargo install $(cargo install --list | grep '^[a-z0-9_-]\+ v[0-9.]\+:$' | cut --delimiter=' ' --fields=1) } -pipx_update() { - pipx upgrade-all +uv_update() { + uv tool upgrade --all } git_sync_update() { @@ -38,7 +38,7 @@ podman_update() { apt_update emacs_update -pipx_update +uv_update cargo_update ghup git_sync_update