fish: general cleanup and appdwarf foldwarf

dot-config/fish/config.fish

@@ -1,17 +1,17 @@
-set -x EDITOR nvim
-set -x PAGER most
-set -x MANPAGER 'nvim +Man!'
-set -x USE_CCACHE 1
-set D ~
+fish_add_path -g ~/.local/bin ~/Games /usr/lib64/ccache/bin
 
-test (hostname) = aperture && set D /mnt/LocalDiskD/
+if tty -s
+    set -x EDITOR nvim
+    set -x PAGER most
+    set -x MANPAGER 'nvim +Man!'
+    set -x USE_CCACHE 1
 
-bind \eo 'ranger'
-bind \ed 'ncdu'
-bind \et 'tmux'
-bind \ef 'fzf | xclip -selection clipboard'
+    bind \eo 'nnn'
+    bind \ed 'ncdu'
+    bind \et 'tmux'
+    bind \ef 'fzf | xclip -selection clipboard'
 
-fish_add_path -g ~/.local/bin $D/Games /usr/lib64/ccache/bin
 
-starship init fish --print-full-init | source
-source /usr/share/autojump/autojump.fish
+    starship init fish --print-full-init | source
+    source /usr/share/autojump/autojump.fish
+end

dot-local/bin/aliases

@@ -1,7 +1,6 @@
 #!/usr/bin/fish
 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 -d 0 {} {.}.jxl && fd -e{png,jpg} -x rm'
 a base64d 'echo (echo $argv | base64 -d 2>/dev/null);:'
@@ -19,7 +18,7 @@ a giveme 's chown $USER'
 a hardinfo 'inxi -SPARM -GCDN -v1 -xGCRS -Fxz'
 a imgsum 'printf "$argv: " && identify -format "%#\n"'
 a l ls
-a la 'l -a'
+a la 'l -A'
 a less 'eval $PAGER'
 a nix 'bax . ~/.nix-profile/etc/profile.d/nix.sh; command nix'
 a off shutdown
@@ -39,24 +38,25 @@ a ta 'tmux a -t (math 0 + "0$argv");:'
 a tar bsdtar
 a temp 'curl temp.sh -T'
 a transfer 'curl https://transfer.sh/(basename $argv) -T'
-a twitch-dl 'ffmpeg -i (ydl -e $argv[1]|tr / _) -c copy $argv[2..-1] "file:(ydl -g $argv[1]).mkv"'
+a twitch-dl 'ffmpeg -i (yt-dlp -e $argv[1]|tr / _) -c copy $argv[2..-1] "file:(yt-dlp -g $argv[1]).mkv"'
 a up 'se up --y'
 a v vi
 a vi nvim
 a wallp 'gsettings set org.gnome.desktop.background picture-uri file://(realpath $argv);:'
 a wm 'startx (which $argv[1]) $argv[2..-1]'
-a ydl yt-dlp
+a ydl 'while not yt-dlp $argv; end;:'
 
-a ao3 'egrep works/[0-9]+ $argv -o | uniq | tr -d a-z | parallel aria2c "https://ao3.org/downloads{}/\*.epub" -d ao3; rm'
+a ao3 'grep epub $argv | cut -d/ -f2-3 | parallel aria2c "https://ao3.org/{}/\*.epub" -dao3'
 a invid 'tmux new -s 0 -d "docker-compose -f ~/.config/invid.yml up --build"'
 a launcher 'rofi -combi-modi "drun,run" -show combi -modi "combi,window"'
-a listen 'pactl list | grep loop && pactl unload-module module-loopback || pactl load-module module-loopback'
-a symlinks 'fd -td -d1 . $D -x  sh -c "rm ~/{/}; rmdir ~/{/}; ln -s {} ~/{/}"'
+a listen 'pactl list | grep loop && set t un; pactl "$t"load-module module-loopback'
 a tcsv 'curl -sL http://torrents-csv.ml/service/search?q="$argv"|jq ".[]|.name,.infohash,.seeders";:'
 
-a 7zstd '7z a -m0=zstd -mx9 -mmt=8 -mfb=273 -md=256m -ms=on (realpath $argv[1]).7z'
+a 7zstd '7z a -m0=zstd -mx22 -mmt=8 -mfb=273 -md=256m -ms=on (realpath $argv[1]).7z'
 a compress '7z a -m0=flzma2 -mx9 -mmt=8 -mfb=273 -md=256m -ms=on (realpath $argv[1]).7z'
 a dwarf 'mkdwarfs -i . -o $PWD.dwarfs'
+a dwarfs 'dwarfs -o offset=auto -o tidy_strategy=swap'
+a foldwarf 'appdwarf -f $argv .;:'
 a redwarf 'mkdwarfs -o redwarf.dwarfs --recompress -i'
 a squash 'mksquashfs . $PWD.squashfs -comp zstd -b 1M -Xcompression-level 22'
 a undwarfs 'mkdir dwarfs-root; dwarfsextract -o dwarfs-root -i'

dot-local/bin/foldwarf

@@ -1,19 +0,0 @@
-#!/bin/sh
-H=/tmp/folheader
-echo '#!/bin/sh' > $H
-echo D=\"$1\" >> $H
-cat >> $H <<'EOF'
-if [ ! -d "$D" ]; then
-    mkdir "$D"
-    dwarfs -o offset=auto -o tidy_strategy=swap "$0" "$D"
-else
-    fusermount -u "$D"
-    rmdir "$D"
-fi
-exit
-EOF
-
-shift
-mkdwarfs -i . -o "$PWD.sh" -B3 --header $H $@
-chmod +x "$PWD.sh"
-rm $H

dot-local/bin/optiall

@@ -7,8 +7,8 @@ fd -ejp{e,}g -x jpegoptim
 fd -e png -ejp{e,}g -X pingo -s9
 fd -e webp -x cwebp -z 9 -mt {} -o {}
 
-fd -e{epub,zip,cbz,jar,docx,odt,apk} -x advzip -z4
-fd -t f -x advdef -z4
+fd -e{epub,zip,cbz,jar,docx,odt,apk} -x advzip -z2
+fd -t f -x advdef -z2
 
 fd -e mp3 -x mp3packer
 fd -e mp3 -x rename -- -vbr ''

dot-local/bin/setup

@@ -2,12 +2,12 @@
 alias s=sudo se="sudo eopkg -y" g=git
 
 gnome="$(echo eog file-roller gnome-{photos,mpv,terminal} nautilus rhythmbox)"
-audio="audacious audacious-plugins audacity opus-tools quodlibet spek"
+audio="audacious audacious-plugins audacity opus-tools spek"
 dev="ccache docker-compose git-extras llvm-clang neovim parallel solbuild tig upx"
 gui="abiword caja gmic-gimp engrampa keepassxc kitty lutris"
 media="avidemux gaupol jpegoptim mpv playerctl usbmuxd viewnior yt-dlp zathura-poppler"
 rice="ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
-term="advancecomp autojump fd fish fzf innoextract most ncdu p7zip ranger ripgrep tmux"
+term="advancecomp autojump fd fish fzf innoextract most ncdu nnn p7zip ripgrep tmux"
 sys="bleachbit corectrl ifuse linux-tools-cpupower python-wheel rsync tlp"
 web="arcanist aria2 nicotine-plus qutebrowser openssh-server rclone subliminal syncthing-gtk"