From 0692d37e5fd170ba8c826b8c0ee5a8881ce17c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 5 Jun 2021 02:46:20 -0300
Subject: [PATCH] Update default packages.

- remove bat (not used often)
- remove mdcat (upstream added file fetching when the markdown file has
  images)
- replace mdcat with lowdown
- replace dos2unix with toybox and add busybox as bonus; we also add
  toybox-static to get a rescue static su(1)
- add symlinks for some toybox and busybox utilities
- add more defaults directories to stow-linux.sh
---
 boxes/.local/bin/dos2unix                 | 1 +
 boxes/.local/bin/httpd                    | 1 +
 boxes/.local/bin/unix2dos                 | 1 +
 fish/.config/fish/conf.d/text_editor.fish | 7 ++++++-
 stow-linux.sh                             | 4 ++--
 void/void.sh                              | 7 ++++---
 void/void.sh.hooks/term                   | 2 ++
 7 files changed, 17 insertions(+), 6 deletions(-)
 create mode 120000 boxes/.local/bin/dos2unix
 create mode 120000 boxes/.local/bin/httpd
 create mode 120000 boxes/.local/bin/unix2dos

diff --git a/boxes/.local/bin/dos2unix b/boxes/.local/bin/dos2unix
new file mode 120000
index 0000000..b9f36d7
--- /dev/null
+++ b/boxes/.local/bin/dos2unix
@@ -0,0 +1 @@
+/usr/bin/toybox
\ No newline at end of file
diff --git a/boxes/.local/bin/httpd b/boxes/.local/bin/httpd
new file mode 120000
index 0000000..c28f287
--- /dev/null
+++ b/boxes/.local/bin/httpd
@@ -0,0 +1 @@
+/usr/bin/busybox
\ No newline at end of file
diff --git a/boxes/.local/bin/unix2dos b/boxes/.local/bin/unix2dos
new file mode 120000
index 0000000..b9f36d7
--- /dev/null
+++ b/boxes/.local/bin/unix2dos
@@ -0,0 +1 @@
+/usr/bin/toybox
\ No newline at end of file
diff --git a/fish/.config/fish/conf.d/text_editor.fish b/fish/.config/fish/conf.d/text_editor.fish
index 4b10495..2bc66df 100644
--- a/fish/.config/fish/conf.d/text_editor.fish
+++ b/fish/.config/fish/conf.d/text_editor.fish
@@ -15,6 +15,11 @@ alias clem='emacsclient -n'
 alias temacs="emacs -nw"
 
 function mdbat --argument-names file
-    mdcat $file | bat -p
+    lowdown -Tterm $file | less -R
 end
 
+if not command -sq mdcat
+	function mdcat --argument-names file
+		lowdown -Tterm $file
+	end
+end
diff --git a/stow-linux.sh b/stow-linux.sh
index a7b618d..9c33580 100755
--- a/stow-linux.sh
+++ b/stow-linux.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 stow \
-	alacritty/ doom-emacs/ embedded/ fish/ linux-utils/ media/ nvim/ \
-	term-utils/ utils/ wayland/
+	alacritty/ boxes/ doom-emacs/ embedded/ fish/ linux-utils/ media/ nvim/ \
+	term-utils/ utils/ wayland/ xbps/
diff --git a/void/void.sh b/void/void.sh
index 580cdb0..d399e16 100755
--- a/void/void.sh
+++ b/void/void.sh
@@ -63,13 +63,14 @@ _device="usbutils"
 _monitor="bmon htop"
 _net="curl git gnupg2 aerc asciinema lynx weechat"
 _shell="fish-shell lolcat-c tmux"
-_tools="bat bsdtar dos2unix fd mdcat neovim p7zip parallel ripgrep stow execline s6"
+_tools="bsdtar fd lowdown neovim p7zip parallel ripgrep stow execline s6"
+_boxes="toybox toybox.static busybox"
 _void="vsv xtools graphviz"
 _info="man-pages-devel man-pages-posix"
 _fortune="cowsay fortune-mod-void"
 _otp="bearssl-devel oath-toolkit libargon2-devel jq"
-term="python3 ${_browser} ${_device} ${_monitor} ${_net} ${_shell} ${_tools} ${_void}
- ${_info} ${_fortune} ${_otp}"
+term="python3 ${_browser} ${_device} ${_monitor} ${_net} ${_shell} ${_tools}
+ ${_boxes} ${_void} ${_info} ${_fortune} ${_otp}"
 term_desc="$(print_item term) Install basic terminal utilities."
 
 ssh="fuse-sshfs rsync"
diff --git a/void/void.sh.hooks/term b/void/void.sh.hooks/term
index 460ab85..6ede2cf 100755
--- a/void/void.sh.hooks/term
+++ b/void/void.sh.hooks/term
@@ -2,3 +2,5 @@
 
 echo "Linking bsdtar to tar"
 ln -s /usr/bin/bsdtar ${ROOTDIR}/usr/local/bin/tar
+echo "Linking toybox.static to su"
+ln -s /usr/bin/toybox.static ${ROOTDIR}/usr/local/bin/su