cleanup fish config

fish.configlink/config.fish

@@ -9,15 +9,6 @@ if status --is-interactive
         $DOTS/bin \
         ~/.cargo/bin
 
-    # Aliases
-    if command -v nvim > /dev/null
-        alias vim='nvim'
-        abbr -a vimrc 'vim $HOME/.config/nvim/init.vim'
-    end
-    if [ (uname) = "Linux" ]
-        linux
-    end
-
     # Use `vi` in the shell with cursor shapes
     fish_vi_key_bindings
     bind yy fish_clipboard_copy
@@ -35,7 +26,9 @@ if status --is-interactive
     zoxide init fish | source
 
     # Colors
+    if test -e $DOTS/fish.configlink/fish_colors
         command cat $DOTS/fish.configlink/fish_colors
+    end
 
     # Fuzzy finder
     fzf_key_bindings

fish.configlink/functions/abbrs.fish

@@ -49,8 +49,13 @@ function abbrs --description 'All abbreviations'
     abbr -a cdg 'cd (git rev-parse --show-toplevel)'
 
     # Vim
-    abbr -a v 'vim'
+    if command -v nvim > /dev/null
+        alias vim='nvim'
+        abbr -a vimrc 'vim $HOME/.config/nvim/init.vim'
+    else
         abbr -a vimrc 'vim $HOME/.vimrc'
+    end
+    abbr -a v 'vim'
     abbr -a vl 'vim -c "normal! `0"'
     abbr -a vll 'vim -c "Hist"'
     abbr -a vh 'vim -c "Hist"'
@@ -118,4 +123,10 @@ function abbrs --description 'All abbreviations'
     # macOS
     abbr -a casks 'vim $DOTS/homebrew/Caskfile'
 
+    # Linux
+    if [ (uname) = "Linux" ]
+        linux
+    end
+
+
 end