From 576c73352cf4938f9bd941bf89b2ef9cae00b930 Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Sun, 28 Mar 2021 19:23:23 +0100
Subject: [PATCH] fix: bump fish_plugins, drop hydro async config

---
 files/.config/fish/config.fish  | 11 +++++------
 files/.config/fish/fish_plugins |  7 +++++--
 files/.config/fish/fishfile     |  6 ------
 files/.profile                  |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 files/.config/fish/fishfile

diff --git a/files/.config/fish/config.fish b/files/.config/fish/config.fish
index 0038f0b..0f526b9 100644
--- a/files/.config/fish/config.fish
+++ b/files/.config/fish/config.fish
@@ -1,16 +1,15 @@
 # Only execute in interactive shell
 if status --is-interactive
-    # Cross-shell setup
-    if begin; test -e $HOME/.profile; and type -q replay; end
-        replay "source $HOME/.profile"
-    end
-
     # Fish specific
     set fish_greeting
     set --global hydro_symbol_prompt "\$"
     set --global hydro_symbol_git_dirty "~"
-    set --global hydro_fetch true
     if type -q base16-seti
         base16-seti
     end
+
+    # Cross-shell setup
+    if begin; test -e $HOME/.profile; and type -q replay; end
+        replay "source $HOME/.profile"
+    end
 end
diff --git a/files/.config/fish/fish_plugins b/files/.config/fish/fish_plugins
index 1bb230a..6048da1 100644
--- a/files/.config/fish/fish_plugins
+++ b/files/.config/fish/fish_plugins
@@ -1,4 +1,7 @@
-tomyun/base16-fish
-jorgebucaran/fish-bax
 jethrokuan/z
+jorgebucaran/fisher
 jorgebucaran/hydro
+jorgebucaran/replay.fish
+joseluisq/gitnow
+tomyun/base16-fish
+PatrickF1/fzf.fish
diff --git a/files/.config/fish/fishfile b/files/.config/fish/fishfile
deleted file mode 100644
index dda3f6a..0000000
--- a/files/.config/fish/fishfile
+++ /dev/null
@@ -1,6 +0,0 @@
-jethrokuan/z
-jorgebucaran/replay.fish
-jorgebucaran/hydro
-joseluisq/gitnow
-tomyun/base16-fish
-PatrickF1/fzf.fish
diff --git a/files/.profile b/files/.profile
index 423d858..967c1b8 100644
--- a/files/.profile
+++ b/files/.profile
@@ -45,7 +45,7 @@ export PATH="$POETRY_ROOT/bin:$PATH"
 
 # nvm
 if [ -z "$NVM_DIR" ]; then
-export NVM_DIR="$HOME/.nvm"
+    export NVM_DIR="$HOME/.nvm"
 fi
 mkdir -p "$NVM_DIR"
 export PATH="$NVM_DIR/bin:$PATH"