build: ➖ reduce dependencies

ivaquero · Nov 20, 2023 · dfcbb02 · dfcbb02
1 parent 2086a78
commit dfcbb02
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -75,30 +75,30 @@ Oxidizer is originally designed for **non-administrator** users. It saves your t
 > ☑️ means required in the installation.
 
 - coreutils
-  - [x] Use [uutils-coreutils](https://github.com/uutils/coreutils) instead of `coreutils`
+  - [x] Use [uutils-coreutils](https://github.com/uutils/coreutils) instead of `coreutils` (only required on Windows)
   - [x] Use [bat](https://github.com/sharkdp/bat) instead of `cat`
   - [x] Use [lsd](https://github.com/Peltoche/lsd) instead of `ls`
 - non-coreutils
   - [x] Use [fd](https://github.com/sharkdp/fd) instead of `find`
   - [x] Use [hyperfine](https://github.com/sharkdp/hyperfine) instead of `time`
-  - [x] Use [ripgrep](https://github.com/BurntSushi/ripgrep) instead of `grep`
+  - [x] Use [ripgrep](https://github.com/BurntSushi/ripgrep) instead of `grep` (only required on Windows)
   - [x] Use [tealdeer](https://github.com/dbrgn/tealdeer) instead of `tldr` or `man`
   - [x] Use [zoxide](https://github.com/ajeetdsouza/zoxide) instead of `cd` or `z`
   - [ ] Use [dust](https://github.com/bootandy/dust) instead of `du`
   - [ ] Use [procs](https://github.com/dalance/procs) instead of `ps`
+  - [ ] Use [starship](https://github.com/starship/starship) instead of `powerline10k` or `ohmyposh`
   - [ ] Use [tokei](https://github.com/XAMPPRocky/tokei) instead of `cloc`
   - [ ] Use [tre](https://github.com/dduan/tre) instead of `tree`
-  - [ ] Use [starship](https://github.com/starship/starship) instead of `powerline10k` or `ohmyposh`
 
 > `Nushell` is a cross-platform written in Rust, but it doesn't support dynamical path for the moment.
 
 ### 2.2. TUI Tools Replacement
 
-- [x] Use [bottom](https://github.com/ClementTsang/bottom) instead of `top` or `htop`
 - [x] Use [gitui](https://github.com/extrawurst/gitui) instead of `lazygit`
-- [ ] Use [helix](https://github.com/helix-editor/helix) instead of `vim`
+- [ ] Use [bottom](https://github.com/ClementTsang/bottom) instead of `top` or `htop`
 - [ ] Use [yazi](https://github.com/sxyazi/yazi) instead of `range`
-- [ ] Use [zellij](https://github.com/zellij-org/zellij) instead of `tmux` (Not support Windows yet)
+- [ ] Use [helix](https://github.com/helix-editor/helix) instead of `vim` (Not drop-in)
+- [ ] Use [zellij](https://github.com/zellij-org/zellij) instead of `tmux` (Not supported on Windows)
 
 ### 2.3. GUI Tools Replacement
 
@@ -109,7 +109,7 @@ Oxidizer is originally designed for **non-administrator** users. It saves your t
 ### 2.4. Other Useful Rust Tools
 
 - [x] [ouch](https://github.com/ouch-org/ouch): Painless compression and decompression tool
-- [x] [pueue](https://github.com/Nukesor/pueue): Command-line task management tool for sequential and parallel execution of long-running tasks.
+- [ ] [pueue](https://github.com/Nukesor/pueue): Command-line task management tool for sequential and parallel execution of long-running tasks
 - [ ] [espanso](https://github.com/espanso/espanso): Text Expander written in Rust (try it for fun!)
 - [ ] [kondo](https://github.com/tbillington/kondo): A tool to clean dependencies and build artefacts from your projects.
 - [ ] [navi](https://github.com/denisidoro/navi): An interactive cheatsheet tool for the command-line

diff --git a/README_CN.md b/README_CN.md
@@ -65,29 +65,29 @@ Oxidizer 起初主要为非管理员用户设计，用于快速搭建跨平台
 ☑️ 表示默认安装
 
 - coreutils
-  - [x] 使用 [uutils-coreutils](https://github.com/uutils/coreutils) 替换 `coreutils`
+  - [x] 使用 [uutils-coreutils](https://github.com/uutils/coreutils) 替换 `coreutils`（仅 Windows）
   - [x] 使用 [bat](https://github.com/sharkdp/bat) 替换 `cat`
   - [x] 使用 [lsd](https://github.com/Peltoche/lsd) 替换 `ls`
 - non-coreutils
   - [x] 使用 [fd](https://github.com/sharkdp/fd) 替换 `find`
   - [x] 使用 [hyperfine](https://github.com/sharkdp/hyperfine) 替换 `time`
-  - [x] 使用 [ripgrep](https://github.com/BurntSushi/ripgrep) 替换 `grep`
+  - [x] 使用 [ripgrep](https://github.com/BurntSushi/ripgrep) 替换 `grep`（仅 Windows）
   - [x] 使用 [tealdeer](https://github.com/dbrgn/tealdeer) 替换 `tldr` 和 `man`
   - [x] 使用 [zoxide](https://github.com/ajeetdsouza/zoxide) 替换 `cd` 和 `z`
   - [ ] 使用 [dust](https://github.com/bootandy/dust) 替换 `du`
   - [ ] 使用 [procs](https://github.com/dalance/procs) 替换 `ps`
+  - [ ] 使用 [starship](https://github.com/starship/starship) 替换 `powerline10k` 和 `ohmyposh`
   - [ ] 使用 [tokei](https://github.com/XAMPPRocky/tokei) 替换 `cloc`
   - [ ] 使用 [tre](https://github.com/dduan/tre) 替换 `tree`
-  - [ ] 使用 [starship](https://github.com/starship/starship) 替换 `powerline10k` 和 `ohmyposh`
 
 > `Nushell` 是一个 Rust 编写的全平台 Shell，但其目前不支持动态地址，而且其插件只支持 Rust 和 Python，而不是其内置的 Nu 语言。
 
 ### 2.2. TUI 工具替换
 
-- [x] 使用 [bottom](https://github.com/ClementTsang/bottom) 替换 `top` 和 `htop`
 - [x] 使用 [gitui](https://github.com/extrawurst/gitui) 替换 `lazygit`
-- [ ] 使用 [helix](https://github.com/helix-editor/helix) 替换 `vim`
+- [ ] 使用 [bottom](https://github.com/ClementTsang/bottom) 替换 `top` 和 `htop`
 - [ ] 使用 [yazi](https://github.com/sxyazi/yazi) 替换 `range`
+- [ ] 使用 [helix](https://github.com/helix-editor/helix) 替换 `vim` （非平替）
 - [ ] 使用 [zellij](https://github.com/zellij-org/zellij) 替换 `tmux`（目前不支持 Windows）
 
 ### 2.3. GUI 工具替换
@@ -99,7 +99,7 @@ Oxidizer 起初主要为非管理员用户设计，用于快速搭建跨平台
 ### 2.4. 其他实用的 Rust 工具
 
 - [x] [ouch](https://github.com/ouch-org/ouch)：终端无痛压缩 & 解压工具
-- [x] [pueue](https://github.com/Nukesor/pueue)：命令行并行任务管理器
+- [ ] [pueue](https://github.com/Nukesor/pueue)：命令行并行任务管理器
 - [ ] [espanso](https://github.com/espanso/espanso)：输入法扩展器（推荐尝试）
 - [ ] [kondo](https://github.com/tbillington/kondo)：项目依赖清理命令行工具
 - [ ] [navi](https://github.com/denisidoro/navi)：交互式 cheatsheet 命令行

diff --git a/defaults/Brewfile.txt b/defaults/Brewfile.txt
@@ -1,11 +1,8 @@
 bat
-bottom
 fd
 gitui
 hyperfine
 lsd
 ouch
-pueue
-ripgrep
 tealdeer
 zoxide
diff --git a/defaults/Scoopfile.txt b/defaults/Scoopfile.txt
@@ -1,14 +1,12 @@
 bat
-bottom
 fd
 gitui
 hyperfine
 lsd
 ouch
-pueue
-ripgrep
 tealdeer
 zoxide
+ripgrep
 uutils-coreutils
 sed
 sudo

diff --git a/install.sh b/install.sh
@@ -47,12 +47,6 @@ printf "📦 Installing essential Oxidizer toolchains...\n"
 
 cat ${OXIDIZER}/defaults/Brewfile.txt | while read -r pkg; do
     case $pkg in
-    ripgrep)
-        cmd='rg'
-        ;;
-    bottom)
-        cmd='btm'
-        ;;
     tealdear)
         cmd='tldr'
         ;;
@@ -126,7 +120,7 @@ cp ${OXIDIZER}/defaults.sh "${OXIDIZER}/"custom.sh
 sed -i.bak "s|.* OX_STARTUP=.*|export OX_STARTUP=1|" ${OXIDIZER}/custom.sh
 # set path of oxidizer
 # echo "source OXIDIZER=${OXIDIZER}/oxidizer.sh" | xargs -I '{}' sed -i.bak '' 's|source OXIDIZER=.*|{}|' ${OX_SHELL}
-# echo $(cat ${OX_SHELL} | rg -o 'source .+')
+# echo $(cat ${OX_SHELL} | grep -o -E 'source .+')
 
 ###################################################
 # Load Plugins

diff --git a/oxidizer.sh b/oxidizer.sh
@@ -136,12 +136,6 @@ iiox() {
     printf "📦 Installing Required packages...\n"
     while read -r pkg <"${OXIDIZER}"/defaults/Brewfile.txt; do
         case $pkg in
-        ripgrep)
-            cmd='rg'
-            ;;
-        bottom)
-            cmd='btm'
-            ;;
         tealdear)
             cmd='tldr'
             ;;