update fish config

fish/conf.d/.gitignore

@@ -0,0 +1 @@
+secret.fish

fish/conf.d/colors.fish

@@ -0,0 +1,12 @@
+set fish_color_user normal
+set fish_color_host blue
+set fish_color_host_remote blue
+set fish_color_command blue
+set fish_color_quote purple
+set fish_color_keyword yellow
+set fish_color_option normal
+set fish_color_param normal
+set fish_color_valid_path green
+set fish_color_comment gray
+set fish_color_operator cyan
+set fish_color_cancel red

fish/conf.d/composer.fish

@@ -1 +1,3 @@
-fish_add_path -a $HOME/.config/composer/vendor/bin
+if [ -f "$HOME/.config/composer/vendor/bin" ]
+    fish_add_path -a $HOME/.config/composer/vendor/bin
+end

fish/conf.d/editor.fish

@@ -0,0 +1,3 @@
+if command -q nvim
+    set -x EDITOR nvim
+end

fish/conf.d/go.fish

@@ -1 +1,3 @@
-fish_add_path (go env GOPATH)/bin
+if command -q go
+    fish_add_path (go env GOPATH)/bin
+end

fish/conf.d/path.fish

@@ -0,0 +1,2 @@
+fish_add_path $HOME/bin
+fish_add_path $HOME/.local/bin

fish/config.fish

@@ -3,24 +3,5 @@ if status is-interactive
     set -x GPG_TTY (tty)
 end
 
+# Disable greeting
 set -g fish_greeting
-
-# Path stuff
-fish_add_path $HOME/bin
-fish_add_path $HOME/.local/bin
-
-set -x EDITOR nvim
-
-# Colors
-set fish_color_user normal
-set fish_color_host blue
-set fish_color_host_remote blue
-set fish_color_command blue
-set fish_color_quote purple
-set fish_color_keyword yellow
-set fish_color_option normal
-set fish_color_param normal
-set fish_color_valid_path green
-set fish_color_comment gray
-set fish_color_operator cyan
-set fish_color_cancel red

fish/functions/tree.fish

@@ -1,6 +1,6 @@
 function tree
-    if test -f /usr/bin/eza
-        /usr/bin/eza -T $argv
+    if command -q eza
+        eza -T $argv
     else
         /bin/tree $argv
     end

fish/functions/vim.fish

@@ -1,3 +1,10 @@
 function vim --wraps=nvim --description 'alias vim nvim'
-    nvim $argv
+    if command -q nvim
+        nvim $argv
+    else if command -q vim
+        command vim $argv
+    else
+        echo "fish: unknown command: vim"
+        return 127
+    end
 end