diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index ddd7ff5..e8fc087 100755
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -5,6 +5,9 @@ set VIRTUAL_ENV_DISABLE_PROMPT 1
 set -xU MANPAGER "sh -c 'col -bx | bat -l man -p'"
 set -xU MANROFFOPT -c
 set -x SHELL /usr/bin/fish
+set -x GOPATH $HOME/.local/share/go
+set -x GOBIN $GOPATH/bin
+set PATH $GOBIN $PATH
 
 ## Export variable need for qt-theme
 if type qtile >>/dev/null 2>&1
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 3dcab06..0e53c9f 100755
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -3,8 +3,6 @@
 SETUVAR --export EDITOR:nvim
 SETUVAR --export FZF_DEFAULT_COMMAND:fd\x20\x2d\x2dtype\x20f
 SETUVAR --export FZF_DEFAULT_OPTS:\x0a\x20\x20\x2d\x2dcolor\x3dfg\x3a\x23d0d0d0\x2cfg\x2b\x3a\x23d0d0d0\x2cbg\x3a\x23000000\x2cbg\x2b\x3a\x23241f31\x0a\x20\x20\x2d\x2dcolor\x3dhl\x3a\x2362a0ea\x2chl\x2b\x3a\x231c71d8\x2cinfo\x3a\x23afaf87\x2cmarker\x3a\x238ff0a4\x0a\x20\x20\x2d\x2dcolor\x3dprompt\x3a\x231a5fb4\x2cspinner\x3a\x23f66151\x2cpointer\x3a\x23a51d2d\x2cheader\x3a\x2399c1f1\x0a\x20\x20\x2d\x2dcolor\x3dborder\x3a\x23262626\x2clabel\x3a\x23aeaeae\x2cquery\x3a\x23d9d9d9\x0a\x20\x20\x2d\x2dborder\x3d\x22bold\x22\x20\x2d\x2dborder\x2dlabel\x3d\x22\x22\x20\x2d\x2dpreview\x2dwindow\x3d\x22border\x2drounded\x22\x20\x2d\x2dprompt\x3d\x22\x3e\x20\x22\x0a\x20\x20\x2d\x2dmarker\x3d\x22\x3e\x22\x20\x2d\x2dpointer\x3d\x22\u25c6\x22\x20\x2d\x2dseparator\x3d\x22\u2500\x22\x20\x2d\x2dscrollbar\x3d\x22\u2502\x22\x0a\x20\x20\x2d\x2dlayout\x3d\x22reverse\x22\x20\x2d\x2dinfo\x3d\x22right\x22
-SETUVAR --export GOBIN:/home/fscotto/\x2elocal/share/go/bin
-SETUVAR --export GOPATH:/home/fscotto/\x2elocal/share/go
 SETUVAR --export MANPAGER:sh\x20\x2dc\x20\x27col\x20\x2dbx\x20\x7c\x20bat\x20\x2dl\x20man\x20\x2dp\x27
 SETUVAR --export MANROFFOPT:\x2dc
 SETUVAR __done_min_cmd_duration:10000
@@ -44,4 +42,3 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di
 SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/home/fscotto/\x2elocal/share/go/bin