Tidy vim plugins

files/.config/fish/config.fish

@@ -1,12 +1,12 @@
-# ---------------------------------------------------------------------------- #
-#   Cross-shell (only import if environment has been setup)
-# ---------------------------------------------------------------------------- #
-if begin; test -e ~/.bash_profile; and type -q bass; end
-	bass source ~/.bash_profile
+if status --is-interactive
+    # Cross-shell setup
+    if begin; test -e ~/.bash_profile; and type -q bax; end
+        bax "source ~/.bash_profile"
+    end
+    
+    # Fish specific
+    set fish_greeting
+    if type -q base16-seti
+        base16-seti
+    end
 end
-
-# ---------------------------------------------------------------------------- #
-#   Fish specific
-# ---------------------------------------------------------------------------- #
-set fish_greeting
-base16-seti

files/.config/fish/fishfile

@@ -1,5 +1,8 @@
 fishpkg/fish-prompt-mono
-acomagu/fish-async-prompt
-matchai/fish-mock
-edc/bass
 tomyun/base16-fish
+gazorby/fish-abbreviation-tips
+oh-my-fish/plugin-license
+matchai/fish-mock
+jorgebucaran/fish-bax
+jethrokuan/z
+joseluisq/gitnow