From 64803550b3523f0aa0b19d4214d9a19154eaeefa Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Wed, 11 Dec 2024 18:06:56 -0500
Subject: [PATCH] bin: leaner mc, leaner arista functions, fix doas

---
 arch/dwarfs-universal |  2 +-
 bin/config.fish       |  7 ++++---
 bin/minecraft         | 11 +++++------
 bin/setup             |  3 ++-
 qutebrowser/search.py |  1 +
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/arch/dwarfs-universal b/arch/dwarfs-universal
index e168c59..831939d 100644
--- a/arch/dwarfs-universal
+++ b/arch/dwarfs-universal
@@ -1,6 +1,6 @@
 # Maintainer: phantop <phantop@tuta.io>
 pkgname=dwarfs-universal
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc='A fast high compression read-only file system (pre-compiled binaries)'
 url='https://github.com/mhx/dwarfs'
diff --git a/bin/config.fish b/bin/config.fish
index 9b1504b..ae4c2e3 100755
--- a/bin/config.fish
+++ b/bin/config.fish
@@ -139,12 +139,12 @@ a lint 'a git lint'
 a lunch 'gb launch --schedule build --testing full'
 a pb 'curl -F c=@- pb/'
 a pydt 'dt pyshell'
-a reagent 'echo "edut.restartAgent(\'$argv\')" | pydt'
-a revfiles 'curl -L reviewboard/r/$argv/diff | grep dest_ | sed -e "s/ /{/" -e "s/,$/}/" | jq -r .files[].dest_filename;:'
+a reagent 'echo "edut.restartAgent(\'$argv\')" | pydt;:'
+a revfiles 'curl -L reviewboard/r/$argv/diff/raw | cut -f1 | sed -n "s|+++ |/|p";:'
 a san 'dt sa -p eos-trunk'
 a rebase 'gb update --sync --rebase'
 a san 'dt sa -p eos-trunk'
-a tcam 'echo "edut.setTcamProfile(\'$argv\')" | pydt'
+a tcam 'echo "edut.setTcamProfile(\'$argv\')" | pydt;:'
 
 for i in (cut -d ' ' -f1 < ~/.config/qutebrowser/quickmarks)
   a $i "qutebrowser / \":open $i\""
@@ -156,3 +156,4 @@ for i in bandcamp-downloader deemix encodec eventeditor git-sim lightnovel-crawl
 end
 a in2csv 'pipx run --spec csvkit in2csv'
 a mathics 'pipx run --spec mathics-django mathicsserver'
+a jitios 'sudo pipx run SideJITServer'
diff --git a/bin/minecraft b/bin/minecraft
index 3854200..8578c60 100755
--- a/bin/minecraft
+++ b/bin/minecraft
@@ -1,13 +1,12 @@
 #!/bin/sh
-if mkdir indexes; then
+if mkdir objects indexes; then
     d=$(curl https://piston-meta.mojang.com/mc/game/version_manifest.json | jq -r .versions[0].url)
-    curl --output-dir indexes -O "$(curl "$d" | jq -r .assetIndex.url)"
-    cat indexes/*.json | jq -r '.objects[].hash|"https://resources.download.minecraft.net/\(.[:2])/\(.)"' | xargs aria2c -d objects -Z
+    curl "$(curl "$d" | jq -r .assetIndex.url)" > indexes/index.json
+    jq -r '.objects[].hash|"https://resources.download.minecraft.net/\(.[:2])/\(.)"' indexes/index.json | xargs aria2c -d objects -Z
     ( echo "cd objects"; printf "mkdir %02x; mv %02x* %02x\n" $(seq 0 255 | sed 'p;p') ) | sh
-    curl "$d" | jq .libraries[].downloads.artifact.url | grep -vE 'windows|macos' | xargs aria2c -d objects -Z
-    curl "$d" | jq .downloads.client.url | xargs aria2c -d objects -Z
+    curl "$d" | jq .libraries[].downloads.artifact.url,.downloads.client.url | xargs aria2c -d objects -Z
     d=$(curl "https://meta.fabricmc.net/v2/versions/loader/$(curl "$d" | jq -r .id)" | jq -r '.[0]|.launcherMeta.libraries.common[].name,(.loader,.intermediary).maven')
     echo "$d" | sed -E ':b;s|\.(.*:)|/\1|;tb; s|(.*):(.*):(.*)|https://maven.fabricmc.net/\1/\2/\3/\2-\3.jar|' | xargs aria2c -d objects -Z
 fi
 java -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M -Xms1G -Xmx8G\
-    -cp 'objects/*' net.fabricmc.loader.impl.launch.knot.KnotClient --version . --assetsDir . --assetIndex "$(basename indexes/*.json .json)" --accessToken 0 "$@"
+    -cp 'objects/*' net.fabricmc.loader.impl.launch.knot.KnotClient --assetsDir . --assetIndex index --accessToken 0 "$@"
diff --git a/bin/setup b/bin/setup
index d9202a3..95c4bf9 100755
--- a/bin/setup
+++ b/bin/setup
@@ -5,6 +5,7 @@ if command -v doas; then
     alias s='doas'
 fi
 
+echo permit nopass :wheel | s tee /etc/doas.conf
 s pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
 s pacman-key --lsign-key 3056513887B78AEB
 p -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
@@ -13,7 +14,6 @@ s pacman-key --lsign BC26F752D25B92CE272E0F44F7FD5492264BB9D0
 p -U 'https://pkg.devkitpro.org/devkitpro-keyring.pkg.tar.xz'
 t /etc/pacman.conf < ~/.dotfiles/arch/pacman.conf
 
-echo permit nopass :wheel | t /etc/doas.conf
 p -Syu
 #shellcheck disable=SC2046
 p -S --needed $(grep -v devkit ~/.dotfiles/arch/packages)
@@ -34,6 +34,7 @@ stow --no-folding -d ~/.dotfiles -t ~/.config .
 ~/.dotfiles/bin/config.fish
 s chsh -s "$(grep -m1 bin/fish /etc/shells)" "$USER"
 s usermod -aG input "$USER"
+echo permit :wheel | s tee /etc/doas.conf
 
 w https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty
 w https://github.com/dracula/musikcube/raw/main/dracula.json -P ~/.config/musikcube/themes
diff --git a/qutebrowser/search.py b/qutebrowser/search.py
index 2e14b0a..29ee3d2 100644
--- a/qutebrowser/search.py
+++ b/qutebrowser/search.py
@@ -9,6 +9,7 @@ c.url.searchengines['g'] = 'github.com/search?q={}'
 c.url.searchengines['l'] = 'farside.link/librey/search.php?q={}'
 c.url.searchengines['l'] = 'librey.fly.dev/search.php?q={}'
 c.url.searchengines['m'] = 'search.marginalia.nu/search?query={}'
+c.url.searchengines['mf'] = 'minifocs.fly.dev/search?q={}'
 c.url.searchengines['mw'] = 'mwmbl.org/?q={}'
 c.url.searchengines['s'] = 'farside.link/searxng/search?q={}'
 c.url.searchengines['stract'] = 'stract.com/search?q={}'