Fish: Fix my mistakes

.config/fish/config.fish

@@ -17,7 +17,7 @@ end
 # PROGRAM SETTINGS #
 set -gx EDITOR nvim
 set -gx PAGER "nvim -c 'set ft=man' -"
-set -U Z_CMD "j"
+set -Ux Z_CMD "j"
 
 # LOAD XRESOURCES #
 xrdb ~/.Xresources
@@ -26,18 +26,3 @@ xrdb ~/.Xresources
 for i in (ls $D/Games/Minecraft/Game/instances)
     alias $i "minecraft -l $i"
 end
-
-# GIT ABBREVIATIONS #
-abbr -a g 'git'
-abbr -a gg 'git clone'
-abbr -a ga 'git commit -a'
-abbr -a gc 'git commit'
-abbr -a gs 'git status'
-abbr -a gpu 'git push'
-abbr -a gp 'git pull'
-abbr -a gch 'git checkout'
-abbr -a gad 'git add'
-abbr -a gb 'git branch'
-abbr -a gl 'git log'
-abbr -a gca 'git commit --amend'
-abbr -a gpuf 'git push -f'

.config/fish/fish_variables

@@ -2,26 +2,13 @@
 # VERSION: 3.0
 SETUVAR --export D:/mnt/LocalDiskD
 SETUVAR ZO_CMD:jo
-SETUVAR Z_CMD:j
+SETUVAR --export Z_CMD:j
 SETUVAR Z_DATA:/home/glados/\x2elocal/share/z/data
 SETUVAR Z_DATA_DIR:/home/glados/\x2elocal/share/z
 SETUVAR Z_EXCLUDE:/home/glados
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
-SETUVAR _fish_abbr_g:git
-SETUVAR _fish_abbr_ga:git\x20commit\x20\x2da
-SETUVAR _fish_abbr_gad:git\x20add
-SETUVAR _fish_abbr_gb:git\x20branch
-SETUVAR _fish_abbr_gc:git\x20commit
-SETUVAR _fish_abbr_gca:git\x20commit\x20\x2d\x2damend
-SETUVAR _fish_abbr_gch:git\x20checkout
-SETUVAR _fish_abbr_gg:git\x20clone
-SETUVAR _fish_abbr_gl:git\x20log
-SETUVAR _fish_abbr_gp:git\x20pull
-SETUVAR _fish_abbr_gpu:git\x20push
-SETUVAR _fish_abbr_gpuf:git\x20push\x20\x2df
-SETUVAR _fish_abbr_gs:git\x20status
 SETUVAR fish_color_autosuggestion:555\x1ebrblack
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:\x2d\x2dbold

.config/fish/functions/D.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.XATzCf/D.fish @ line 2
-function D
-	cd $D
+# Defined in - @ line 1
+function D --description 'alias D cd $D'
+	cd $D $argv;
 end

.config/fish/functions/dot.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.zTiFlh/dot.fish @ line 1
-function dot
-	cd ~/.dotfiles
+# Defined in - @ line 1
+function dot --description 'alias dot cd ~/.dotfiles'
+	cd ~/.dotfiles $argv;
 end

.config/fish/functions/f.fish

@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.bYrYO7/fff.fish @ line 2
-function f
-	eval $D/Source/fff/fff $argv
-        cd /(cat ~/.fff_d)
-end

.config/fish/functions/fe.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.qcykC8/fe.fish @ line 1
-function fe
-	funced $argv
+# Defined in - @ line 1
+function fe --description 'alias fe funced'
+	funced  $argv;
 end

.config/fish/functions/fs.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.bDHEx5/fs.fish @ line 1
-function fs
-	funcsave $argv
+# Defined in - @ line 1
+function fs --description 'alias fs funcsave'
+	funcsave  $argv;
 end

.config/fish/functions/g.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function g --description 'alias g git'
+	git  $argv;
+end

.config/fish/functions/ga.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function ga --description 'alias ga git commit -a'
+	git commit -a $argv;
+end

.config/fish/functions/gad.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gad --description 'alias gad git add'
+	git add $argv;
+end

.config/fish/functions/gb.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gb --description 'alias gb git branch'
+	git branch $argv;
+end

.config/fish/functions/gc.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gc --description 'alias gc git commit'
+	git commit $argv;
+end

.config/fish/functions/gca.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gca --description 'alias gca git commit --amend'
+	git commit --amend $argv;
+end

.config/fish/functions/gch.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gch --description 'alias gch git checkout'
+	git checkout $argv;
+end

.config/fish/functions/gg.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gg --description 'alias gg git clone'
+	git clone $argv;
+end

.config/fish/functions/gl.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gl --description 'alias gl git log'
+	git log $argv;
+end

.config/fish/functions/gp.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gp --description 'alias gp git pull'
+	git pull $argv;
+end

.config/fish/functions/gpu.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gpu --description 'alias gpu git push'
+	git push $argv;
+end

.config/fish/functions/gpuf.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gpuf --description 'alias gpuf git push -f'
+	git push -f $argv;
+end

.config/fish/functions/gs.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function gs --description 'alias gs git status'
+	git status $argv;
+end

.config/fish/functions/hardinfo.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.bSgqRb/hardinfo.fish @ line 2
-function hardinfo
-	inxi -SPARM -GCDN -v1 -xGCRS -Fxz
+# Defined in - @ line 1
+function hardinfo --description 'alias hardinfo inxi -SPARM -GCDN -v1 -xGCRS -Fxz'
+	inxi -SPARM -GCDN -v1 -xGCRS -Fxz $argv;
 end

.config/fish/functions/jstest.fish

@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.flDLcB/jstest.fish @ line 1
-function jstest
-	jstest-gtk
-end

.config/fish/functions/l.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.yaEzA7/l.fish @ line 1
-function l
-	ls $argv
+# Defined in - @ line 1
+function l --description 'alias l ls'
+	ls  $argv;
 end

.config/fish/functions/la.fish

@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.8wDs2h/lsa.fish @ line 1
-function la
-	ls -a $argv
-end

.config/fish/functions/sou.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.ON24BK/sou.fish @ line 1
-function sou
-	cd $D/Source
+# Defined in - @ line 1
+function sou --description 'alias sou cd $D/Source'
+	cd $D/Source $argv;
 end

.config/fish/functions/v.fish

@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.pOtuGw/v.fish @ line 1
-function v
-	vi $argv
+# Defined in - @ line 1
+function v --description 'alias v nvim'
+	nvim  $argv;
 end

.config/fish/functions/vi.fish

@@ -1,4 +1,4 @@
 # Defined in - @ line 1
-function vi
-	nvim $argv
+function vi --description 'alias vi nvim'
+	nvim  $argv;
 end