From 04d54d9c5445afc4d523aac084b4a14898feb6a4 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Sat, 22 Aug 2020 18:29:38 -0400
Subject: [PATCH] Fish: remove fisher (and add autojump)

---
 .config/fish/config.fish           | 3 +--
 .config/fish/fish_variables        | 4 ----
 .config/fish/fisher                | 1 -
 .config/fish/fishfile              | 2 --
 .config/fish/functions/fisher.fish | 1 -
 .gitmodules                        | 3 ---
 .setup                             | 5 ++---
 7 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 160000 .config/fish/fisher
 delete mode 100644 .config/fish/fishfile
 delete mode 120000 .config/fish/functions/fisher.fish

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index c3b10d2..56eb58b 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,7 +1,6 @@
 set fish_user_paths ~/.local/bin $D/Installs/bin /usr/lib/ccache/bin
 set fish_function_path $fish_function_path $D/Games/Minecraft/Game/functions
-set Z_CMD "j"
 
 test (hostname) = "aperture" && set -gx D /mnt/LocalDiskD
 
-tty -s && starship init fish | source
+tty -s && starship init fish | source; source /usr/share/autojump/autojump.fish
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index eaead4c..7be6154 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -3,11 +3,7 @@
 SETUVAR --export ARCH:x86_64
 SETUVAR --export EDITOR:nvim
 SETUVAR --export PAGER:nvimpager
-SETUVAR ZO_CMD:jo
-SETUVAR Z_CMD:j
-SETUVAR Z_DATA:/home/glados/\x2elocal/share/z/data
 SETUVAR Z_DATA_DIR:/home/glados/\x2elocal/share/z
-SETUVAR Z_EXCLUDE:/home/glados
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
diff --git a/.config/fish/fisher b/.config/fish/fisher
deleted file mode 160000
index 6cdfadc..0000000
--- a/.config/fish/fisher
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6cdfadc41e93b2876d5f9a491d9ff500b30b1ae8
diff --git a/.config/fish/fishfile b/.config/fish/fishfile
deleted file mode 100644
index ef94472..0000000
--- a/.config/fish/fishfile
+++ /dev/null
@@ -1,2 +0,0 @@
-jethrokuan/z
-jorgebucaran/bax.fish
diff --git a/.config/fish/functions/fisher.fish b/.config/fish/functions/fisher.fish
deleted file mode 120000
index afeacf2..0000000
--- a/.config/fish/functions/fisher.fish
+++ /dev/null
@@ -1 +0,0 @@
-../fisher/fisher.fish
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index ca9190c..ea44277 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".config/fish/fisher"]
-	path = .config/fish/fisher
-	url = https://github.com/jorgebucaran/fisher
 [submodule ".local/share/qutebrowser/normalize"]
 	path = .local/share/qutebrowser/normalize
 	url = https://github.com/necolas/normalize.css
diff --git a/.setup b/.setup
index db96359..6168271 100755
--- a/.setup
+++ b/.setup
@@ -1,7 +1,7 @@
 #!/bin/bash
 sudo eopkg it -c system.devel
 sudo eopkg rm gnome-terminal libreoffice-common mate-terminal nautilus
-sudo eopkg it aria2 busybox fd fish jq kitty mpv neovim qutebrowser stow
+sudo eopkg it aria2 autojump busybox fd fish jq kitty mpv neovim qutebrowser stow
 
 rm ~/.bashrc
 cd ~/.dotfiles
@@ -12,10 +12,9 @@ done
 
 stow .
 
-cd .config/mpv/shaders
+cd ~/.config/mpv/shaders
 curl -fsSL $(curl -fsSL https://api.github.com/repos/bloc97/Anime4K/releases/latest | jq .assets[].browser_download_url | sed 's/"//g') | busybox unzip -
 
 nvim +PlugUpdate +q +q
 
-fish -c fisher
 chsh -s /usr/bin/fish