From 5fcf8ad22a4ff63513f0fdc66a30af5df5b8ada1 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Sun, 26 Sep 2021 01:04:50 -0400
Subject: [PATCH] Alias all2jxl, clean up setup brace expansions

---
 dot-local/bin/aliases |  1 +
 dot-local/bin/all2jxl |  4 ----
 dot-local/bin/setup   | 14 +++++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100755 dot-local/bin/all2jxl

diff --git a/dot-local/bin/aliases b/dot-local/bin/aliases
index f5eea80..567a140 100755
--- a/dot-local/bin/aliases
+++ b/dot-local/bin/aliases
@@ -3,6 +3,7 @@ alias a 'alias -s'
 
 a D 'cd $D'
 a aliases 'v (which aliases); command aliases'
+a all2jxl 'fd -e{png.jpg} -x cjxl -e 8 -q 100 {} {.}.jxl && fd -e{png,jpg} -x rm'
 a base64d 'echo (echo $argv | base64 -d 2>/dev/null);:'
 a bax 'source (which bax) && bax'
 a cd 'cd (realpath $argv 2> /dev/null);:'
diff --git a/dot-local/bin/all2jxl b/dot-local/bin/all2jxl
deleted file mode 100755
index 63eef40..0000000
--- a/dot-local/bin/all2jxl
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-fd -e webp -x dwebp {} -o {.}.png && \
-fd -e png -e jpg -x cjxl -e 8 -q 100 {} {.}.jxl && \
-fd -e png -e jpg -e webp -x rm
diff --git a/dot-local/bin/setup b/dot-local/bin/setup
index 9fa96d2..0e4f6ee 100755
--- a/dot-local/bin/setup
+++ b/dot-local/bin/setup
@@ -1,15 +1,15 @@
 #!/bin/bash
-gnome=$(eval echo eog evolution-data-server file-roller gnome-{calendar,photos,mpv,terminal} nautilus onboard rhythmbox)
-sudo eopkg rm -y celluloid firefox $gnome hexchat libreoffice-common thunderbird transmission
+gnome="$(echo eog file-roller gnome-{calendar,photos,mpv,terminal} nautilus rhythmbox)"
+sudo eopkg rm -y firefox $gnome hexchat onboard thunderbird
 
 audio="audacious audacious-plugins audacity opus-tools quodlibet spek"
 dev="ccache docker-compose git-extras llvm-clang neovim parallel solbuild tig upx"
 gui="abiword bleachbit caja gmic-gimp engrampa keepassx kitty lutris vorta"
-media="avidemux gaupol jpegoptim mpv playerctl rsync usbmuxd viewnior zathura-poppler"
+media="avidemux gaupol jpegoptim mpv playerctl usbmuxd viewnior zathura-poppler"
 rice="adapta-gtk-theme ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
-term="advancecomp autojump fd fish fzf innoextract most ncdu p7zip ranger ripgrep rsync tmux"
-sys="corectrl ifuse linux-tools-cpupower tlp"
-web="arcanist aria2 deluge nicotine-plus qutebrowser openssh-server subliminal"
+term="advancecomp autojump fd fish fzf innoextract most ncdu p7zip ranger ripgrep tmux"
+sys="corectrl ifuse linux-tools-cpupower rsync tlp"
+web="arcanist aria2 nicotine-plus qutebrowser openssh-server rclone subliminal"
 
 sudo eopkg up -y
 sudo eopkg it -y -c system.devel $audio $dev $gui $media $rice $sys $term $web
@@ -30,7 +30,7 @@ parallel pip3 install -U ::: adblock pipipxx readability-lxml sh
 parallel pipx install ::: deemix soundscrape tldr
 
 sudo eopkg rm -y --ignore-dependency tracker
-sudo systemctl mask tracker-{store,miner-fs,miner-rss,extra,miner-apps,writeback}
+sudo systemctl mask tracker-{store,miner-{fs,rss,apps},extra,writeback}
 
 sudo systemctl enable --now docker
 sudo usermod -aG docker $USER