diff --git a/config/fish/exports.fish b/config/fish/exports.fish
index af3b8c0..a3419a0 100644
--- a/config/fish/exports.fish
+++ b/config/fish/exports.fish
@@ -97,8 +97,9 @@ set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS \
 set -q GNUPGHOME; or set -x GNUPGHOME "$XDG_DATA_HOME/gnupg"
 
 # Go configuration
-set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go"
-set -q GOBIN; or set -x GOBIN "$XDG_BIN_HOME"
+set -x GOPATH "$XDG_DATA_HOME/go"
+set -x GOBIN "$XDG_BIN_HOME"
+set -e GOROOT
 
 # 1Password configuration
 set -q OP_CACHE; or set -x OP_CACHE "$XDG_STATE_HOME/1password"
diff --git a/config/goenv/goenvrc b/config/goenv/goenvrc
deleted file mode 100644
index 70af602..0000000
--- a/config/goenv/goenvrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# Detect shell
-if [ -n "$BASH_VERSION" ] || [ -n "$ZSH_VERSION" ]; then
-  export GOENV_PATH_ORDER=front
-  export GOENV_PREPEND_GOPATH=true
-  export GOENV_AUTO_INSTALL=true
-fi
diff --git a/config/goenv/goenvrc.fish b/config/goenv/goenvrc.fish
deleted file mode 100644
index e311302..0000000
--- a/config/goenv/goenvrc.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-set -gx GOENV_PATH_ORDER front
-set -gx GOENV_PREPEND_GOPATH true
-set -gx GOENV_AUTO_INSTALL true