remove pyenv rich lazygit, add ruff and uv

BrightXiaoHan · Nov 8, 2024 · 6198ffb · 6198ffb
1 parent 3f4ccaa
commit 6198ffb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 23 deletions.
diff --git a/general/fish/config-linux.fish b/general/fish/config-linux.fish
@@ -20,15 +20,6 @@ set -gx MAMBA_ROOT_PREFIX $INSTALL_DIR/miniconda
 set -gx PIPX_HOME $INSTALL_DIR/pipx
 set -gx PIPX_BIN_DIR $INSTALL_DIR/bin
 
-# pyenv
-set -gx MAKE_OPTS -j(nproc --ignore=1) # pyenv set MAKE_OPTS to number of cores minus 1
-set -gx PYENV_ROOT $INSTALL_DIR/pyenv
-set -gx PATH $PYENV_ROOT/bin $PATH
-# if pyenv exists, initialize it
-if test -f $PYENV_ROOT/bin/pyenv
-    pyenv init - | source
-end
-
 set -gx CPPFLAGS "-I$CONDA_PREFIX/include " $CPPFLAGS
 set -gx LDFLAGS "-L$CONDA_PREFIX/lib " $LDFLAGS
 set -gx CONFIGURE_OPTS "-with-openssl=$CONDA_PREFIX " $CONFIGURE_OPTS

diff --git a/general/fish/config-osx.fish b/general/fish/config-osx.fish
@@ -1,12 +1,8 @@
 # If /opt/homebrew/bin is not in PATH, add it
-if not contains $PATH "/opt/homebrew/bin"
-  fish_add_path /opt/homebrew/bin
+if not contains $PATH /opt/homebrew/bin
+    fish_add_path /opt/homebrew/bin
 end
 
-if command -q pyenv 1>/dev/null 2>&1; and status --is-interactive
-  pyenv init - | source
-end
-
-set -gx MAKE_OPTS -j(sysctl -n hw.ncpu)  # pyenv set MAKE_OPTS to number of cores minus 1
+set -gx MAKE_OPTS -j(sysctl -n hw.ncpu) # set MAKE_OPTS to number of cores minus 1
 set -gx LANG en_US.UTF-8
 set -gx LC_ALL en_US.UTF-8
diff --git a/homecli/install.py b/homecli/install.py
@@ -212,12 +212,13 @@ def install_conda():
         "tmux",
         "libcurl",
         "pipx",
+        "uv",
+        "ruff",
         "compilers",
         "zlib",
         "nodejs",
         "gh",
         "jq",
-        "lazygit",
     ]
     if ARCHITECTURE in ("x86_64", "amd64"):
         command.extend(
@@ -251,7 +252,6 @@ def install_conda():
     env["PIPX_HOME"] = os.path.join(CACHE_DIR, "pipx")
     env["PIPX_BIN_DIR"] = os.path.join(CACHE_DIR, "bin")
     for package in [
-        "rich-cli",
         "git+https://github.com/BrightXiaoHan/ssr-command-client.git@master",
     ]:
         subprocess.run(

diff --git a/scripts/install.ps1 b/scripts/install.ps1
@@ -63,7 +63,6 @@ scoop install main/gh
 scoop install main/sed
 scoop install main/uv
 scoop bucket add extras
-scoop install lazygit
 
 Install-Module -Name PSFzf
 

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -160,7 +160,6 @@ if [ "$MODE" = "local-install" ] || [ "$MODE" = "online-install" ]; then
 		PATH="$INSTALL_DIR/miniconda/bin:$INSTALL_DIR/nodejs/bin:$PATH" \
 		HOMECLI_INSTALL_DIR=$INSTALL_DIR \
 		python3 homecli/install.py
-	curl https://pyenv.run | PYENV_ROOT="$INSTALL_DIR/pyenv" bash
 	mv $HOME/.local/share/nvim $INSTALL_DIR/nvim
 	ln -sf $INSTALL_DIR/nvim $HOME/.local/share/nvim
 elif [ "$MODE" = "unpack" ]; then

diff --git a/scripts/install_macos.sh b/scripts/install_macos.sh
@@ -70,8 +70,8 @@ ln -sf $DIR/mambarc ~/.mambarc
 
 brew install --quiet \
 	git-lfs tmux fish neovim ripgrep fzf node aliyunpan trzsz-ssh \
-	cmake poetry pipx starship zoxide openssh rich-cli \
-	openssl readline sqlite3 xz zlib gh gnu-sed lazygit uv
+	cmake poetry pipx starship zoxide openssh \
+	openssl readline sqlite3 xz zlib gh gnu-sed uv
 
 # install font
 brew tap homebrew/cask-fonts

diff --git a/scripts/pack.sh b/scripts/pack.sh
@@ -56,7 +56,7 @@ cd $INSTALL_DIR
 rm -rf $INSTALL_DIR/packed
 mkdir $INSTALL_DIR/packed
 tar --exclude="__pycache__" -cvf $INSTALL_DIR/packed/homecli.tar.gz \
-	HOME bin miniconda.tar.gz pyenv pipx nvim
+	HOME bin miniconda.tar.gz pipx nvim
 rm miniconda.tar.gz
 cp $INSTALL_DIR/HOME/scripts/install.sh \
 	$INSTALL_DIR/HOME/scripts/uninstall.sh \