From 42d223520644f8f5020af2cc5bf1b1c5e0a849a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 4 Jan 2022 04:26:48 -0300
Subject: [PATCH] Update void.sh.

Added more base stuff:
- wget is generally useful
- outils and minisign for signing stuff
- xxd for binary stuff
- ugrep as a potential ripgrep replacement
- fswatch for doing stuff with inotify
- moreutils to be fancy

For the rest:
- remove spotify stuff from media, add other useful programs
- replace youtube-dl with yt-dlp
- add stuff do dev
- add further_dev for less common stuff
- make Gemini stuff more generic
- add comic book browsing to zathura

Also make youtube-viewer use yt-dlp.
---
 .../youtube-viewer/youtube-viewer.conf        |  5 +--
 void/void.sh                                  | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/media/.config/youtube-viewer/youtube-viewer.conf b/media/.config/youtube-viewer/youtube-viewer.conf
index ff34bd3..2883fbe 100644
--- a/media/.config/youtube-viewer/youtube-viewer.conf
+++ b/media/.config/youtube-viewer/youtube-viewer.conf
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# YouTube Viewer 3.9.3 - configuration file
+# YouTube Viewer 3.9.6 - configuration file
 
 our $CONFIG = {
   auto_captions                 => 0,
@@ -54,6 +54,7 @@ our $CONFIG = {
   env_proxy                     => 1,
   fat32safe                     => 0,
   ffmpeg_cmd                    => "/bin/ffmpeg",
+  force_fallback                => 0,
   fullscreen                    => 0,
   get_captions                  => 1,
   get_term_width                => 1,
@@ -125,5 +126,5 @@ our $CONFIG = {
   youtube_users_file            => "$ENV{HOME}/.config/youtube-viewer/youtube_users.txt",
   youtube_video_url             => "https://www.youtube.com/watch?v=%s",
   ytdl                          => 1,
-  ytdl_cmd                      => "/bin/youtube-dl",
+  ytdl_cmd                      => "/bin/yt-dlp",
 }
diff --git a/void/void.sh b/void/void.sh
index 85c5403..ca2db45 100755
--- a/void/void.sh
+++ b/void/void.sh
@@ -61,15 +61,16 @@ popcorn_desc="$(print_item popcorn) Install PopCorn usage statistics."
 _browser="ncdu ranger fzf"
 _device="usbutils"
 _monitor="bmon htop"
-_net="curl git gnupg2 aerc asciinema lynx weechat"
-_shell="fish-shell lolcat-c tmux"
-_tools="bsdtar fd lowdown neovim p7zip parallel ripgrep stow execline s6"
+_net="curl wget git aerc asciinema lynx weechat"
+_crypto="gnupg2 outils minisign"
+_shell="fish-shell lolcat-c tmux xxd neovim"
+_tools="bsdtar fd lowdown p7zip parallel ripgrep ugrep stow execline s6 fswatch moreutils"
 _boxes="toybox toybox.static busybox"
 _void="vsv xtools fuzzypkg 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}
+term="python3 ${_browser} ${_device} ${_monitor} ${_net} ${_crypto} ${_shell} ${_tools}
  ${_boxes} ${_void} ${_info} ${_fortune} ${_otp}"
 term_desc="$(print_item term) Install basic terminal utilities."
 
@@ -111,12 +112,18 @@ audio_desc="$(print_item audio) Install PipeWire and ALSA."
 sndio="sndio aucatctl alsa-sndio"
 sndio_desc="$(print_item sndio) Install sndio."
 
-media="bluez mpv mpv-mpris youtube-dl spotifyd spotify-tui imv ImageMagick"
-media_desc="$(print_item media) Install mpv, imv and spotify CLI programs."
+media="bluez mpv mpv-mpris yt-dlp imv ImageMagick exiftool wildmidi droidcam"
+media_desc="$(print_item media) Install media software."
 
-dev="cmake make meson ninja valgrind gdb strace go"
+spotify="spotifyd spotify-tui"
+spotify_desc="$(print_item spotify) Install spotify CLI programs."
+
+dev="cmake make meson ninja valgrind gdb strace extrace go github-cli"
 dev_desc="$(print_item dev) Install build systems, debug tools, Go."
 
+further_dev="racket zeal"
+further_dev_desc="$(print_item further_dev) Install references and more languages."
+
 containers="podman"
 containers_desc="$(print_item containers) Install Podman."
 
@@ -132,13 +139,13 @@ qt5_desc="$(print_item qt5) Install Qt5 for Wayland and qBittorrent."
 mozilla="firefox thunderbird"
 mozilla_desc="$(print_item mozilla) Install Firefox and Thunderbird."
 
-gemini="castor"
-gemini_desc="$(print_item gemini) Install castor."
+gemini="castor lagrange python3-md2gemini"
+gemini_desc="$(print_item gemini) Install Gemini related software."
 
 office="libreoffice libreoffice-i18n-en-US libreoffice-i18n-pt-BR"
 office_desc="$(print_item office) Install Libreoffice."
 
-pdf="zathura zathura-pdf-poppler"
+pdf="zathura zathura-pdf-poppler zathura-cb"
 pdf_desc="$(print_item pdf) Install Zathura."
 
 flatpak="flatpak xdg-desktop-portal xdg-desktop-portal-gtk xdg-user-dirs xdg-user-dirs-gtk xdg-utils"
@@ -170,9 +177,9 @@ current_system_list="base_env_list zfs wayland uefi_bundle"
 current_system="$(assemble_list "$current_system_list")"
 current_system_desc="$(print_item current_system) $current_system_desc"
 
-all_list="$base_env_list luks uefi_bundle disk_tools refind zfs dev office
+all_list="$base_env_list luks uefi_bundle disk_tools refind zfs dev further_dev office
  flatpak embedded kicad ate void_docs xbps_devel xorg nvidia graphics qt5 audio
- wayland gemini containers"
+ wayland gemini containers spotify"
 all="$(assemble_list "$all_list")"
 all_desc="$(print_item all) $all_list"