diff --git a/fish/.config/fish/conf.d/abbr.fish b/fish/.config/fish/conf.d/abbr.fish
new file mode 100644
index 0000000..d8a8c0d
--- /dev/null
+++ b/fish/.config/fish/conf.d/abbr.fish
@@ -0,0 +1,21 @@
+abbr -a f z
+
+# ls
+if type -q "eza"
+    set -U ls eza -lg --group-directories-first --git --git-repos-no-status --header --time-style=long-iso
+else
+    set -U ls ls
+end
+abbr -a ls $ls
+abbr -a ll $ls
+abbr -a la $ls -a
+abbr -a ld $ls -a --total-size
+
+# git
+abbr -a gco git checkout
+abbr -a gcb git checkout -b
+abbr -a gl git pull
+abbr -a gp git push
+if type -q "lazygit"
+    abbr -a lg lazygit
+end
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 636b8f5..296b418 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -17,4 +17,6 @@ end
 fish_add_path $HOME/.symfony/bin
 
 set fish_function_path (path resolve $__fish_config_dir/functions/*/) $fish_function_path
-set fish_complete_path (path resolve $__fish_config_dir/completions/*/) $fish_complete_path
\ No newline at end of file
+set fish_complete_path (path resolve $__fish_config_dir/completions/*/) $fish_complete_path
+
+set -gx XDG_CONFIG_HOME $HOME/.config
diff --git a/fish/.config/fish/functions/custom/f.fish b/fish/.config/fish/functions/custom/f.fish
deleted file mode 100644
index ae7c2a6..0000000
--- a/fish/.config/fish/functions/custom/f.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function f
-    z $argv
-end
diff --git a/fish/.config/fish/functions/custom/ll.fish b/fish/.config/fish/functions/custom/ll.fish
deleted file mode 100644
index 943eb54..0000000
--- a/fish/.config/fish/functions/custom/ll.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-if type "eza"
-    function ll
-        ls -a $argv
-    end
-end
diff --git a/fish/.config/fish/functions/custom/ls.fish b/fish/.config/fish/functions/custom/ls.fish
deleted file mode 100644
index aa17ecf..0000000
--- a/fish/.config/fish/functions/custom/ls.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-if type "eza"
-    function ls
-        eza --group-directories-first --git -l $argv
-    end
-end
diff --git a/fish/.config/fish/functions/git/gcb.fish b/fish/.config/fish/functions/git/gcb.fish
deleted file mode 100644
index 14d8368..0000000
--- a/fish/.config/fish/functions/git/gcb.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gcb
-    git checkout -b $argv
-end
diff --git a/fish/.config/fish/functions/git/gco.fish b/fish/.config/fish/functions/git/gco.fish
deleted file mode 100644
index 8b5f9b9..0000000
--- a/fish/.config/fish/functions/git/gco.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gco
-    git checkout $argv
-end
diff --git a/fish/.config/fish/functions/git/gl.fish b/fish/.config/fish/functions/git/gl.fish
deleted file mode 100644
index 53a901e..0000000
--- a/fish/.config/fish/functions/git/gl.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gl
-    git pull $argv
-end
diff --git a/fish/.config/fish/functions/git/gp.fish b/fish/.config/fish/functions/git/gp.fish
deleted file mode 100644
index eb3f779..0000000
--- a/fish/.config/fish/functions/git/gp.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gp
-    git push $argv
-end
diff --git a/fish/.config/fish/functions/git/lg.fish b/fish/.config/fish/functions/git/lg.fish
deleted file mode 100644
index 9181cce..0000000
--- a/fish/.config/fish/functions/git/lg.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-if type "lazygit"
-    function lg
-        lazygit $argv
-    end
-end