diff --git a/dot_config/nvim/lua/utils/chezmoi-tmpl.lua b/dot_config/nvim/lua/utils/chezmoi-tmpl.lua
index 068646a..380bbbe 100644
--- a/dot_config/nvim/lua/utils/chezmoi-tmpl.lua
+++ b/dot_config/nvim/lua/utils/chezmoi-tmpl.lua
@@ -1 +1 @@
-vim.cmd([[ autocmd BufNewFile,BufRead *.tmpl execute 'set filetype='..matchlist(expand('<afile>'), '.*\.\(.*\)\.tmpl$')[1] ]])
+vim.cmd([[ autocmd BufNewFile,BufRead */chezmoi/*.tmpl execute 'set filetype='..matchlist(expand('<afile>'), '.*\.\(.*\)\.tmpl$')[1] ]])
diff --git a/dot_config/private_fish/env.fish.tmpl b/dot_config/private_fish/env.fish.tmpl
index 60237cf..a17af63 100644
--- a/dot_config/private_fish/env.fish.tmpl
+++ b/dot_config/private_fish/env.fish.tmpl
@@ -79,6 +79,8 @@ set -x PATH "$VOLTA_HOME/bin" $PATH
 set -x PYLINTHOME "$XDG_CACHE_HOME"/pylint
 
 # golang
+set -x GOPATH "$XDG_DATA_HOME/go"
+set -ax PATH "$GOPATH"/bin
 set -ax PATH /usr/local/go/bin
 
 # Rust