Skip to content

Commit

Permalink
build: ➕ re-add sd as dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
ivaquero committed Apr 5, 2024
1 parent 573512d commit 8672b8b
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 13 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,28 @@ 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` (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`
- [x] Use [uutils-coreutils](https://github.com/uutils/coreutils) instead of `coreutils`
- non-coreutils
- [x] Use [dust](https://github.com/bootandy/dust) instead of `du`
- [x] Use [fd](https://github.com/sharkdp/fd) instead of `find`
- [x] Use [zoxide](https://github.com/ajeetdsouza/zoxide) instead of `cd` or `z`
- [x] Use [ripgrep](https://github.com/BurntSushi/ripgrep) instead of `grep`
- [ ] Use [dust](https://github.com/bootandy/dust) instead of `du`
- [x] Use [sd](https://github.com/chmln/sd) instead of `sed`
- [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 [hyperfine](https://github.com/sharkdp/hyperfine) instead of `time`
- [ ] Use [procs](https://github.com/dalance/procs) instead of `ps`
- [ ] Use [starship](https://github.com/starship/starship) instead of `powerline10k` or `ohmyposh`
- [ ] Use [tealdeer](https://github.com/dbrgn/tealdeer) instead of `tldr` or `man`
- [ ] Use [tokei](https://github.com/XAMPPRocky/tokei) instead of `cloc`
- [ ] Use [tre](https://github.com/dduan/tre) instead of `tree`

> `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 [gitui](https://github.com/extrawurst/gitui) instead of `lazygit`
- [ ] Use [bottom](https://github.com/ClementTsang/bottom) instead of `top` or `htop`
- [ ] Use [gitui](https://github.com/extrawurst/gitui) instead of `lazygit`
- [ ] Use [yazi](https://github.com/sxyazi/yazi) instead of `range`
- [ ] 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)
Expand Down
11 changes: 6 additions & 5 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,28 @@ Oxidizer 起初主要为非管理员用户设计,用于快速搭建跨平台
☑️ 表示默认安装

- 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`
- [ ] 使用 [uutils-coreutils](https://github.com/uutils/coreutils) 替换 `coreutils`
- non-coreutils
- [x] 使用 [dust](https://github.com/bootandy/dust) 替换 `du`
- [x] 使用 [fd](https://github.com/sharkdp/fd) 替换 `find`
- [x] 使用 [zoxide](https://github.com/ajeetdsouza/zoxide) 替换 `cd``z`
- [x] 使用 [ripgrep](https://github.com/BurntSushi/ripgrep) 替换 `grep`
- [ ] 使用 [dust](https://github.com/bootandy/dust) 替换 `du`
- [x] 使用 [sd](https://github.com/chmln/sd) 替换 `sed`
- [x] 使用 [tealdeer](https://github.com/dbrgn/tealdeer) 替换 `tldr``man`
- [x] 使用 [zoxide](https://github.com/ajeetdsouza/zoxide) 替换 `cd``z`
- [ ] 使用 [hyperfine](https://github.com/sharkdp/hyperfine) 替换 `time`
- [ ] 使用 [procs](https://github.com/dalance/procs) 替换 `ps`
- [ ] 使用 [starship](https://github.com/starship/starship) 替换 `powerline10k``ohmyposh`
- [ ] 使用 [tealdeer](https://github.com/dbrgn/tealdeer) 替换 `tldr``man`
- [ ] 使用 [tokei](https://github.com/XAMPPRocky/tokei) 替换 `cloc`
- [ ] 使用 [tre](https://github.com/dduan/tre) 替换 `tree`

> `Nushell` 是一个 Rust 编写的全平台 Shell,但其目前不支持动态地址,而且其插件只支持 Rust 和 Python,而不是其内置的 Nu 语言。
### 2.2. TUI 工具替换

- [x] 使用 [gitui](https://github.com/extrawurst/gitui) 替换 `lazygit`
- [ ] 使用 [bottom](https://github.com/ClementTsang/bottom) 替换 `top``htop`
- [ ] 使用 [gitui](https://github.com/extrawurst/gitui) 替换 `lazygit`
- [ ] 使用 [yazi](https://github.com/sxyazi/yazi) 替换 `range`
- [ ] 使用 [helix](https://github.com/helix-editor/helix) 替换 `vim` (非平替)
- [ ] 使用 [zellij](https://github.com/zellij-org/zellij) 替换 `tmux`(目前不支持 Windows)
Expand Down
4 changes: 3 additions & 1 deletion defaults/Brewfile.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
bat
dust
fd
gitui
lsd
ouch
ripgrep
sd
tealdeer
zoxide
5 changes: 3 additions & 2 deletions defaults/Scoopfile.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
bat
dust
fd
gitui
lsd
ouch
ripgrep
sd
tealdeer
zoxide
sed
sudo
1 change: 1 addition & 0 deletions install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ $pkgs = cat "$env:OXIDIZER\defaults\Scoopfile.txt"
ForEach ( $pkg in $pkgs ) {
Switch ($pkg) {
ripgrep { $cmd = "rg" }
tealdeer { $cmd = "tldr" }
zoxide { $cmd = "z" }
Default { $cmd = $pkg }
}
Expand Down
3 changes: 3 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ cat "${OXIDIZER}"/defaults/Brewfile.txt | while read -r pkg; do
ripgrep)
cmd='rg'
;;
tealdeer)
cmd='tldr'
;;
zoxide)
cmd='z'
;;
Expand Down

0 comments on commit 8672b8b

Please sign in to comment.