From 2bbece233f5752fa6d1a2bfdb6a283c975fd1c31 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Sat, 11 May 2024 00:20:41 +0700
Subject: [PATCH] chore: remove pipx

---
 scripts/brew_init.sh     | 2 +-
 scripts/cargo.sh         | 1 +
 scripts/cargo_force.sh   | 1 +
 scripts/pipx_init.sh     | 7 -------
 scripts/pipx_maintain.sh | 3 ---
 scripts/rye_init.sh      | 8 ++++++++
 scripts/rye_maintain.sh  | 5 +++++
 7 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100755 scripts/pipx_init.sh
 delete mode 100755 scripts/pipx_maintain.sh
 create mode 100755 scripts/rye_init.sh
 create mode 100755 scripts/rye_maintain.sh

diff --git a/scripts/brew_init.sh b/scripts/brew_init.sh
index e099f68..e9956a1 100755
--- a/scripts/brew_init.sh
+++ b/scripts/brew_init.sh
@@ -6,5 +6,5 @@ brew install \
     fdupes rsync rclone restic \
     yt-dlp newsboat \
     btop \
-    clang-format pipx marksman moar \
+    clang-format marksman moar \
     qmk
diff --git a/scripts/cargo.sh b/scripts/cargo.sh
index 6f7a2ed..bbe5abf 100755
--- a/scripts/cargo.sh
+++ b/scripts/cargo.sh
@@ -10,6 +10,7 @@ cargo install --quiet --locked \
     daktilo
 
 cargo install --quiet --locked ripgrep --features 'pcre2'
+cargo install --quiet --git https://github.com/astral-sh/rye rye
 
 bat cache --build
 
diff --git a/scripts/cargo_force.sh b/scripts/cargo_force.sh
index 3bff5ac..b7a9d63 100755
--- a/scripts/cargo_force.sh
+++ b/scripts/cargo_force.sh
@@ -8,3 +8,4 @@ cargo install --quiet --force --locked \
     daktilo
 
 cargo install --quiet --force --locked ripgrep --features 'pcre2'
+cargo install --quiet --force --git https://github.com/astral-sh/rye rye
diff --git a/scripts/pipx_init.sh b/scripts/pipx_init.sh
deleted file mode 100755
index 0be803e..0000000
--- a/scripts/pipx_init.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-pipx ensurepath
-pipx install uv
-pipx install ruff
-pipx install pyright
-pipx install keymap-drawer
diff --git a/scripts/pipx_maintain.sh b/scripts/pipx_maintain.sh
deleted file mode 100755
index 37bd85c..0000000
--- a/scripts/pipx_maintain.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-pipx upgrade-all
diff --git a/scripts/rye_init.sh b/scripts/rye_init.sh
new file mode 100755
index 0000000..5b3232a
--- /dev/null
+++ b/scripts/rye_init.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+rye
+
+rye install uv
+rye install ruff
+rye install pyright
+rye install keymap-drawer
diff --git a/scripts/rye_maintain.sh b/scripts/rye_maintain.sh
new file mode 100755
index 0000000..51e35bc
--- /dev/null
+++ b/scripts/rye_maintain.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+rye self update
+
+rye tools list | xargs -L1 rye install --force