From f9d8f829224c1e2eb09d250a326c3f423020e99b Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 23 May 2023 00:57:25 +0200
Subject: [PATCH] move some abbrs into aliases since i tought its probably
 better

---
 .config/fish/conf.d/abbr.fish  | 7 -------
 .config/fish/conf.d/alias.fish | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish
index c23188c..5db8a2e 100644
--- a/.config/fish/conf.d/abbr.fish
+++ b/.config/fish/conf.d/abbr.fish
@@ -4,31 +4,24 @@ abbr ..2 "cd ../.."
 abbr ..3 "cd ../../.."
 abbr ..4 "cd ../../../.."
 abbr ..5 "cd ../../../../.."
-abbr activate "source bin/activate.fish"
 abbr bigupdate "paru -Syu --noconfirm && tldr --update && yes | sdk update && yes | sdk upgrade java"
 abbr cat "bat -pp"
 abbr c "command"
-abbr - "cd -"
 abbr cd.. "cd .."
 abbr cl "cat src/**.* | sed '/^\s*\$/d' | wc -l"
 abbr cp "cp -rv"
 abbr diff "delta"
-abbr gc "git clone"
 abbr grep "grep -Irni 'txt' ."
 abbr ls "exa --git --icons -gl"
 abbr mgcc "clear; gcc -Wall -Wextra -Wconversion -Wdouble-promotion -Wshadow -Wcast-align -Wstrict-prototypes -fanalyzer -fsanitize=undefined -fsanitize-undefined-trap-on-error -g3 main.c && ./a.out; rm a.out 2> /dev/null"
 abbr mg++ "clear; g++ -Wall -Wextra -Wdouble-promotion -Wshadow -Wnon-virtual-dtor -pedantic -g3 -Wold-style-cast -Wsign-conversion main.cpp && ./a.out; rm a.out 2> /dev/null"
-abbr mirrors_update "curl -s 'https://archlinux.org/mirrorlist/?country=FR&country=GB&protocol=https&use_mirror_status=on' | sed -e 's/^#Server/Server/' -e '/^#/d' | sudo bash -c 'rankmirrors -n 7 - > /etc/pacman.d/mirrorlist' && sudo pacman -Syy"
 abbr mmake "clear; make && ./main; make clean 2> /dev/null"
 abbr nano "micro"
 abbr ocamlbuild "ocamlbuild -no-hygiene"
 abbr opamupdate "opam update && opam upgrade -y"
-abbr pacman-clean "sudo pacman -Rsn \$(pacman -Qqtd) --noconfirm"
 abbr rm "rm -rf"
 abbr tgz "tar czf 'Archive.tar.gz'"
-abbr untgz "tar xvzf"
 abbr vgcc "clear; gcc -Wall -Wextra -Wshadow -Wcast-align -Wstrict-prototypes -fanalyzer -fsanitize=undefined -g main.c && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./a.out; rm a.out 2> /dev/null"
 abbr vg++ "clear; g++ -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic -g -Wold-style-cast -Wsign-conversion main.cpp && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./a.out; rm a.out 2> /dev/null"
 abbr vmake "clear; make && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./main; make clean 2> /dev/null"
-abbr paru-rebuild "checkrebuild | awk '{print \$2}' | xargs -r paru -S --rebuild=all --noconfirm"
 abbr zip "zip -r 'archive.zip' dossier"
diff --git a/.config/fish/conf.d/alias.fish b/.config/fish/conf.d/alias.fish
index eb3c334..277ad23 100644
--- a/.config/fish/conf.d/alias.fish
+++ b/.config/fish/conf.d/alias.fish
@@ -1 +1,9 @@
 #!/usr/bin/fish
+
+alias - "cd -"
+alias activate "source bin/activate.fish"
+alias gc "git clone"
+alias mirrors_update "curl -s 'https://archlinux.org/mirrorlist/?country=FR&country=GB&protocol=https&use_mirror_status=on' | sed -e 's/^#Server/Server/' -e '/^#/d' | sudo bash -c 'rankmirrors -n 7 - > /etc/pacman.d/mirrorlist' && sudo pacman -Syy"
+alias pacman-clean "sudo pacman -Rsn \$(pacman -Qqtd) --noconfirm"
+alias untgz "tar xvzf"
+alias paru-rebuild "checkrebuild | awk '{print \$2}' | xargs -r paru -S --rebuild=all --noconfirm"