Refactor how universal fish variables are set

sync

@@ -20,6 +20,8 @@ function main
 
   set_git_user
 
+  set_fish_universal_vars
+
   clean_up_tmp_space $cwd $start_dir
 
   echo -s \n 'Done syncing.'
@@ -80,6 +82,10 @@ function set_git_user
   end
 end
 
+function set_fish_universal_vars
+  source ./fish_universal_vars.fish
+end
+
 function clean_up_tmp_space -a cwd start_dir
   if test ! "$cwd" = 'dotfiles'
       cd ..