Move fish abbrs to config.fish

abbrs are now stored in config.fish instead of fish_variables in Fish 3.6

2 files changed, 14 insertions, 43 deletions

diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..cbf380a
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,14 @@
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end
+
+abbr -a -- l la
+abbr -a -- m micro
+abbr -a -- g git
+abbr -a -- a 'git add'
+abbr -a -- c 'git commit'
+abbr -a -- cl 'git clone'
+abbr -a -- p 'git push'
+abbr -a -- pl 'git pull'
+abbr -a -- st 'git status'
+abbr -a -- t 'gio trash'
diff --git a/fish/fish_variables b/fish/fish_variables
deleted file mode 100644
index a6a1801..0000000
--- a/fish/fish_variables
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR --export EDITOR:micro
-SETUVAR --export --path GOPATH:/home/a/\x2elocal/share/go
-SETUVAR __fish_initialized:3400
-SETUVAR _fish_abbr_a:git\x20add
-SETUVAR _fish_abbr_c:git\x20commit
-SETUVAR _fish_abbr_cl:git\x20clone
-SETUVAR _fish_abbr_g:git
-SETUVAR _fish_abbr_l:la
-SETUVAR _fish_abbr_m:micro
-SETUVAR _fish_abbr_p:git\x20push
-SETUVAR _fish_abbr_pl:git\x20pull
-SETUVAR _fish_abbr_st:git\x20status
-SETUVAR _fish_abbr_t:gio\x20trash
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:blue
-SETUVAR fish_color_comment:red
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:green
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:brcyan
-SETUVAR fish_color_param:cyan
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d111
-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_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
-SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr