From 4da1cb35a9d324f52a1074a670d127d0fdeac63a Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Tue, 25 Oct 2016 13:04:26 +0200
Subject: fish-config: don't check if ENV VARS are already set

Use vis if it is installed instead of vim.
---
 config/fish/config.fish | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 4224913..8861af6 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,7 +1,5 @@
 # export the path to our dotfiles
-if not set -q DOTFILES_LOCATION
-    set -Ux DOTFILES_LOCATION (get_dotfiles_location)
-end
+set -x DOTFILES_LOCATION (get_dotfiles_location)
 
 
 # autoload functions and completions in .dotfiles 
@@ -13,33 +11,29 @@ set fish_complete_path $DOTFILES_LOCATION/config/fish/completions $fish_complete
 set fish_function_path $DOTFILES_LOCATION/config/fish/functions/git-alias $fish_function_path
 
 
-if not set -q __fish_git_prompt_show_informative_status
-    set -Ux __fish_git_prompt_show_informative_status true
-end
+set -x __fish_git_prompt_show_informative_status true
 
-if not set -q MPD_PORT
-    set -Ux MPD_PORT 6601
-end
+set -x MPD_PORT 6601
 
-if not set -q EDITOR
-    set -Ux EDITOR vim
+if type -q vis
+set -x EDITOR vis
+else
+set -x EDITOR vim
 end
 
-if not set -q BROWSER
-    set -Ux BROWSER qutebrowser
-end
+set -x VISUAL $EDITOR
 
-if not set -q SSH_KEY_PATH
-    set -Ux SSH_KEY_PATH $HOME/.ssh/rsa_id
-end
+set -x BROWSER qutebrowser
+
+set -x SSH_KEY_PATH $HOME/.ssh/rsa_id
 
 # set yaourt specific VARS
 if type -q yaourt
     if not set -q AURUSEGIT
-        set -Ux AURUSEGIT 1
+        set -x AURUSEGIT 1
     end
     if not set -q AURSHOWDIFF
-        set -Ux AURSHOWDIFF 1
+        set -x AURSHOWDIFF 1
     end
 end
 
-- 
cgit v1.2.3