diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore
new file mode 100644
index 00000000..23efee95
--- /dev/null
+++ b/.config/fish/.gitignore
@@ -0,0 +1 @@
+fish_variables
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 51ac5a42..d8a1db8a 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,3 +1,38 @@
+set -U __fish_init_2_39_8 \x1d
+set -U __fish_init_2_3_0 \x1d
+set -U __fish_init_3_x \x1d
+set -U fish_color_autosuggestion 969896
+set -U fish_color_cancel \x2dr
+set -U fish_color_command b294bb
+set -U fish_color_comment f0c674
+set -U fish_color_cwd green
+set -U fish_color_cwd_root red
+set -U fish_color_end b294bb
+set -U fish_color_error cc6666
+set -U fish_color_escape 00a6b2
+set -U fish_color_history_current \x2d\x2dbold
+set -U fish_color_host normal
+set -U fish_color_match \x2d\x2dbackground\x3dbrblue
+set -U fish_color_normal normal
+set -U fish_color_operator 00a6b2
+set -U fish_color_param 81a2be
+set -U fish_color_quote b5bd68
+set -U fish_color_redirection 8abeb7
+set -U fish_color_search_match bryellow\x1e\x2d\x2dbackground\x3dbrblack
+set -U fish_color_selection white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+set -U fish_color_status red
+set -U fish_color_user brgreen
+set -U fish_color_valid_path \x2d\x2dunderline
+set -U fish_cursor_default block
+set -U fish_cursor_insert line
+set -U fish_cursor_replace_one underscore
+set -U fish_greeting 
+set -U fish_key_bindings fish_vi_key_bindings
+set -U fish_pager_color_completion normal
+set -U fish_pager_color_description B3A06D\x1eyellow
+set -U fish_pager_color_prefix white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+set -U fish_pager_color_progress brwhite\x1e\x2d\x2dbackground\x3dcyan
+
 set fish_prompt_pwd_dir_length 0
 
 set -x SSH_AUTH_SOCK (gpgconf --list-dir socketdir)'/S.gpg-agent.ssh'
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
deleted file mode 100644
index 4625d8fa..00000000
--- a/.config/fish/fish_variables
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_init_2_39_8:\x1d
-SETUVAR __fish_init_2_3_0:\x1d
-SETUVAR __fish_init_3_x:\x1d
-SETUVAR fish_color_autosuggestion:969896
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:b294bb
-SETUVAR fish_color_comment:f0c674
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:b294bb
-SETUVAR fish_color_error:cc6666
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:81a2be
-SETUVAR fish_color_quote:b5bd68
-SETUVAR fish_color_redirection:8abeb7
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-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_cursor_default:block
-SETUVAR fish_cursor_insert:line
-SETUVAR fish_cursor_replace_one:underscore
-SETUVAR fish_greeting:
-SETUVAR fish_key_bindings:fish_vi_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan