From 5e8e7642382d4e6dd287a9725a81291c016c2f33 Mon Sep 17 00:00:00 2001
From: mitchell <mitchelljfsimon@gmail.com>
Date: Sat, 15 Aug 2020 18:36:58 -0400
Subject: [PATCH] Refactor how universal fish variables are set

---
 .config/fish/fish_variables | 31 -------------------------------
 fish_universal_vars.fish    | 29 +++++++++++++++++++++++++++++
 sync                        |  6 ++++++
 3 files changed, 35 insertions(+), 31 deletions(-)
 delete mode 100644 .config/fish/fish_variables
 create mode 100644 fish_universal_vars.fish

diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
deleted file mode 100644
index b31974f..0000000
--- a/.config/fish/fish_variables
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR fish_color_autosuggestion:586e75
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:93a1a1
-SETUVAR fish_color_comment:586e75
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:268bd2
-SETUVAR fish_color_error:dc322f
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:839496
-SETUVAR fish_color_quote:657b83
-SETUVAR fish_color_redirection:6c71c4
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:
-SETUVAR fish_key_bindings:fish_vi_key_bindings
-SETUVAR fish_pager_color_completion:B3A06D
-SETUVAR fish_pager_color_description:B3A06D
-SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
diff --git a/fish_universal_vars.fish b/fish_universal_vars.fish
new file mode 100644
index 0000000..bf42e0b
--- /dev/null
+++ b/fish_universal_vars.fish
@@ -0,0 +1,29 @@
+set -U fish_color_autosuggestion 586e75
+set -U fish_color_cancel -r
+set -U fish_color_command 93a1a1
+set -U fish_color_comment 586e75
+set -U fish_color_cwd green
+set -U fish_color_cwd_root red
+set -U fish_color_end 268bd2
+set -U fish_color_error dc322f
+set -U fish_color_escape 00a6b2
+set -U fish_color_history_current --bold
+set -U fish_color_host normal
+set -U fish_color_host_remote yellow
+set -U fish_color_match --background=brblue
+set -U fish_color_normal normal
+set -U fish_color_operator 00a6b2
+set -U fish_color_param 839496
+set -U fish_color_quote 657b83
+set -U fish_color_redirection 6c71c4
+set -U fish_color_search_match 'bryellow'  '--background=black'
+set -U fish_color_selection 'white'  '--bold'  '--background=brblack'
+set -U fish_color_status red
+set -U fish_color_user brgreen
+set -U fish_color_valid_path --underline
+set -U fish_greeting
+set -U fish_key_bindings fish_vi_key_bindings
+set -U fish_pager_color_completion B3A06D
+set -U fish_pager_color_description B3A06D
+set -U fish_pager_color_prefix 'cyan'  '--underline'
+set -U fish_pager_color_progress 'brwhite'  '--background=cyan'
diff --git a/sync b/sync
index a8f64f0..e2d6536 100755
--- a/sync
+++ b/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 ..