From 47a7a7708525ad353ad846450c0b595227eb41cd Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Wed, 31 Jan 2024 09:58:38 -0500
Subject: [PATCH] bin: dwarfs flac support and better ytflux

---
 archpkgs                   | 8 ++------
 bin/aliases                | 9 ++++++++-
 fish/functions/ytflux.fish | 8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/archpkgs b/archpkgs
index a6a5cda..12e5a96 100644
--- a/archpkgs
+++ b/archpkgs
@@ -28,12 +28,12 @@ dolphin-emu
 dolphin-emu-tool
 dracula-gtk-theme-git
 dracula-kde-theme-git
-dwarfs
 expac
 fd
 firejail
 fish
 flyctl-bin
+fuse-overlayfs
 fwupd
 fzf
 gallery-dl
@@ -62,8 +62,6 @@ keepassxc
 kitty
 kvantum
 lagrange
-lib32-libpulse
-lib32-vulkan-icd-loader
 libheif
 libplist
 libpulse
@@ -136,6 +134,7 @@ smartmontools
 sof-firmware
 squashfs-tools
 starship
+steam
 stlink
 stow
 sxiv
@@ -151,15 +150,12 @@ typst
 unzip
 upx
 usbutils
-valgrind
 vulkan-intel
 vulkan-radeon
 w3m
 waifu2x-ncnn-vulkan
 webp-pixbuf-loader
 wget
-wine
-winetricks
 wqy-microhei
 xarchiver
 xdelta3
diff --git a/bin/aliases b/bin/aliases
index 9d30c5b..a53e931 100755
--- a/bin/aliases
+++ b/bin/aliases
@@ -35,6 +35,7 @@ a l ls
 a la 'l -A'
 a launcher 'rofi -combi-modi drun,run,window -modi combi -show'
 a listen 'pactl list | grep loop && set t un; pactl "$t"load-module module-loopback'
+a lock 'budgie-screensaver-command -l'
 a nix '. ~/.nix-profile/etc/profile.d/nix.fish; command nix'
 a nsmd 'netsurf (md2html $argv | psub -s .html);:'
 a nsp 'netsurf (pandoc $argv -s -t html | psub -s .html);:'
@@ -57,7 +58,7 @@ a ydl 'yt-dlp'
 
 a 7zstd '7z a -m0=zstd -mx22 -mmt=8 -mfb=273 -md=1536m -ms=on (realpath $argv[1]).7z'
 a compress '7z a -m0=flzma2 -mx9 -mmt=8 -mfb=273 -md=1536m -ms=on (realpath $argv[1]).7z'
-a dwarf 'mkdwarfs -i . -o $PWD.dwarfs -f'
+a dwarf 'mkdwarfs -i . -o $PWD.dwarfs -f --categorize=pcmaudio -C pcmaudio/waveform::flac:level=8'
 a dwarfmount 'dwarfs -f $argv (mktemp -d | tee /dev/tty /dev/stderr 2>| clip);:'
 a dwarfs 'dwarfs -o offset=auto -o tidy_strategy=swap -o workers=(nproc)'
 a dwarfs2null 'dwarfsextract -o /dev/null -f gnutar -i'
@@ -67,6 +68,12 @@ a squash 'mksquashfs . $PWD.squashfs -comp zstd -b 1M -Xcompression-level 22'
 a undwarfs 'mkdir dwarfs-root; dwarfsextract -o dwarfs-root -i'
 a xcompress 'fxz -T0 -9 -k'
 
+set junit '(git root)/src/main/java:(git root)/src/test/java:(git root)/../cp/\*'
+a jacoco "javacp org.jacoco.cli.internal.Main report (git root)/report/coverage.exec --{class,source}files=(git root)/src/main/java --html report"
+a javacp "java -cp $junit"
+a junit "javacp -javaagent:(git root)/../cp/jacocoagent.jar=destfile=(git root)/report/coverage.exec org.junit.runner.JUnitCore"
+a junitc "javac -cp $junit"
+
 a catbox 'curl https://catbox.moe/user/api.php -F reqtype=fileupload -F fileToUpload=@$argv;:'
 a temp 'curl temp.sh -T'
 a tldr 'curl -s https://raw.githubusercontent.com/tldr-pages/tldr/main/pages/{common,linux}/$argv.md;:'
diff --git a/fish/functions/ytflux.fish b/fish/functions/ytflux.fish
index 1ad666f..72dee68 100644
--- a/fish/functions/ytflux.fish
+++ b/fish/functions/ytflux.fish
@@ -1,6 +1,6 @@
 function ytflux
-    set cat 3
-    set entries (eval curl (cat ~/.config/miniflux)/entries?status=unread\&category_id=$cat | jq -r .entries[].url)
-    eval curl -X PUT (cat ~/.config/miniflux)/categories/$cat/mark-all-as-read
-    parallel -u yt-dlp ::: $entries
+    set cat (cat ~/.config/miniflux)/categories/3
+    set entries (eval curl $cat/entries?status=unread | jq -r .entries[].url)
+    eval curl -X PUT $cat/mark-all-as-read
+    parallel -u yt-dlp $argv ::: $entries
 end