From 7ced18b5a09cfce819a6ed19e8f5e2377925ec17 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Thu, 1 Jun 2023 10:57:08 -0400
Subject: [PATCH] Fish: update for psoft junit stuff and sh abbrs

---
 bin/aliases      | 7 ++++++-
 fish/config.fish | 5 ++++-
 git/config       | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/aliases b/bin/aliases
index dbf71c8..1bd2c59 100755
--- a/bin/aliases
+++ b/bin/aliases
@@ -16,6 +16,7 @@ a all2jxl 'fd -e{png,jpg,ppm} -x cjxl -e 8 -d 0 {} {.}.jxl \; -x rm'
 a awall 'xwinwrap -fdt -fs -- mpv -wid WID ~/Pictures/Wall/Anim/$argv* --loop --no-osc'
 a base64d 'echo (echo $argv | base64 -d 2>/dev/null) | tee /dev/stderr 2>| clip;:'
 a catbox 'curl https://catbox.moe/user/api.php -F reqtype=fileupload -F fileToUpload=@$argv;:'
+a cgr 'pushd (g root);:'
 a clip 'xsel -ib'
 a cpugov 's cpupower frequency-set -g performance'
 a dirdl 'wget -r -k -p -np -e robots=off'
@@ -72,7 +73,11 @@ 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'
 
-a history_match 'history -p (string sub -s 2 $argv[1]) | head -n1;:'
+a history_find 'history -p (string sub -s 2 $argv[1]) | head -n1;:'
+a history_last 'history -n1;:'
+
+a junitc "javac -cp 'src/main/java:../cp/*'"
+a junit "java -cp 'src/test/java:src/main/java:../cp/*' org.junit.runner.JUnitCore"
 
 for i in (cat ~/.config/qutebrowser/quickmarks | cut -d ' ' -f1)
     a $i "qutebrowser / \":open $i\""
diff --git a/fish/config.fish b/fish/config.fish
index 2bcb923..08f8020 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -22,6 +22,9 @@ bind \ed 'ncdu'
 bind \ef '_fzf_wrapper | clip'
 bind \e\co 'open (_fzf_wrapper)'
 
-abbr -a !. -r '^!.*' -f history_match
+abbr !. --position anywhere -f history_find -r '^!.*'
+abbr !! --position anywhere -f history_last
+abbr do ''
+abbr done end
 
 printf "\e[5 q"
diff --git a/git/config b/git/config
index a71b5eb..7927fe4 100644
--- a/git/config
+++ b/git/config
@@ -59,6 +59,7 @@
     pu = push
     puf = push -f
     r = reset --hard
+    root = rev-parse --show-toplevel
     s = status
     su = submodule update --init --recursive
     w = clean -fdx